Skip to contentSkip to conversation

remove Genmai Reference from Legacy support

PATCH New Wolfram Sang 3 participants 11 messages May 16, 2014 – May 17, 2014

Subsystems (6)
Device tree bindings Arm (32-bit) Arm sub-architectures SuperH +2 more subsystems
lore
Share & tools
lore

Wolfram Sang

author
#0 lore raw

cover remove Genmai Reference from Legacy support

Here is the series to remove Genmai Reference from Legacy support since we now have CCF in multiplatform. Removal is done very similar to Marzen and the commit messages are largely from that series. Thanks a lot!

Technically, only the first patch fixes the unbootable Genmai-Reference-with- Legacy-constellation. The other patches clean up the leftovers. Simon, I think you know best when to push which patches?

The series has been tested with/without multiplatform on a genmai board. The branch is based on my r7s-ccf branch and can also be found here:

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/r7s-ccf-with-fixup

Thanks,

Wolfram

Wolfram Sang (5):
ARM: shmobile: Remove non-multiplatform Genmai reference support
ARM: shmobile: genmai-reference: Remove legacy clock support
ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
ARM: shmobile: Remove Genmai reference DTS

 arch/arm/boot/dts/Makefile                      |  3 +-
 arch/arm/boot/dts/r7s72100-genmai-reference.dts | 59 -------------------------
 arch/arm/boot/dts/r7s72100-genmai.dts           | 30 ++++++++++++-
 arch/arm/mach-shmobile/Kconfig                  | 11 -----
 arch/arm/mach-shmobile/Makefile                 |  1 -
 arch/arm/mach-shmobile/Makefile.boot            |  1 -
 arch/arm/mach-shmobile/board-genmai-reference.c |  8 +---
 7 files changed, 31 insertions(+), 82 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
Signature · 1 line
1.9.2
author
#1 lore raw

PATCH 1/5 ARM: shmobile: Remove non-multiplatform Genmai reference support

From: Wolfram Sang <[email protected]>

Now that r7s72100 has CCF support, remove the legacy Genmai reference Kconfig bits for the non-multiplatform case.

Starting from this commit Genmai board support is always enabled via CONFIG_MACH_GENMAI, and CONFIG_ARCH_MULTIPLATFORM is used to select between board-genmai.c and board-genmai-reference.c

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

Signed-off-by Wolfram Sang <[email protected]>
---
 arch/arm/boot/dts/Makefile           |  1 -
 arch/arm/mach-shmobile/Kconfig       | 11 -----------
 arch/arm/mach-shmobile/Makefile      |  1 -
 arch/arm/mach-shmobile/Makefile.boot |  1 -
 4 files changed, 14 deletions(-)
arch/arm/boot/dts/Makefile +0 -1
index fbebf739dfb0..a6eed6d661ac 100644
@@ -298,7 +298,6 @@ dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
 	s3c6410-smdk6410.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
-	r7s72100-genmai-reference.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
arch/arm/mach-shmobile/Kconfig +0 -11
index 037c00622de6..bc91eaf99e98 100644
@@ -229,17 +229,6 @@ config MACH_GENMAI
 	depends on ARCH_R7S72100
 	select USE_OF
 
-config MACH_GENMAI_REFERENCE
-	bool "Genmai board - Reference Device Tree Implementation"
-	depends on ARCH_R7S72100
-	select USE_OF
-	---help---
-	   Use reference implementation of Genmai 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_MARZEN
 	bool "MARZEN board"
 	depends on ARCH_R8A7779
arch/arm/mach-shmobile/Makefile +0 -1
index 9c5cd8c53a85..38d5fe825e93 100644
@@ -66,7 +66,6 @@ obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o
 obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 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
arch/arm/mach-shmobile/Makefile.boot +0 -1
index 99455ecafa05..918fccffa1b6 100644
@@ -7,7 +7,6 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000
-loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000
 loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
Signature · 1 line
1.9.2
author
#2 lore raw

PATCH 2/5 ARM: shmobile: genmai-reference: Remove legacy clock support

In reply to Wolfram Sang

From: Wolfram Sang <[email protected]>

genmai-reference is now only built for multiplatform which means that CCF comes with the package. Remove unused legacy code ifdefs to clean up the code.

Signed-off-by Wolfram Sang <[email protected]>
---
 arch/arm/mach-shmobile/board-genmai-reference.c | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/mach-shmobile/board-genmai-reference.c +0 -6
