ARM: exynos: move sms911x device node to sromc bus on smdk

Use the srom bus to find the right CS to setup smsc911x on. Also add the
dummy regulators needed, and remove the hardcoded local-mac-address.

Change-Id: If40f1eb4204642794e486d6fc4afe866fe1291e2
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17306
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 6979250..a656f30 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -48,15 +48,16 @@
                i2s0 = &i2s_0;
        };
 
-       lan9215@0x05000000 {
-               compatible = "smsc,lan9215", "smsc,lan9115";
-               reg = <0x05000000 0x20000>;
-               interrupts = <5 0>;
-               interrupt-parent = <&wakeup_eint>;
-               phy-mode = "mii";
-               smsc,irq-push-pull;
-               smsc,force-internal-phy;
-               local-mac-address = [00 80 00 23 45 67];
+       sromc-bus {
+               lan9215@1,0 {
+                       compatible = "smsc,lan9215", "smsc,lan9115";
+                       reg = <1 0 0x20000>;
+                       interrupts = <5 0>;
+                       interrupt-parent = <&wakeup_eint>;
+                       phy-mode = "mii";
+                       smsc,irq-push-pull;
+                       smsc,force-internal-phy;
+               };
        };
 
        i2c@12C60000 {

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 50a2910..9c93832 100644 (file)
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -12,6 +12,8 @@
 #include <linux/gpio.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/dwc3-exynos.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/serial_core.h>
 #include <linux/smsc911x.h>
 #include <linux/delay.h>
@@ -630,6 +632,11 @@ static struct platform_device *smdk5250_devices[] __initdata = {
        &exynos_drm_device,
 };
 
+static struct regulator_consumer_supply dummy_supplies[] = {
+       REGULATOR_SUPPLY("vddvario", "7000000.lan9215"),
+       REGULATOR_SUPPLY("vdd33a", "7000000.lan9215"),
+};
+
 static void __init exynos5250_dt_map_io(void)
 {
        exynos_init_io(NULL, 0);
@@ -661,8 +668,24 @@ static void exynos5_i2c_setup(void)
 
 static void __init exynos5250_dt_machine_init(void)
 {
-       if (of_machine_is_compatible("samsung,smdk5250"))
-               smsc911x_init(1);
+       struct device_node *srom_np, *np;
+
+       regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
+       /* Setup pins for any SMSC 911x controller on the SROMC bus */
+       srom_np = of_find_node_by_path("/sromc-bus");
+       if (!srom_np) {
+               printk(KERN_ERR "No /sromc-bus property.\n");
+               goto out;
+       }
+       for_each_child_of_node(srom_np, np) {
+               if (of_device_is_compatible(np, "smsc,lan9115")) {
+                       u32 reg;
+                       of_property_read_u32(np, "reg", &reg);
+                       smsc911x_init(reg);
+               }
+       }
+
        samsung_bl_set(&smdk5250_bl_gpio_info, &smdk5250_bl_data);
 
        if (gpio_request_one(EXYNOS5_GPX2(6), GPIOF_OUT_INIT_HIGH,
@@ -686,6 +709,9 @@ static void __init exynos5250_dt_machine_init(void)
        s5p_tv_setup();
 
        platform_add_devices(smdk5250_devices, ARRAY_SIZE(smdk5250_devices));
+out:
+       of_node_put(srom_np);
+       return;
 }
 
 static char const *exynos5250_dt_compat[] __initdata = {