ARM: ux500: Enable the SMSC9115 on Snowball via Device Tree

Here we split the description of the external-bus@50000000 over
two description files. In the more generic db8500 description file
we only specify the external-bus. Normally this would be used to
communicate with a NOR-flash device. On the Snowball however, the
SMSC9115 Ethernet chip occupies it. In the Snowball board specific
description file is where we actually specify that it is in fact the
Ethernet device which lives here.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index e840300..a2eb095 100644 (file)
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -288,5 +288,14 @@
                        interrupts = <0 100 0x4>;
                        status = "disabled";
                };
+
+               external-bus@50000000 {
+                       compatible = "simple-bus";
+                       reg = <0x50000000 0x4000000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x50000000 0x4000000>;
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 0cec47b..d99dc04 100644 (file)
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -73,17 +73,19 @@
        soc-u9500 {
 
                external-bus@50000000 {
-                       compatible = "simple-bus";
-                       reg = <0x50000000 0x10000000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-
-                       ethernet@50000000 {
-                               compatible = "smsc,9111";
-                               reg = <0x50000000 0x10000>;
-                               interrupts = <12>;
+                       status = "okay";
+
+                       ethernet@0 {
+                               compatible = "smsc,lan9115";
+                               reg = <0 0x10000>;
+                               interrupts = <12 0x1>;
                                interrupt-parent = <&gpio4>;
+
+                               reg-shift = <1>;
+                               reg-io-width = <2>;
+                               smsc,force-internal-phy;
+                               smsc,irq-active-high;
+                               smsc,irq-push-pull;
                        };
                };