| Message ID | 1421758306-24838-7-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 3fb72a791c3bade222f037e9325a89b53265b237 |
| Headers | show |
Hi Geert, Thank you for the patch. On Tuesday 20 January 2015 13:51:43 Geert Uytterhoeven wrote: > Move the Ethernet node from the ad-hoc lbsc node to the BSC node, > as its connected to the Bus State Controller. This allows the system to > know the right position of the Ethernet node in the clock and PM domain > hierarchy, and manage the clock and PM domain appropriately. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Tested-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > v3: > - Add Tested-by, > > v2: > - New. > --- > arch/arm/boot/dts/r8a73a4-ape6evm.dts | 35 > +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 > deletions(-) > > diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts > b/arch/arm/boot/dts/r8a73a4-ape6evm.dts index > 0d50bef0123449f5..44c4cac1820a4dfe 100644 > --- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts > +++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts > @@ -72,26 +72,6 @@ > regulator-always-on; > }; > > - lbsc { > - compatible = "simple-bus"; > - #address-cells = <1>; > - #size-cells = <1>; > - ranges = <0 0 0 0x20000000>; > - > - ethernet@8000000 { > - compatible = "smsc,lan9220", "smsc,lan9115"; > - reg = <0x08000000 0x1000>; > - interrupt-parent = <&irqc1>; > - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; > - phy-mode = "mii"; > - reg-io-width = <4>; > - smsc,irq-active-high; > - smsc,irq-push-pull; > - vdd33a-supply = <&ape6evm_fixed_3v3>; > - vddvario-supply = <&ape6evm_fixed_1v8>; > - }; > - }; > - > leds { > compatible = "gpio-leds"; > led1 { > @@ -184,6 +164,21 @@ > voltage-tolerance = <1>; /* 1% */ > }; > > +&bsc { > + ethernet@8000000 { > + compatible = "smsc,lan9220", "smsc,lan9115"; > + reg = <0x08000000 0x1000>; > + interrupt-parent = <&irqc1>; > + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; > + phy-mode = "mii"; > + reg-io-width = <4>; > + smsc,irq-active-high; > + smsc,irq-push-pull; > + vdd33a-supply = <&ape6evm_fixed_3v3>; > + vddvario-supply = <&ape6evm_fixed_1v8>; > + }; > +}; > + > &cmt1 { > status = "okay"; > };
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts index 0d50bef0123449f5..44c4cac1820a4dfe 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts @@ -72,26 +72,6 @@ regulator-always-on; }; - lbsc { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0 0 0x20000000>; - - ethernet@8000000 { - compatible = "smsc,lan9220", "smsc,lan9115"; - reg = <0x08000000 0x1000>; - interrupt-parent = <&irqc1>; - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; - phy-mode = "mii"; - reg-io-width = <4>; - smsc,irq-active-high; - smsc,irq-push-pull; - vdd33a-supply = <&ape6evm_fixed_3v3>; - vddvario-supply = <&ape6evm_fixed_1v8>; - }; - }; - leds { compatible = "gpio-leds"; led1 { @@ -184,6 +164,21 @@ voltage-tolerance = <1>; /* 1% */ }; +&bsc { + ethernet@8000000 { + compatible = "smsc,lan9220", "smsc,lan9115"; + reg = <0x08000000 0x1000>; + interrupt-parent = <&irqc1>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + phy-mode = "mii"; + reg-io-width = <4>; + smsc,irq-active-high; + smsc,irq-push-pull; + vdd33a-supply = <&ape6evm_fixed_3v3>; + vddvario-supply = <&ape6evm_fixed_1v8>; + }; +}; + &cmt1 { status = "okay"; };