index 33015e5ed52a..968bbba20d08 100644
@@ -26,7 +26,6 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#ifdef CONFIG_COMMON_CLK
 /*
  * This is a really crude hack to provide clkdev support to platform
  * devices until they get moved to DT.

@@ -34,15 +33,10 @@
 static const struct clk_name clk_names[] = {
 	{ "mtu2", "fck", "sh-mtu2" },
 };
-#endif
 
 static void __init genmai_add_standard_devices(void)
 {
-#ifdef CONFIG_COMMON_CLK
 	shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true);
-#else
-	r7s72100_clock_init();
-#endif
 	r7s72100_add_dt_devices();
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
Signature · 1 line
1.9.2
author
#3 lore raw

PATCH 3/5 ARM: shmobile: Sync Genmai DTS with Genmai reference DTS

In reply to Wolfram Sang

From: Wolfram Sang <[email protected]>

Copy the device nodes from Genmai reference into the Genmai device tree file. This will allow us to use a single DTS file regardless of kernel configuration. In case of legacy C board code the device nodes may or may not be used, but in the multiplatform case all the DT device nodes will be used.

Signed-off-by Wolfram Sang <[email protected]>
---
 arch/arm/boot/dts/r7s72100-genmai.dts | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
arch/arm/boot/dts/r7s72100-genmai.dts +29 -1
index b1deaf7e2e06..56849b55e1c2 100644
@@ -1,7 +1,8 @@
 /*
  * Device Tree Source for the Genmai board
  *
- * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013-14 Renesas Solutions Corp.
+ * Copyright (C) 2014 Wolfram Sang, Sang Engineering <[email protected]>
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any

@@ -15,6 +16,10 @@
 	model = "Genmai";
 	compatible = "renesas,genmai", "renesas,r7s72100";
 
+	aliases {
+		serial2 = &scif2;
+	};
+
 	chosen {
 		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
 	};

@@ -29,3 +34,26 @@
 		#size-cells = <1>;
 	};
 };
+
+&extal_clk {
+	clock-frequency = <13330000>;
+};
+
+&usb_x1_clk {
+	clock-frequency = <48000000>;
+};
+
+&i2c2 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom at 50 {
+		compatible = "renesas,24c128";
+		reg = <0x50>;
+		pagesize = <64>;
+	};
+};
+
+&scif2 {
+	status = "okay";
+};
Signature · 1 line
1.9.2
author
#4 lore raw

PATCH 4/5 ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB

In reply to Wolfram Sang

From: Wolfram Sang <[email protected]>

Let the multiplatform Genmai support boot with the unified DTS.

Signed-off-by Wolfram Sang <[email protected]>
---
 arch/arm/boot/dts/Makefile                      | 2 +-
 arch/arm/mach-shmobile/board-genmai-reference.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/Makefile +1 -1
index a6eed6d661ac..3594914bed5d 100644
@@ -312,7 +312,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
 	r8a73a4-ape6evm-reference.dtb \
 	sh7372-mackerel.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
-	r7s72100-genmai-reference.dtb \
+	r7s72100-genmai.dtb \
 	r8a7791-henninger.dtb \
 	r8a7791-koelsch.dtb \
 	r8a7790-lager.dtb
arch/arm/mach-shmobile/board-genmai-reference.c +1 -1
index 968bbba20d08..2ff6ad6e608e 100644
@@ -42,7 +42,7 @@ static void __init genmai_add_standard_devices(void)
 }
 
 static const char * const genmai_boards_compat_dt[] __initconst = {
-	"renesas,genmai-reference",
+	"renesas,genmai",
 	NULL,
 };
Signature · 1 line
1.9.2
#5 lore raw

PATCH 4/5 ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB

arch/arm/mach-shmobile/board-genmai-reference.c static void __init genmai_add_standard_devices(void) · line 47

Quoted 10 lines · Wolfram Sang
arch/arm/mach-shmobile/board-genmai-reference.c +1 -1
@@ -42,7 +42,7 @@ static void __init genmai_add_standard_devices(void)
 }
 
 static const char * const genmai_boards_compat_dt[] __initconst = {
-       "renesas,genmai-reference",
+       "renesas,genmai",
        NULL,
 };

Regardless of my Acked-by for the series (it was done similarly for other boards), I have a more political question: As there's no more board support code for "renesas,genmai-reference", this means new kernels won't boot using an old r7s72100-genmai-reference.dts?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#6 lore raw

PATCH 4/5 ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB

Quoted 6 lines · Geert Uytterhoeven
Quoted 5 lines · Wolfram Sang
arch/arm/mach-shmobile/board-genmai-reference.c +0 -0
@@ -42,7 +42,7 @@ static void __init genmai_add_standard_devices(void)
 }
Quoted 10 lines

arch/arm/mach-shmobile/board-genmai-reference.c static void __init genmai_add_standard_devices(void) · line 47

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

Regardless of my Acked-by for the series (it was done similarly for other boards), I have a more political question: As there's no more board support code for "renesas,genmai-reference", this means new kernels won't boot using an old r7s72100-genmai-reference.dts?

Yes, that is the implication of the way things have been done. Its not ideal but as -reference has been considered a developers playground it seems reasonable.

author
#7 lore raw

PATCH 5/5 ARM: shmobile: Remove Genmai reference DTS

In reply to Wolfram Sang

From: Wolfram Sang <[email protected]>

Now that the DTS file r7s72100-genmai.dts can be used with board-genmai.c and board-genmai-reference.c, proceed with removing r7s72100-genmai-reference.dts.

Signed-off-by Wolfram Sang <[email protected]>
---
 arch/arm/boot/dts/r7s72100-genmai-reference.dts | 59 -------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
arch/arm/boot/dts/r7s72100-genmai-reference.dts deleted +0 -59
deleted file mode 100644
index ca88458e0706..000000000000
@@ -1,59 +0,0 @@
-/*
- * Device Tree Source for the Genmai board
- *
- * Copyright (C) 2013-14 Renesas Solutions Corp.
- * Copyright (C) 2014 Wolfram Sang, Sang Engineering <[email protected]>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-/dts-v1/;
-#include "r7s72100.dtsi"
-
-/ {
-	model = "Genmai";
-	compatible = "renesas,genmai-reference", "renesas,r7s72100";
-
-	aliases {
-		serial2 = &scif2;
-	};
-
-	chosen {
-		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x08000000 0x08000000>;
-	};
-
-	lbsc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-	};
-};
-
-&extal_clk {
-	clock-frequency = <13330000>;
-};
-
-&usb_x1_clk {
-	clock-frequency = <48000000>;
-};
-
-&i2c2 {
-	status = "okay";
-	clock-frequency = <400000>;
-
-	eeprom at 50 {
-		compatible = "renesas,24c128";
-		reg = <0x50>;
-		pagesize = <64>;
-	};
-};
-
-&scif2 {
-	status = "okay";
-};
Signature · 1 line
1.9.2
#8 lore raw

cover remove Genmai Reference from Legacy support

In reply to Wolfram Sang

Hi Wolfram,

Quoted 5 lines · Wolfram Sang

ARM: shmobile: Remove non-multiplatform Genmai reference support
ARM: shmobile: genmai-reference: Remove legacy clock support
ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
ARM: shmobile: Remove Genmai reference DTS

Thanks a lot!

Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#9 lore raw

cover remove Genmai Reference from Legacy support

Quoted 9 lines · Geert Uytterhoeven

Hi Wolfram,

Quoted 5 lines · Wolfram Sang

ARM: shmobile: Remove non-multiplatform Genmai reference support
ARM: shmobile: genmai-reference: Remove legacy clock support
ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
ARM: shmobile: Remove Genmai reference DTS

Quoted 3 lines

Thanks a lot!

Acked-by Geert Uytterhoeven <[email protected]>

Thanks, I will queue these up.

#10 lore raw

cover remove Genmai Reference from Legacy support

In reply to Wolfram Sang
Quoted 7 lines · Wolfram Sang

Here is the series to remove Genmai Reference from Legacy support since we now have CCF in multiplatform. Removal is done very similar to Marzen and the commit messages are largely from that series. Thanks a lot!

Technically, only the first patch fixes the unbootable Genmai-Reference-with- Legacy-constellation. The other patches clean up the leftovers. Simon, I think you know best when to push which patches?

Thanks. I appreciate the way you have arranged the series.

I have decided to take all of the patches and expedited a pull-request (without the usual cooling off period in next, so if it blows up we will have some egg on our faces :^).

Quoted 35 lines

The series has been tested with/without multiplatform on a genmai board. The branch is based on my r7s-ccf branch and can also be found here:

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/r7s-ccf-with-fixup

Thanks,

Wolfram

Wolfram Sang (5):
ARM: shmobile: Remove non-multiplatform Genmai reference support
ARM: shmobile: genmai-reference: Remove legacy clock support
ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
ARM: shmobile: Remove Genmai reference DTS

 arch/arm/boot/dts/Makefile                      |  3 +-
 arch/arm/boot/dts/r7s72100-genmai-reference.dts | 59 -------------------------
 arch/arm/boot/dts/r7s72100-genmai.dts           | 30 ++++++++++++-
 arch/arm/mach-shmobile/Kconfig                  | 11 -----
 arch/arm/mach-shmobile/Makefile                 |  1 -
 arch/arm/mach-shmobile/Makefile.boot            |  1 -
 arch/arm/mach-shmobile/board-genmai-reference.c |  8 +---
 7 files changed, 31 insertions(+), 82 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
Signature · 6 lines
1.9.2

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html