* [PATCH 1/5] ARM: shmobile: Remove non-multiplatform Genmai reference support
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
@ 2014-05-17 1:24 ` Simon Horman
2014-05-17 1:24 ` [PATCH 2/5] ARM: shmobile: genmai-reference: Remove legacy clock support Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-05-17 1:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
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 <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35c146f..4ede75e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -306,7 +306,6 @@ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
s3c6410-smdk6410.dtb
dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
r7s72100-genmai.dtb \
- r7s72100-genmai-reference.dtb \
r8a7740-armadillo800eva.dtb \
r8a7778-bockw.dtb \
r8a7778-bockw-reference.dtb \
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 0f92ba8..2ba18c6 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -240,17 +240,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
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index c12a1c5..a455584 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -67,7 +67,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
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index 99455ec..918fccf 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -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
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/5] ARM: shmobile: genmai-reference: Remove legacy clock support
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
2014-05-17 1:24 ` [PATCH 1/5] ARM: shmobile: Remove non-multiplatform Genmai reference support Simon Horman
@ 2014-05-17 1:24 ` Simon Horman
2014-05-17 1:24 ` [PATCH 3/5] ARM: shmobile: Sync Genmai DTS with Genmai reference DTS Simon Horman
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-05-17 1:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
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 <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-genmai-reference.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 33015e5..968bbba 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -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);
}
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
2014-05-17 1:24 ` [PATCH 1/5] ARM: shmobile: Remove non-multiplatform Genmai reference support Simon Horman
2014-05-17 1:24 ` [PATCH 2/5] ARM: shmobile: genmai-reference: Remove legacy clock support Simon Horman
@ 2014-05-17 1:24 ` Simon Horman
2014-05-17 1:24 ` [PATCH 4/5] ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-05-17 1:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
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 <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100-genmai.dts | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts
index b1deaf7..56849b5 100644
--- a/arch/arm/boot/dts/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai.dts
@@ -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 <wsa@sang-engineering.com>
*
* 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";
+};
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/5] ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
` (2 preceding siblings ...)
2014-05-17 1:24 ` [PATCH 3/5] ARM: shmobile: Sync Genmai DTS with Genmai reference DTS Simon Horman
@ 2014-05-17 1:24 ` Simon Horman
2014-05-17 1:24 ` [PATCH 5/5] ARM: shmobile: Remove Genmai reference DTS Simon Horman
2014-05-22 5:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Olof Johansson
5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-05-17 1:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Let the multiplatform Genmai support boot with the unified DTS.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/mach-shmobile/board-genmai-reference.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4ede75e..1329d4d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -320,7 +320,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
r8a73a4-ape6evm-reference.dtb \
sh7372-mackerel.dtb
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
- r7s72100-genmai-reference.dtb \
+ r7s72100-genmai.dtb \
r8a7791-koelsch.dtb \
r8a7790-lager.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 968bbba..2ff6ad6 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -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,
};
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/5] ARM: shmobile: Remove Genmai reference DTS
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
` (3 preceding siblings ...)
2014-05-17 1:24 ` [PATCH 4/5] ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB Simon Horman
@ 2014-05-17 1:24 ` Simon Horman
2014-05-22 5:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Olof Johansson
5 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-05-17 1:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
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 <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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
diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
deleted file mode 100644
index ca88458..0000000
--- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
+++ /dev/null
@@ -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 <wsa@sang-engineering.com>
- *
- * 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";
-};
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
` (4 preceding siblings ...)
2014-05-17 1:24 ` [PATCH 5/5] ARM: shmobile: Remove Genmai reference DTS Simon Horman
@ 2014-05-22 5:08 ` Olof Johansson
2014-05-22 5:42 ` Simon Horman
5 siblings, 1 reply; 8+ messages in thread
From: Olof Johansson @ 2014-05-22 5:08 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, May 17, 2014 at 10:24:53AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Second Round of
> Renesas ARM Based SoC r7s72100 CCF Updates for v3.16.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-r7s72100-ccf-for-v3.16,
> which I have already sent a pull-request for.
>
> This comprehensively addresses an oversight in patches included in
> the pull request that it depends on, specifically leaving broken
> non-multiplatform support in place for genmai-reference.
>
> This pull request has some minor conflicts with other DT changes which I
> have previously sent pull requests for. These conflicts are in
> arch/arm/boot/dts/Makefile. A resolution can be found in the
> renesas-next-v3.15-rc1-20140517 tag if my renesas tree. In words:
>
> CONFIG_ARCH_SHMOBILE_LEGACY hunk:
> * Remove emev2-kzm9d.dtb
> * Remove r7s72100-genmai-reference.dtb
> * Keep r7s72100-genmai.dtb
>
Are you sure? Shouldn't the genmai board be covered by multi now? Or
are both multi and legacy driven by the same DTS now? Just making sure.
> The following changes since commit 9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5:
>
> ARM: shmobile: r7s72100: use workaround for non DT-clocks (2014-05-14 11:42:55 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-r7s72100-ccf2-for-v3.16
>
> for you to fetch changes up to a5176e0d9de31a54e08468f21c15dc08e006857f:
>
> ARM: shmobile: Remove Genmai reference DTS (2014-05-17 09:06:29 +0900)
>
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16
2014-05-22 5:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Olof Johansson
@ 2014-05-22 5:42 ` Simon Horman
0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-05-22 5:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 21, 2014 at 10:08:40PM -0700, Olof Johansson wrote:
> On Sat, May 17, 2014 at 10:24:53AM +0900, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> >
> > Please consider these Second Round of
> > Renesas ARM Based SoC r7s72100 CCF Updates for v3.16.
> >
> > This pull request is based on the previous round of
> > such requests, tagged as renesas-r7s72100-ccf-for-v3.16,
> > which I have already sent a pull-request for.
> >
> > This comprehensively addresses an oversight in patches included in
> > the pull request that it depends on, specifically leaving broken
> > non-multiplatform support in place for genmai-reference.
> >
> > This pull request has some minor conflicts with other DT changes which I
> > have previously sent pull requests for. These conflicts are in
> > arch/arm/boot/dts/Makefile. A resolution can be found in the
> > renesas-next-v3.15-rc1-20140517 tag if my renesas tree. In words:
> >
> > CONFIG_ARCH_SHMOBILE_LEGACY hunk:
> > * Remove emev2-kzm9d.dtb
> > * Remove r7s72100-genmai-reference.dtb
> > * Keep r7s72100-genmai.dtb
> >
>
> Are you sure? Shouldn't the genmai board be covered by multi now? Or
> are both multi and legacy driven by the same DTS now? Just making sure.
Both multi and legacy are driven by the same DTS, r7s72100-genmai.dtb.
> > The following changes since commit 9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5:
> >
> > ARM: shmobile: r7s72100: use workaround for non DT-clocks (2014-05-14 11:42:55 +0900)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-r7s72100-ccf2-for-v3.16
> >
> > for you to fetch changes up to a5176e0d9de31a54e08468f21c15dc08e006857f:
> >
> > ARM: shmobile: Remove Genmai reference DTS (2014-05-17 09:06:29 +0900)
> >
>
> Pulled, thanks.
>
>
> -Olof
> --
> 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
>
^ permalink raw reply [flat|nested] 8+ messages in thread