diff mbox

[v4,9/9] ARM: shmobile: bockw dts: Remove leftover Ethernet node

Message ID 20150227014930.GH31738@verge.net.au (mailing list archive)
State Superseded
Delegated to: Simon Horman
Headers show

Commit Message

Simon Horman Feb. 27, 2015, 1:49 a.m. UTC 
On Thu, Feb 26, 2015 at 05:42:14PM +0100, Ulrich Hecht wrote:
> The previous commit "ARM: shmobile: bockw dts: Move Ethernet node to BSC"
> neglected to remove the old entry.

Thanks, I have squashed this change into that one.

The result was as as follows:
diff mbox

Patch

--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -45,9 +45,11 @@ 
                regulator-boot-on;
                regulator-always-on;
        };
+};
 
+&bsc {
        ethernet@18300000 {
-               compatible = "smsc,lan9220", "smsc,lan9115";
+               compatible = "smsc,lan89218", "smsc,lan9115";
                reg = <0x18300000 0x1000>;
 
                phy-mode = "mii";


However, the change of compatible string seems outside the changelog
description, so I dropped that portion. Leaving the following. If you do
want to update the compat strings please send a follow-up patch.


From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

[PATCH] ARM: shmobile: bockw dts: Move Ethernet node to BSC

Move the Ethernet node to the new BSC node, as its connected to the
Bus State Controller.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
[horms: dropped compat string changes as they seem out of scope]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 96cfcdc..274a1b6f 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -45,7 +45,9 @@ 
 		regulator-boot-on;
 		regulator-always-on;
 	};
+};
 
+&bsc {
 	ethernet@18300000 {
 		compatible = "smsc,lan9220", "smsc,lan9115";
 		reg = <0x18300000 0x1000>;