Skip to contentSkip to conversation

ARM: shmobile: r8a7779, marzen: multiplatform

RFC Superseded Simon Horman 4 participants 13 messages Nov 25, 2013 – Nov 26, 2013

Subsystems (6)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

cover ARM: shmobile: r8a7779, marzen: multiplatform

The aim of this series is to adding common clock framework and in turn multiplatform support to the r8a7779 SoC and marzen-reference. It subsequently removes non-multiplatform support from marzen-reference. This last step is provided to illustrate that it can be done, it may not be desirable to do so for some time.

This is based on work for R-Car Gen2 by Laurent Pinchart and Magnus Damm.

I expect the R-Car Gen2 work in this area to change and I intend to update this series as necessary.

This series is based on the clocks/ccf/rcar-gen2 branch of Laurent's fbdev tree. I expect that branch to be rebased/changed, but it seems to be an adequate base for an RFC.

I have made this series, including its base, available in the topic/clocks/ccf/r8a7779-marzen branch of my renesas tree. That branch is likely to be rebased/changed in the future.

Simon Horman (17):
clk: shmobile: r8a7779: Add clocks support
clk: shmobile: r8a7779: Add MSTP clock support
ARM: shmobile: r8a7779: Add clock index macros for DT sources
ARM: shmobile: r8a7779: Add clocks
ARM: shmobile: r8a7779: Reference clocks
ARM: shmobile: Sync Marzen DTS with Marzen reference DTS
ARM: shmobile: r8a7779: Sort headers alphabetically
ARM: shmobile: r8a7779: Add helper to read mode pins
ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to

    clock-r8a7779.c

ARM: shmobile: marzen-reference: Move clock and OF device
initialisation into board code
ARM: shmobile: r8a7779: Do not include sh_clk.h in r8a7779.h
ARM: shmobile: r8a7779: Initial multiplatform support
ARM: shmobile: marzen-reference: Initialize CPG device
ARM: shmobile: marzen-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: Remove non-multiplatform Marzen reference support
ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB
ARM: shmobile: Remove Marzen reference DTS

 .../bindings/clock/renesas,cpg-mstp-clocks.txt     |   1 +
 .../bindings/clock/renesas,r8a7779-cpg-clocks.txt  |  22 +++
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     | 110 --------------
 arch/arm/boot/dts/r8a7779-marzen.dts               |  82 ++++++++++
 arch/arm/boot/dts/r8a7779.dtsi                     | 132 ++++++++++++++++
 arch/arm/mach-shmobile/Kconfig                     |  21 +--
 arch/arm/mach-shmobile/Makefile                    |   4 +-
 arch/arm/mach-shmobile/Makefile.boot               |   1 -
 arch/arm/mach-shmobile/board-koelsch-reference.c   |   1 +
 arch/arm/mach-shmobile/board-marzen-reference.c    |  44 ++++++
 arch/arm/mach-shmobile/board-marzen.c              |  28 ++--
 arch/arm/mach-shmobile/clock-r8a7779.c             |  22 +--
 arch/arm/mach-shmobile/include/mach/r8a7779.h      |   2 +-
 arch/arm/mach-shmobile/setup-r8a7779.c             |  28 ++--
 drivers/clk/shmobile/Makefile                      |   1 +
 drivers/clk/shmobile/clk-r8a7779.c                 | 166 +++++++++++++++++++++
 include/dt-bindings/clock/r8a7779-clock.h          |  61 ++++++++
 include/linux/clk/shmobile.h                       |   1 +
 19 files changed, 564 insertions(+), 165 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt
 delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
 create mode 100644 drivers/clk/shmobile/clk-r8a7779.c
 create mode 100644 include/dt-bindings/clock/r8a7779-clock.h
Signature · 1 line
1.8.4
#1 lore raw

RFC 8/17 ARM: shmobile: r8a7779: Add helper to read mode pins

Add and use helper to read mode pins.
This will be re-used when moving marzen-reference to the common clock framework.

