[PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update

linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update
@ 2013-10-01 10:32 Magnus Damm
  2013-10-01 10:33 ` [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS Magnus Damm
                   ` (5 more replies)
  0 siblings, 6 replies; 17+ messages in thread
From: Magnus Damm @ 2013-10-01 10:32 UTC (permalink / raw)
  To: linux-arm-kernel

ARM: shmobile: KZM9D Multiplatform update

[PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
[PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
[PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support
[PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
[PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS

This series updates mach-shmobile and the KZM9D board code to propose
a way forward for future CCF-enabled multiplatform board support.

With this series applied the following rules apply:

 - CONFIG_ARCH_MULTIPLATFORM=y is used to enable multiplatform
   - CONFIG_ARCH_SHMOBILE_MULTI=y is used in case of multiplatform build
 - CONFIG_ARCH SHMOBILE=y is used in case of legacy non-multiplatform build
 - CONFIG_MACH_KZM9D=y enables KZM9D board support regardless of multiplatform
   - In case of multiplatform build board-kzm9d-reference.c is used
   - In case of legacy non-multiplatform build board-kzm9d.c is used
 - KZM9D reference can no longer be built for non-multiplatform
 - CONFIG_MACH_KZM9D_REFERENCE actually no longer exists
 - emev2-kzm9d-reference.dts has been removed, use emev2-kzm9d.dts instead
 - The same emev2-kzm9d.dts is used regardless of kernel configuration
  - emev2-kzm9d.dtb can be used with legacy non-multiplatform
  - emev2-kzm9d.dtb can be used with multiplatform

In practice the above means that legacy board code users can keep on using
existing emev2-kzm9d.dtb as-is, but when updating to multiplatform kernel
the DTB needs to be updated as well and from that point the DTB needs to
be updated whenever new hardware is added.

The above seems pretty straight forward from my point of view, so I
propose that we follow the same style for future multiplatform board
support.

Before merging this series I'd like to see Yoshii-san's CCF patches
for KZM9D and EMEV2 to be finalized and picked up.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 Written against renesas.git tag renesas-devel-20131001 and
 [PATCH 00/10] ARM: shmobile: r8a7791 SoC and Koelsch update V2
 plus selected CCF patches from Yoshii-san.

 arch/arm/boot/dts/Makefile                     |    3 -
 arch/arm/boot/dts/emev2-kzm9d-reference.dts    |   57 ------------------------
 arch/arm/boot/dts/emev2-kzm9d.dts              |   33 +++++++++++++
 arch/arm/mach-shmobile/Kconfig                 |   22 ---------
 arch/arm/mach-shmobile/Makefile                |    5 +-
 arch/arm/mach-shmobile/Makefile.boot           |    1 
 arch/arm/mach-shmobile/board-kzm9d-reference.c |    1 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
  2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
@ 2013-10-01 10:33 ` Magnus Damm
  2013-10-03  3:49   ` Simon Horman
  2013-10-01 10:33 ` [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform Magnus Damm
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 17+ messages in thread
From: Magnus Damm @ 2013-10-01 10:33 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm@opensource.se>

Copy the device nodes from KZM9D reference into the KZM9D
device tree file. This will allow us to use a single DTS
file regarless 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 are used.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/boot/dts/emev2-kzm9d.dts |   33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

--- 0001/arch/arm/boot/dts/emev2-kzm9d.dts
+++ work/arch/arm/boot/dts/emev2-kzm9d.dts	2013-09-26 19:42:16.000000000 +0900
@@ -1,7 +1,7 @@
 /*
  * Device Tree Source for the KZM9D board
  *
- * Copyright (C) 2012 Renesas Solutions Corp.
+ * Copyright (C) 2013 Renesas Solutions Corp.
  *
  * 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
@@ -23,4 +23,35 @@
 	chosen {
 		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
 	};
+
+	reg_1p8v: regulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-1.8V";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	reg_3p3v: regulator@1 {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	lan9220@20000000 {
+		compatible = "smsc,lan9220", "smsc,lan9115";
+		reg = <0x20000000 0x10000>;
+		phy-mode = "mii";
+		interrupt-parent = <&gpio0>;
+		interrupts = <1 1>;	/* active high */
+		reg-io-width = <4>;
+		smsc,irq-active-high;
+		smsc,irq-push-pull;
+		vddvario-supply = <&reg_1p8v>;
+		vdd33a-supply = <&reg_3p3v>;
+	};
 };

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
  2013-10-01 10:33 ` [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS Magnus Damm
@ 2013-10-03  3:49   ` Simon Horman
  2013-10-03  9:56     ` Laurent Pinchart
  0 siblings, 1 reply; 17+ messages in thread
From: Simon Horman @ 2013-10-03  3:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 07:33:05PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Copy the device nodes from KZM9D reference into the KZM9D
> device tree file. This will allow us to use a single DTS
> file regarless 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 are used.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
> 
>  arch/arm/boot/dts/emev2-kzm9d.dts |   33 ++++++++++++++++++++++++++++++++-
>  1 file changed, 32 insertions(+), 1 deletion(-)

Thanks, I have queued this up in the dt3 branch.
It should make it into v3.13 but if not I'll rename the branch
dt after rebasing it on v3.13-rcX which will then be targeted at v3.14.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
  2013-10-03  3:49   ` Simon Horman
@ 2013-10-03  9:56     ` Laurent Pinchart
  2013-10-03 23:57       ` Simon Horman
  0 siblings, 1 reply; 17+ messages in thread
From: Laurent Pinchart @ 2013-10-03  9:56 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

On Thursday 03 October 2013 12:49:48 Simon Horman wrote:
> On Tue, Oct 01, 2013 at 07:33:05PM +0900, Magnus Damm wrote:
> > From: Magnus Damm <damm@opensource.se>
> > 
> > Copy the device nodes from KZM9D reference into the KZM9D
> > device tree file. This will allow us to use a single DTS
> > file regarless 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 are used.
> > 
> > Signed-off-by: Magnus Damm <damm@opensource.se>
> > ---
> > 
> >  arch/arm/boot/dts/emev2-kzm9d.dts |   33 +++++++++++++++++++++++++++++++-
> >  1 file changed, 32 insertions(+), 1 deletion(-)
> 
> Thanks, I have queued this up in the dt3 branch.

Splitting the series across two branches would result in bisection breakages 
I'm afraid. Would it be an issue to queue all patches to a single branch ?

> It should make it into v3.13 but if not I'll rename the branch
> dt after rebasing it on v3.13-rcX which will then be targeted at v3.14.

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
  2013-10-03  9:56     ` Laurent Pinchart
@ 2013-10-03 23:57       ` Simon Horman
  0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-03 23:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Oct 03, 2013 at 11:56:40AM +0200, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Thursday 03 October 2013 12:49:48 Simon Horman wrote:
> > On Tue, Oct 01, 2013 at 07:33:05PM +0900, Magnus Damm wrote:
> > > From: Magnus Damm <damm@opensource.se>
> > > 
> > > Copy the device nodes from KZM9D reference into the KZM9D
> > > device tree file. This will allow us to use a single DTS
> > > file regarless 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 are used.
> > > 
> > > Signed-off-by: Magnus Damm <damm@opensource.se>
> > > ---
> > > 
> > >  arch/arm/boot/dts/emev2-kzm9d.dts |   33 +++++++++++++++++++++++++++++++-
> > >  1 file changed, 32 insertions(+), 1 deletion(-)
> > 
> > Thanks, I have queued this up in the dt3 branch.
> 
> Splitting the series across two branches would result in bisection breakages 
> I'm afraid. Would it be an issue to queue all patches to a single branch ?

Sure, I will re-arrange things accordingly.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
  2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
  2013-10-01 10:33 ` [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS Magnus Damm
@ 2013-10-01 10:33 ` Magnus Damm
  2013-10-03  4:22   ` Simon Horman
  2013-10-01 10:33 ` [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support Magnus Damm
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 17+ messages in thread
From: Magnus Damm @ 2013-10-01 10:33 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm@opensource.se>

Change the multiplatform kconfig bits for KZM9D from
CONFIG_MACH_KZM9D_REFERENCE into CONFIG_MACH_KZM9D
to match the non-multiplatform case.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/mach-shmobile/Kconfig  |   10 ++--------
 arch/arm/mach-shmobile/Makefile |    4 ++++
 2 files changed, 6 insertions(+), 8 deletions(-)

--- 0001/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig	2013-09-27 11:22:20.000000000 +0900
@@ -22,16 +22,10 @@ config ARCH_EMEV2
 
 comment "SH-Mobile Board Type"
 
-config MACH_KZM9D_REFERENCE
-	bool "KZM9D board - Reference Device Tree Implementation"
+config MACH_KZM9D
+	bool "KZM9D board"
 	depends on ARCH_EMEV2
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	---help---
-	   Use reference implementation of KZM9D board support
-	   which makes a greater use of device tree at the expense
-	   of not supporting a number of devices.
-
-	   This is intended to aid developers
 
 comment "SH-Mobile System Configuration"
 endif
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile	2013-09-27 11:23:32.000000000 +0900
@@ -52,6 +52,9 @@ obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740
 obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
 
 # Board objects
+ifdef CONFIG_ARCH_SHMOBILE_MULTI
+obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d-reference.o
+else
 obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o
 obj-$(CONFIG_MACH_APE6EVM_REFERENCE)	+= board-ape6evm-reference.o
 obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o
@@ -68,6 +71,7 @@ obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d.
 obj-$(CONFIG_MACH_KZM9D_REFERENCE)	+= board-kzm9d-reference.o
 obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o
 obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o
+endif
 
 # Framework support
 obj-$(CONFIG_SMP)		+= $(smp-y)

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
  2013-10-01 10:33 ` [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform Magnus Damm
@ 2013-10-03  4:22   ` Simon Horman
  0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-03  4:22 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 07:33:15PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Change the multiplatform kconfig bits for KZM9D from
> CONFIG_MACH_KZM9D_REFERENCE into CONFIG_MACH_KZM9D
> to match the non-multiplatform case.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
> 
>  arch/arm/mach-shmobile/Kconfig  |   10 ++--------
>  arch/arm/mach-shmobile/Makefile |    4 ++++
>  2 files changed, 6 insertions(+), 8 deletions(-)

Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch
soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support
  2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
  2013-10-01 10:33 ` [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS Magnus Damm
  2013-10-01 10:33 ` [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform Magnus Damm
@ 2013-10-01 10:33 ` Magnus Damm
  2013-10-03  4:24   ` Simon Horman
  2013-10-01 10:33 ` [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB Magnus Damm
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 17+ messages in thread
From: Magnus Damm @ 2013-10-01 10:33 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm@opensource.se>

Now when CCF is supported remove the legacy KZM9D reference
Kconfig bits CONFIG_MACH_KZM9D_REFERENCE for the non-multiplatform
case.

Starting from this commit KZM9D board support is always enabled
via CONFIG_MACH_KZM9D, and CONFIG_ARCH_MULTIPLATFORM is used
to select between board-kzm9d.c and board-kzm9d-reference.c

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

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/mach-shmobile/Kconfig       |   12 ------------
 arch/arm/mach-shmobile/Makefile      |    1 -
 arch/arm/mach-shmobile/Makefile.boot |    1 -
 3 files changed, 14 deletions(-)

--- 0003/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig	2013-09-27 11:25:58.000000000 +0900
@@ -226,18 +226,6 @@ config MACH_KZM9D
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select USE_OF
 
-config MACH_KZM9D_REFERENCE
-	bool "KZM9D board - Reference Device Tree Implementation"
-	depends on ARCH_EMEV2
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select USE_OF
-	---help---
-	   Use reference implementation of KZM9D board support
-	   which makes a greater use of device tree at the expense
-	   of not supporting a number of devices.
-
-	   This is intended to aid developers
-
 config MACH_KZM9G
 	bool "KZM-A9-GT board"
 	depends on ARCH_SH73A0
--- 0003/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile	2013-09-27 11:26:08.000000000 +0900
@@ -68,7 +68,6 @@ obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= bo
 obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o
 obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch.o
 obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d.o
-obj-$(CONFIG_MACH_KZM9D_REFERENCE)	+= board-kzm9d-reference.o
 obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o
 obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o
 endif
--- 0001/arch/arm/mach-shmobile/Makefile.boot
+++ work/arch/arm/mach-shmobile/Makefile.boot	2013-09-27 11:26:16.000000000 +0900
@@ -8,7 +8,6 @@ loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000
-loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support
  2013-10-01 10:33 ` [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support Magnus Damm
@ 2013-10-03  4:24   ` Simon Horman
  0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-03  4:24 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 07:33:24PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Now when CCF is supported remove the legacy KZM9D reference
> Kconfig bits CONFIG_MACH_KZM9D_REFERENCE for the non-multiplatform
> case.
> 
> Starting from this commit KZM9D board support is always enabled
> via CONFIG_MACH_KZM9D, and CONFIG_ARCH_MULTIPLATFORM is used
> to select between board-kzm9d.c and board-kzm9d-reference.c
> 
> The file board-kzm9d-reference.c can no longer be used together
> with the legacy sh-clk clock framework, instead CCF is used.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch
soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

There was some fuzz when applying each of the hunks of the patch.
I have queued up the following, please check that it is correct.


From: Magnus Damm <damm@opensource.se>

[PATCH] ARM: shmobile: Remove non-multiplatform KZM9D reference support

Now when CCF is supported remove the legacy KZM9D reference
Kconfig bits CONFIG_MACH_KZM9D_REFERENCE for the non-multiplatform
case.

Starting from this commit KZM9D board support is always enabled
via CONFIG_MACH_KZM9D, and CONFIG_ARCH_MULTIPLATFORM is used
to select between board-kzm9d.c and board-kzm9d-reference.c

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

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/Kconfig       | 12 ------------
 arch/arm/mach-shmobile/Makefile      |  1 -
 arch/arm/mach-shmobile/Makefile.boot |  1 -
 3 files changed, 14 deletions(-)

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index c9c4f15..a4a4b75 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -237,18 +237,6 @@ config MACH_KZM9D
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select USE_OF
 
-config MACH_KZM9D_REFERENCE
-	bool "KZM9D board - Reference Device Tree Implementation"
-	depends on ARCH_EMEV2
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select USE_OF
-	---help---
-	   Use reference implementation of KZM9D board support
-	   which makes a greater use of device tree at the expense
-	   of not supporting a number of devices.
-
-	   This is intended to aid developers
-
 config MACH_KZM9G
 	bool "KZM-A9-GT board"
 	depends on ARCH_SH73A0
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 0c7ba43..adcdec8 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -71,7 +71,6 @@ obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o
 obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch.o
 obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d.o
-obj-$(CONFIG_MACH_KZM9D_REFERENCE)	+= board-kzm9d-reference.o
 obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o
 obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o
 endif
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index c690b50..391d72a 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -9,7 +9,6 @@ loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_GENMAI) += 0x8008000
 loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000
-loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
  2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
                   ` (2 preceding siblings ...)
  2013-10-01 10:33 ` [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support Magnus Damm
@ 2013-10-01 10:33 ` Magnus Damm
  2013-10-03  4:25   ` Simon Horman
  2013-10-01 10:33 ` [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS Magnus Damm
  2013-10-04  7:47 ` [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Laurent Pinchart
  5 siblings, 1 reply; 17+ messages in thread
From: Magnus Damm @ 2013-10-01 10:33 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm@opensource.se>

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

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/mach-shmobile/board-kzm9d-reference.c |    1 +
 1 file changed, 1 insertion(+)

--- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c	2013-09-27 11:32:00.000000000 +0900
@@ -33,6 +33,7 @@ static void __init kzm9d_add_standard_de
 }
 
 static const char *kzm9d_boards_compat_dt[] __initdata = {
+	"renesas,kzm9d",
 	"renesas,kzm9d-reference",
 	NULL,
 };

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
  2013-10-01 10:33 ` [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB Magnus Damm
@ 2013-10-03  4:25   ` Simon Horman
  0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-03  4:25 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 07:33:34PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Let the multiplatform KZM9D support boot with the
> legacy DTS for KZM9D as well as the KZM9D reference DTS.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch
soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
  2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
                   ` (3 preceding siblings ...)
  2013-10-01 10:33 ` [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB Magnus Damm
@ 2013-10-01 10:33 ` Magnus Damm
  2013-10-03  4:26   ` Simon Horman
  2013-10-04  7:47 ` [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Laurent Pinchart
  5 siblings, 1 reply; 17+ messages in thread
From: Magnus Damm @ 2013-10-01 10:33 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm@opensource.se>

Now when the legacy DTS file emev2-kzm9d.dts can be
used with board-kzm9d.c and board-kzm9d-reference.c
proceed with removing emev-kzm9d-reference.dts.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/boot/dts/Makefile                  |    3 -
 arch/arm/boot/dts/emev2-kzm9d-reference.dts |   57 ---------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

--- 0001/arch/arm/boot/dts/Makefile
+++ work/arch/arm/boot/dts/Makefile	2013-10-01 18:53:19.000000000 +0900
@@ -195,7 +195,6 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball
 	ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
-	emev2-kzm9d-reference.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
@@ -210,7 +209,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm
 	r8a73a4-ape6evm.dtb \
 	r8a73a4-ape6evm-reference.dtb \
 	sh7372-mackerel.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
 	socfpga_vt.dtb
 dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
--- 0001/arch/arm/boot/dts/emev2-kzm9d-reference.dts
+++ /dev/null	2013-06-03 21:41:10.638032047 +0900
@@ -1,57 +0,0 @@
-/*
- * Device Tree Source for the KZM9D board
- *
- * Copyright (C) 2013 Renesas Solutions Corp.
- *
- * 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/ "emev2.dtsi"
-
-/ {
-	model = "EMEV2 KZM9D Board";
-	compatible = "renesas,kzm9d-reference", "renesas,emev2";
-
-	memory {
-		device_type = "memory";
-		reg = <0x40000000 0x8000000>;
-	};
-
-	chosen {
-		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
-	};
-
-	reg_1p8v: regulator@0 {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-1.8V";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
-	reg_3p3v: regulator@1 {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-3.3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
-	lan9220@20000000 {
-		compatible = "smsc,lan9220", "smsc,lan9115";
-		reg = <0x20000000 0x10000>;
-		phy-mode = "mii";
-		interrupt-parent = <&gpio0>;
-		interrupts = <1 1>;	/* active high */
-		reg-io-width = <4>;
-		smsc,irq-active-high;
-		smsc,irq-push-pull;
-		vddvario-supply = <&reg_1p8v>;
-		vdd33a-supply = <&reg_3p3v>;
-	};
-};

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
  2013-10-01 10:33 ` [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS Magnus Damm
@ 2013-10-03  4:26   ` Simon Horman
  0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-03  4:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 01, 2013 at 07:33:43PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Now when the legacy DTS file emev2-kzm9d.dts can be
> used with board-kzm9d.c and board-kzm9d-reference.c
> proceed with removing emev-kzm9d-reference.dts.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Thanks, I have queued this up in the dt3 branch.
It should make it into v3.13 but if not I'll rename the branch
dt after rebasing it on v3.13-rcX which will then be targeted at v3.14.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update
  2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
                   ` (4 preceding siblings ...)
  2013-10-01 10:33 ` [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS Magnus Damm
@ 2013-10-04  7:47 ` Laurent Pinchart
  2013-10-04  8:25   ` Simon Horman
  5 siblings, 1 reply; 17+ messages in thread
From: Laurent Pinchart @ 2013-10-04  7:47 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Magnus,

Thank you for the patches.

On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
> ARM: shmobile: KZM9D Multiplatform update
> 
> [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
> [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
> [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
> support
> [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
> [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS

I've reviewed the patches and they look fine to me.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Does this call for the following patch on top of 05/05 ?

From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Fri, 4 Oct 2013 09:44:34 +0200
Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
 string

The only system compatible string used for the KZM9D board is
"renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
compatible string.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
index 054d8d5..d2c6466 100644
--- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
@@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
 
 static const char *kzm9d_boards_compat_dt[] __initdata = {
 	"renesas,kzm9d",
-	"renesas,kzm9d-reference",
 	NULL,
 };
 
> This series updates mach-shmobile and the KZM9D board code to propose
> a way forward for future CCF-enabled multiplatform board support.
> 
> With this series applied the following rules apply:
> 
>  - CONFIG_ARCH_MULTIPLATFORM=y is used to enable multiplatform
>    - CONFIG_ARCH_SHMOBILE_MULTI=y is used in case of multiplatform build
>  - CONFIG_ARCH SHMOBILE=y is used in case of legacy non-multiplatform build
>  - CONFIG_MACH_KZM9D=y enables KZM9D board support regardless of
> multiplatform
>   - In case of multiplatform build board-kzm9d-reference.c is used
>   - In case of legacy non-multiplatform build board-kzm9d.c is used
> - KZM9D reference can no longer be built for non-multiplatform
> - CONFIG_MACH_KZM9D_REFERENCE actually no longer exists
> - emev2-kzm9d-reference.dts has been removed, use emev2-kzm9d.dts instead
> - The same emev2-kzm9d.dts is used regardless of kernel configuration
>   - emev2-kzm9d.dtb can be used with legacy non-multiplatform
>   - emev2-kzm9d.dtb can be used with multiplatform
> 
> In practice the above means that legacy board code users can keep on using
> existing emev2-kzm9d.dtb as-is, but when updating to multiplatform kernel
> the DTB needs to be updated as well and from that point the DTB needs to
> be updated whenever new hardware is added.
> 
> The above seems pretty straight forward from my point of view, so I
> propose that we follow the same style for future multiplatform board
> support.
> 
> Before merging this series I'd like to see Yoshii-san's CCF patches
> for KZM9D and EMEV2 to be finalized and picked up.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
> 
>  Written against renesas.git tag renesas-devel-20131001 and
>  [PATCH 00/10] ARM: shmobile: r8a7791 SoC and Koelsch update V2
>  plus selected CCF patches from Yoshii-san.
> 
>  arch/arm/boot/dts/Makefile                     |    3 -
>  arch/arm/boot/dts/emev2-kzm9d-reference.dts    |   57 ---------------------
>  arch/arm/boot/dts/emev2-kzm9d.dts              |   33 +++++++++++++
>  arch/arm/mach-shmobile/Kconfig                 |   22 ---------
>  arch/arm/mach-shmobile/Makefile                |    5 +-
>  arch/arm/mach-shmobile/Makefile.boot           |    1
>  arch/arm/mach-shmobile/board-kzm9d-reference.c |    1
-- 
Regards,

Laurent Pinchart


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* Re: [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update
  2013-10-04  7:47 ` [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Laurent Pinchart
@ 2013-10-04  8:25   ` Simon Horman
  2013-10-04  8:55     ` Magnus Damm
  0 siblings, 1 reply; 17+ messages in thread
From: Simon Horman @ 2013-10-04  8:25 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Oct 04, 2013 at 09:47:34AM +0200, Laurent Pinchart wrote:
> Hi Magnus,
> 
> Thank you for the patches.
> 
> On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
> > ARM: shmobile: KZM9D Multiplatform update
> > 
> > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
> > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
> > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
> > support
> > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
> > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
> 
> I've reviewed the patches and they look fine to me.
> 
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> Does this call for the following patch on top of 05/05 ?
> 
> >From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Date: Fri, 4 Oct 2013 09:44:34 +0200
> Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
>  string
> 
> The only system compatible string used for the KZM9D board is
> "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
> compatible string.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> index 054d8d5..d2c6466 100644
> --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
>  
>  static const char *kzm9d_boards_compat_dt[] __initdata = {
>  	"renesas,kzm9d",
> -	"renesas,kzm9d-reference",
>  	NULL,
>  };

In theory no because someone might be using a DTS with
renesas,kzm9d-reference in the wild. In practice I don't think
that is the case so I feel ok about this patch. Magnus, what
do you think?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update
  2013-10-04  8:25   ` Simon Horman
@ 2013-10-04  8:55     ` Magnus Damm
  2013-10-08  1:25       ` Simon Horman
  0 siblings, 1 reply; 17+ messages in thread
From: Magnus Damm @ 2013-10-04  8:55 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Oct 4, 2013 at 5:25 PM, Simon Horman <horms@verge.net.au> wrote:
> On Fri, Oct 04, 2013 at 09:47:34AM +0200, Laurent Pinchart wrote:
>> Hi Magnus,
>>
>> Thank you for the patches.
>>
>> On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
>> > ARM: shmobile: KZM9D Multiplatform update
>> >
>> > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
>> > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
>> > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
>> > support
>> > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
>> > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
>>
>> I've reviewed the patches and they look fine to me.
>>
>> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>
>> Does this call for the following patch on top of 05/05 ?
>>
>> >From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
>> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>> Date: Fri, 4 Oct 2013 09:44:34 +0200
>> Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
>>  string
>>
>> The only system compatible string used for the KZM9D board is
>> "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
>> compatible string.
>>
>> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>> ---
>>  arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
>> index 054d8d5..d2c6466 100644
>> --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
>> +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
>> @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
>>
>>  static const char *kzm9d_boards_compat_dt[] __initdata = {
>>       "renesas,kzm9d",
>> -     "renesas,kzm9d-reference",
>>       NULL,
>>  };
>
> In theory no because someone might be using a DTS with
> renesas,kzm9d-reference in the wild. In practice I don't think
> that is the case so I feel ok about this patch. Magnus, what
> do you think?

Hi Simon and Laurent,

Thanks for the patch and the comments. I agree with Laurent that this
patch series isn't complete without that patch, but at the same time I
agree with Simon about current state. =) So I propose that this patch
should be merged later on - in say half a year or so.

Perhaps we should aim that the kernel used for the LTSI after
LTSI-3.10 should include this fix?

Another activity we need to deal with in the future is to depreciate
the non-multiplatform board support. It's probably good to hear from
the ARM SoC guys what kind of schedule they have in mind for the
common ARM architecture bits.

Cheers,

/ magnus

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update
  2013-10-04  8:55     ` Magnus Damm
@ 2013-10-08  1:25       ` Simon Horman
  0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-08  1:25 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Oct 04, 2013 at 05:55:47PM +0900, Magnus Damm wrote:
> On Fri, Oct 4, 2013 at 5:25 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Fri, Oct 04, 2013 at 09:47:34AM +0200, Laurent Pinchart wrote:
> >> Hi Magnus,
> >>
> >> Thank you for the patches.
> >>
> >> On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
> >> > ARM: shmobile: KZM9D Multiplatform update
> >> >
> >> > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
> >> > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
> >> > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
> >> > support
> >> > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
> >> > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
> >>
> >> I've reviewed the patches and they look fine to me.
> >>
> >> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >>
> >> Does this call for the following patch on top of 05/05 ?
> >>
> >> >From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
> >> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> >> Date: Fri, 4 Oct 2013 09:44:34 +0200
> >> Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
> >>  string
> >>
> >> The only system compatible string used for the KZM9D board is
> >> "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
> >> compatible string.
> >>
> >> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> >> ---
> >>  arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
> >>  1 file changed, 1 deletion(-)
> >>
> >> diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> >> index 054d8d5..d2c6466 100644
> >> --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
> >> +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> >> @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
> >>
> >>  static const char *kzm9d_boards_compat_dt[] __initdata = {
> >>       "renesas,kzm9d",
> >> -     "renesas,kzm9d-reference",
> >>       NULL,
> >>  };
> >
> > In theory no because someone might be using a DTS with
> > renesas,kzm9d-reference in the wild. In practice I don't think
> > that is the case so I feel ok about this patch. Magnus, what
> > do you think?
> 
> Hi Simon and Laurent,
> 
> Thanks for the patch and the comments. I agree with Laurent that this
> patch series isn't complete without that patch, but at the same time I
> agree with Simon about current state. =) So I propose that this patch
> should be merged later on - in say half a year or so.

Sure. I will leave it hanging around in patchwork to try
and remind us (me) to do something with it later.

> Perhaps we should aim that the kernel used for the LTSI after
> LTSI-3.10 should include this fix?

Sounds reasonable.

> Another activity we need to deal with in the future is to depreciate
> the non-multiplatform board support. It's probably good to hear from
> the ARM SoC guys what kind of schedule they have in mind for the
> common ARM architecture bits.

Perhaps a discussion for another thread?

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2013-10-08  1:25 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
2013-10-01 10:33 ` [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS Magnus Damm
2013-10-03  3:49   ` Simon Horman
2013-10-03  9:56     ` Laurent Pinchart
2013-10-03 23:57       ` Simon Horman
2013-10-01 10:33 ` [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform Magnus Damm
2013-10-03  4:22   ` Simon Horman
2013-10-01 10:33 ` [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support Magnus Damm
2013-10-03  4:24   ` Simon Horman
2013-10-01 10:33 ` [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB Magnus Damm
2013-10-03  4:25   ` Simon Horman
2013-10-01 10:33 ` [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS Magnus Damm
2013-10-03  4:26   ` Simon Horman
2013-10-04  7:47 ` [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Laurent Pinchart
2013-10-04  8:25   ` Simon Horman
2013-10-04  8:55     ` Magnus Damm
2013-10-08  1:25       ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).