diff mbox

[01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS

Message ID 20131001103305.813.70296.sendpatchset@w520 (mailing list archive)
State New, archived
Headers show

Commit Message

Magnus Damm Oct. 1, 2013, 10:33 a.m. UTC
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(-)

Comments

Simon Horman Oct. 3, 2013, 3:49 a.m. UTC | #1
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.
Laurent Pinchart Oct. 3, 2013, 9:56 a.m. UTC | #2
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.
Simon Horman Oct. 3, 2013, 11:57 p.m. UTC | #3
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.
diff mbox

Patch

--- 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>;
+	};
 };