---
 arch/arm/mach-shmobile/clock-r8a7779.c        | 11 ++---------
 arch/arm/mach-shmobile/include/mach/r8a7779.h |  1 +
 arch/arm/mach-shmobile/setup-r8a7779.c        | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)
arch/arm/mach-shmobile/clock-r8a7779.c +2 -9
index b7ce0e7..decf122 100644
@@ -25,6 +25,7 @@
 #include <linux/clkdev.h>
 #include <mach/clock.h>
 #include <mach/common.h>
+#include <mach/r8a7779.h>
 
 /*
  *		MD1 = 1			MD1 = 0
@@ -59,9 +60,6 @@
 #define MSTPCR6		IOMEM(0xffc80058)
 #define MSTPCR7		IOMEM(0xffc80040)
 
-#define MODEMR		0xffcc0020
-
-
 /* ioremap() through clock mapping mandatory to avoid
  * collision with ARM coherent DMA virtual memory range.
  */
@@ -213,14 +211,9 @@ static struct clk_lookup lookups[] = {
 
 void __init r8a7779_clock_init(void)
 {
-	void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
-	u32 mode;
+	u32 mode = r8a7779_read_mode_pins();
 	int k, ret = 0;
 
-	BUG_ON(!modemr);
-	mode = ioread32(modemr);
-	iounmap(modemr);
-
 	if (mode & MD(1)) {
 		plla_clk.rate = 1500000000;
 
arch/arm/mach-shmobile/include/mach/r8a7779.h +1 -0
index 5014145..bd66cd82 100644
@@ -39,6 +39,7 @@ extern void r8a7779_add_early_devices(void);
 extern void r8a7779_add_standard_devices(void);
 extern void r8a7779_add_standard_devices_dt(void);
 extern void r8a7779_init_late(void);
+extern u32 r8a7779_read_mode_pins(void);
 extern void r8a7779_clock_init(void);
 extern void r8a7779_pinmux_init(void);
 extern void r8a7779_pm_init(void);
arch/arm/mach-shmobile/setup-r8a7779.c +14 -0
index 8f94531..4e3fbfb 100644
@@ -874,6 +874,20 @@ void __init r8a7779_add_standard_devices_dt(void)
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
+#define MODEMR		0xffcc0020
+
+u32 __init r8a7779_read_mode_pins(void)
+{
+	void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
+	u32 mode;
+
+	BUG_ON(!modemr);
+	mode = ioread32(modemr);
+	iounmap(modemr);
+
+	return mode;
+}
+
 static const char *r8a7779_compat_dt[] __initdata = {
 	"renesas,r8a7779",
 	NULL,
Signature · 1 line
1.8.4
#2 lore raw

RFC 8/17 ARM: shmobile: r8a7779: Add helper to read mode pins

Hello.

Quoted 15 lines · Simon Horman

Add and use helper to read mode pins.
This will be re-used when moving marzen-reference to the common clock framework.

---
  arch/arm/mach-shmobile/clock-r8a7779.c        | 11 ++---------
  arch/arm/mach-shmobile/include/mach/r8a7779.h |  1 +
  arch/arm/mach-shmobile/setup-r8a7779.c        | 14 ++++++++++++++
  3 files changed, 17 insertions(+), 9 deletions(-)
arch/arm/mach-shmobile/clock-r8a7779.c +0 -0
index b7ce0e7..decf122 100644

[...]

arch/arm/mach-shmobile/setup-r8a7779.c void __init r8a7779_add_standard_devices_dt(void) · line 881

Quoted 13 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5 -0
index 8f94531..4e3fbfb 100644
@@ -874,6 +874,20 @@ void __init r8a7779_add_standard_devices_dt(void)
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
 
+#define MODEMR		0xffcc0020
+
+u32 __init r8a7779_read_mode_pins(void)
+{
+	void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);

Why waste 2 4K pages if you're only interested in 4 bytes (i.e. 1 page)? I
remember I've already asked that question...

arch/arm/mach-shmobile/setup-r8a7779.c void __init r8a7779_add_standard_devices_dt(void) · line 890

Quoted 9 lines
arch/arm/mach-shmobile/setup-r8a7779.c +9 -0
+	u32 mode;
+
+	BUG_ON(!modemr);
+	mode = ioread32(modemr);
+	iounmap(modemr);
+
+	return mode;
+}
+

WBR, Sergei

#3 lore raw

RFC 8/17 ARM: shmobile: r8a7779: Add helper to read mode pins

Quoted 28 lines · Sergei Shtylyov

Hello.

Quoted 15 lines · Simon Horman

Add and use helper to read mode pins.
This will be re-used when moving marzen-reference to the common clock framework.

---
 arch/arm/mach-shmobile/clock-r8a7779.c        | 11 ++---------
 arch/arm/mach-shmobile/include/mach/r8a7779.h |  1 +
 arch/arm/mach-shmobile/setup-r8a7779.c        | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)
arch/arm/mach-shmobile/clock-r8a7779.c +0 -0
index b7ce0e7..decf122 100644

[...]

Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c +0 -0
index 8f94531..4e3fbfb 100644
@@ -874,6 +874,20 @@ void __init r8a7779_add_standard_devices_dt(void)
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
Quoted 8 lines

arch/arm/mach-shmobile/setup-r8a7779.c void __init r8a7779_add_standard_devices_dt(void) · line 881

Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5 -0
+#define MODEMR		0xffcc0020
+
+u32 __init r8a7779_read_mode_pins(void)
+{
+	void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);

Why waste 2 4K pages if you're only interested in 4 bytes (i.e. 1
page)? I remember I've already asked that question...

I don't recall if there was a conclusion to that discussion.

In any case, this patch just shuffles code around.

#4 lore raw

RFC 13/17 ARM: shmobile: marzen-reference: Initialize CPG device

On multiplatform kernels clocks are handled by the CCF CPG driver. It must be explicitly initialized by a call to rcar_gen2_clocks_init() with the value of the boot mode pins.

Based on similar work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>
---
 arch/arm/mach-shmobile/board-marzen-reference.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm/mach-shmobile/board-marzen-reference.c +12 -4
index 782907f..3a7c0fc 100644
@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/clk-provider.h>
+#include <linux/clk/shmobile.h>
+#include <linux/clocksource.h>
 #include <linux/of_platform.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
@@ -28,11 +29,17 @@
 #include <asm/mach/arch.h>
 
 
-static void __init marzen_init(void)
+static void __init marzen_init_timer(void)
 {
 #ifdef CONFIG_COMMON_CLK
-	of_clk_init(NULL);
-#else
+	r8a7779_clocks_init(r8a7779_read_mode_pins());
+#endif
+	clocksource_of_init();
+}
+
+static void __init marzen_init(void)
+{
+#ifndef CONFIG_COMMON_CLK
 	r8a7779_clock_init();
 #endif
 	r8a7779_add_standard_devices_dt();
@@ -49,6 +56,7 @@ DT_MACHINE_START(MARZEN, "marzen")
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_init_delay,
+	.init_time	= marzen_init_timer,
 	.nr_irqs	= NR_IRQS_LEGACY,
 	.init_irq	= r8a7779_init_irq_dt,
 	.init_machine	= marzen_init,
Signature · 1 line
1.8.4
#5 lore raw

RFC 13/17 ARM: shmobile: marzen-reference: Initialize CPG device

Hello.

Quoted 2 lines · Simon Horman

On multiplatform kernels clocks are handled by the CCF CPG driver. It must be explicitly initialized by a call to rcar_gen2_clocks_init() with

You meant r8a7779_clocks_init() instead?

Quoted 14 lines

the value of the boot mode pins.

Based on similar work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>
---
  arch/arm/mach-shmobile/board-marzen-reference.c | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm/mach-shmobile/board-marzen-reference.c +0 -0
index 782907f..3a7c0fc 100644

[...]

Quoted 11 lines
arch/arm/mach-shmobile/board-marzen-reference.c +2 -3
@@ -28,11 +29,17 @@
  #include <asm/mach/arch.h>
 
 
-static void __init marzen_init(void)
+static void __init marzen_init_timer(void)
  {
  #ifdef CONFIG_COMMON_CLK
-	of_clk_init(NULL);
-#else
+	r8a7779_clocks_init(r8a7779_read_mode_pins());

arch/arm/mach-shmobile/board-marzen-reference.c line 45

Quoted 10 lines
arch/arm/mach-shmobile/board-marzen-reference.c +7 -0
+#endif
+	clocksource_of_init();
+}
+
+static void __init marzen_init(void)
+{
+#ifndef CONFIG_COMMON_CLK
  	r8a7779_clock_init();
  #endif
  	r8a7779_add_standard_devices_dt();

WBR, Sergei

#6 lore raw

RFC 13/17 ARM: shmobile: marzen-reference: Initialize CPG device

Quoted 8 lines · Sergei Shtylyov

Hello.

Quoted 2 lines · Simon Horman

On multiplatform kernels clocks are handled by the CCF CPG driver. It must be explicitly initialized by a call to rcar_gen2_clocks_init() with

You meant r8a7779_clocks_init() instead?

Yes, thanks. I will fix that.

Quoted 40 lines
Quoted 15 lines

the value of the boot mode pins.

Based on similar work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>
---
 arch/arm/mach-shmobile/board-marzen-reference.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm/mach-shmobile/board-marzen-reference.c +0 -0
index 782907f..3a7c0fc 100644

[...]

Quoted 11 lines
arch/arm/mach-shmobile/board-marzen-reference.c +2 -3
@@ -28,11 +29,17 @@
 #include <asm/mach/arch.h>
 
 
-static void __init marzen_init(void)
+static void __init marzen_init_timer(void)
 {
 #ifdef CONFIG_COMMON_CLK
-	of_clk_init(NULL);
-#else
+	r8a7779_clocks_init(r8a7779_read_mode_pins());

arch/arm/mach-shmobile/board-marzen-reference.c line 45

Quoted 10 lines
arch/arm/mach-shmobile/board-marzen-reference.c +7 -0
+#endif
+	clocksource_of_init();
+}
+
+static void __init marzen_init(void)
+{
+#ifndef CONFIG_COMMON_CLK
 	r8a7779_clock_init();
 #endif
 	r8a7779_add_standard_devices_dt();

WBR, Sergei

#7 lore raw

RFC 15/17 ARM: shmobile: Remove non-multiplatform Marzen reference support

Now that r8a7779 has CCF support remove the legacy Marzen reference Kconfig bits CONFIG_MACH_KOELSCH_REFERENCE for the non-multiplatform case.

Starting from this commit Marzen board support is always enabled via CONFIG_MACH_KOELSCH, and CONFIG_ARCH_MULTIPLATFORM is used to select between board-koelsch.c and board-koelsch-reference.c

The file board-koelsch-reference.c can no longer be used together with the legacy sh-clk clock framework, instead CCF is used.

Based on work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>
---
 arch/arm/boot/dts/Makefile           |  1 -
 arch/arm/mach-shmobile/Kconfig       | 13 -------------
 arch/arm/mach-shmobile/Makefile      |  3 +--
 arch/arm/mach-shmobile/Makefile.boot |  1 -
 4 files changed, 1 insertion(+), 17 deletions(-)
arch/arm/boot/dts/Makefile +0 -1
index 723fe71..166e3dd 100644
@@ -205,7 +205,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 	r8a7778-bockw-reference.dtb \
 	r8a7740-armadillo800eva-reference.dtb \
 	r8a7779-marzen.dtb \
-	r8a7779-marzen-reference.dtb \
 	r8a7791-koelsch.dtb \
 	r8a7791-koelsch-reference.dtb \
 	r8a7790-lager.dtb \
arch/arm/mach-shmobile/Kconfig +0 -13
index 4216baa..a27d60c 100644
@@ -239,19 +239,6 @@ config MACH_MARZEN
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select USE_OF
 
-config MACH_MARZEN_REFERENCE
-	bool "MARZEN board - Reference Device Tree Implementation"
-	depends on ARCH_R8A7779
-	select ARCH_REQUIRE_GPIOLIB
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select USE_OF
-	---help---
-	   Use reference implementation of Marzen board support
-	   which makes use of device tree at the expense
-	   of not supporting a number of devices.
-
-	   This is intended to aid developers
-
 config MACH_LAGER
 	bool "Lager board"
 	depends on ARCH_R8A7790
arch/arm/mach-shmobile/Makefile +1 -2
index 6d75ae8..6a04c70 100644
@@ -69,8 +69,7 @@ obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_GENMAI)	+= board-genmai.o
 obj-$(CONFIG_MACH_GENMAI_REFERENCE)	+= board-genmai-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
-obj-$(CONFIG_MACH_MARZEN_REFERENCE)	+= board-marzen-reference.o
-obj-$(CONFIG_MACH_LAGER)	+= board-lager.o
+obj-$(CONFIG_MACH_LAGER)	+= boardo-lager.o
 obj-$(CONFIG_MACH_LAGER_REFERENCE)	+= board-lager-reference.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
index 759e4f8f..6f761b4 100644
@@ -16,7 +16,6 @@ loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
 loadaddr-$(CONFIG_MACH_LAGER_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
-loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000
 
 __ZRELADDR	:= $(sort $(loadaddr-y))
    zreladdr-y   += $(__ZRELADDR)
Signature · 1 line
1.8.4
#8 lore raw

RFC 15/17 ARM: shmobile: Remove non-multiplatform Marzen reference support

Hi Simon

Quoted 3 lines

Now that r8a7779 has CCF support remove the legacy Marzen reference Kconfig bits CONFIG_MACH_KOELSCH_REFERENCE for the non-multiplatform case.

I guess

- CONFIG_MACH_KOELSCH_REFERENCE
+ CONFIG_MACH_MARZEN_REFERENCE

Quoted 2 lines

Starting from this commit Marzen board support is always enabled via CONFIG_MACH_KOELSCH, and CONFIG_ARCH_MULTIPLATFORM is used to select

ditto ?

Quoted 2 lines

between board-koelsch.c and board-koelsch-reference.c
The file board-koelsch-reference.c can no longer be used together with

koelsch <-> marzen ?

arch/arm/mach-shmobile/Makefile obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o · line 72

Quoted 9 lines
arch/arm/mach-shmobile/Makefile +1 -2
@@ -69,8 +69,7 @@ obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_GENMAI)	+= board-genmai.o
 obj-$(CONFIG_MACH_GENMAI_REFERENCE)	+= board-genmai-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
-obj-$(CONFIG_MACH_MARZEN_REFERENCE)	+= board-marzen-reference.o
-obj-$(CONFIG_MACH_LAGER)	+= board-lager.o
+obj-$(CONFIG_MACH_LAGER)	+= boardo-lager.o

boardo-lager ??

     ^

Best regards
---
Kuninori Morimoto

#9 lore raw

RFC 15/17 ARM: shmobile: Remove non-multiplatform Marzen reference support

Quoted 22 lines · Kuninori Morimoto

Hi Simon

Quoted 3 lines

Now that r8a7779 has CCF support remove the legacy Marzen reference Kconfig bits CONFIG_MACH_KOELSCH_REFERENCE for the non-multiplatform case.

I guess

- CONFIG_MACH_KOELSCH_REFERENCE
+ CONFIG_MACH_MARZEN_REFERENCE

Quoted 2 lines

Starting from this commit Marzen board support is always enabled via CONFIG_MACH_KOELSCH, and CONFIG_ARCH_MULTIPLATFORM is used to select

ditto ?

Quoted 2 lines

between board-koelsch.c and board-koelsch-reference.c
The file board-koelsch-reference.c can no longer be used together with

koelsch <-> marzen ?

Quoted 11 lines

arch/arm/mach-shmobile/Makefile obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o · line 72

Quoted 9 lines
arch/arm/mach-shmobile/Makefile +1 -2
@@ -69,8 +69,7 @@ obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_GENMAI)	+= board-genmai.o
 obj-$(CONFIG_MACH_GENMAI_REFERENCE)	+= board-genmai-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
-obj-$(CONFIG_MACH_MARZEN_REFERENCE)	+= board-marzen-reference.o
-obj-$(CONFIG_MACH_LAGER)	+= board-lager.o
+obj-$(CONFIG_MACH_LAGER)	+= boardo-lager.o

boardo-lager ??

Thanks. Sorry for the silly errors.

#10 lore raw

RFC 16/17 ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB

Let the multiplatform Marzen support boot with the legacy DTS for Marzen as well as the Marzen reference DTS.

Based on work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>
---
 arch/arm/boot/dts/Makefile                       | 2 +-
 arch/arm/mach-shmobile/board-koelsch-reference.c | 1 +
 arch/arm/mach-shmobile/board-marzen-reference.c  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/Makefile +1 -1
index 166e3dd..2812344 100644
@@ -216,7 +216,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 	sh7372-mackerel.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
 	r7s72100-genmai-reference.dtb \
-	r8a7779-marzen-reference.dtb \
+	r8a7779-marzen.dtb \
 	r8a7791-koelsch-reference.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
 	socfpga_vt.dtb
arch/arm/mach-shmobile/board-koelsch-reference.c +1 -0
index 25b558f..daad66a 100644
@@ -38,6 +38,7 @@ static void __init koelsch_add_standard_devices(void)
 }
 
 static const char * const koelsch_boards_compat_dt[] __initconst = {
+	"renesas,koelsch",
 	"renesas,koelsch-reference",
 	NULL,
 };
arch/arm/mach-shmobile/board-marzen-reference.c +1 -0
index 7a240e5..2d60798 100644
@@ -74,6 +74,7 @@ static void __init marzen_init(void)
 }
 
 static const char *marzen_boards_compat_dt[] __initdata = {
+	"renesas,marzen",
 	"renesas,marzen-reference",
 	NULL,
 };
Signature · 1 line
1.8.4
#11 lore raw

RFC 16/17 ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB

Hi Simon

Quoted 8 lines

Let the multiplatform Marzen support boot with the legacy DTS for Marzen as well as the Marzen reference DTS.

Based on work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>

---

(snip)

arch/arm/mach-shmobile/board-koelsch-reference.c static void __init koelsch_add_standard_devices(void) · line 44

Quoted 10 lines
arch/arm/mach-shmobile/board-koelsch-reference.c +1 -0
@@ -38,6 +38,7 @@ static void __init koelsch_add_standard_devices(void)
 }
 
 static const char * const koelsch_boards_compat_dt[] __initconst = {
+	"renesas,koelsch",
 	"renesas,koelsch-reference",
 	NULL,
 };

You are modifying koelsch file in marzen patch ?

Best regards
---
Kuninori Morimoto

#12 lore raw

RFC 16/17 ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB

Quoted 17 lines · Kuninori Morimoto

Hi Simon

Quoted 8 lines

Let the multiplatform Marzen support boot with the legacy DTS for Marzen as well as the Marzen reference DTS.

Based on work for the Koelsch board by Laurent Pinchart.

Cc Laurent Pinchart <[email protected]>

---

(snip)

Quoted 5 lines
arch/arm/mach-shmobile/board-koelsch-reference.c +0 -0
@@ -38,6 +38,7 @@ static void __init koelsch_add_standard_devices(void)
 }
 
Quoted 7 lines

arch/arm/mach-shmobile/board-koelsch-reference.c static void __init koelsch_add_standard_devices(void) · line 44

Quoted 5 lines
arch/arm/mach-shmobile/board-koelsch-reference.c +1 -0
 static const char * const koelsch_boards_compat_dt[] __initconst = {
+	"renesas,koelsch",
 	"renesas,koelsch-reference",
 	NULL,
 };

You are modifying koelsch file in marzen patch ?

Sorry, my mistake. I'll fix that.