ARM: davinci: fix clock lookup for mdio device

This patch removes the clock alias for mdio device and adds a entry
in clock lookup table, this entry can now be used by both DT and
non-DT case.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

6 files changed, 7 insertions, 12 deletions

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 111613bc62b7..d6c746e35ad9 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -417,6 +417,7 @@ static struct clk_lookup da830_clks[] = {
         CLK(NULL,               "aintc",        &aintc_clk),
         CLK(NULL,               "secu_mgr",     &secu_mgr_clk),
         CLK("davinci_emac.1",   NULL,           &emac_clk),
+        CLK("davinci_mdio.0",   "fck",          &emac_clk),
         CLK(NULL,               "gpio",         &gpio_clk),
         CLK("i2c_davinci.2",    NULL,           &i2c1_clk),
         CLK(NULL,               "usb11",        &usb11_clk),
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 5ef37f9d5984..f56e5fbfa2fd 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -461,6 +461,7 @@ static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "arm",          &arm_clk),
         CLK(NULL,               "rmii",         &rmii_clk),
         CLK("davinci_emac.1",   NULL,           &emac_clk),
+        CLK("davinci_mdio.0",   "fck",          &emac_clk),
         CLK("davinci-mcasp.0",  NULL,           &mcasp_clk),
         CLK("da8xx_lcdc.0",     "fck",          &lcdc_clk),
         CLK("da830-mmc.0",      NULL,           &mmcsd0_clk),
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index a478d179dae3..2e473fefd71e 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -481,12 +481,8 @@ int __init da8xx_register_emac(void)
         ret = platform_device_register(&da8xx_mdio_device);
         if (ret < 0)
                 return ret;
-        ret = platform_device_register(&da8xx_emac_device);
-        if (ret < 0)
-                return ret;
-        ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev),
-                            NULL, &da8xx_emac_device.dev);
-        return ret;
+
+        return platform_device_register(&da8xx_emac_device);
 }
 
 static struct resource da830_mcasp1_resources[] = {
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 3a039bcf5337..278080de9078 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -477,6 +477,7 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "timer3", &timer3_clk),
         CLK(NULL, "usb", &usb_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK("davinci_voicecodec", NULL, &voicecodec_clk),
         CLK("davinci-mcbsp", NULL, &asp0_clk),
         CLK(NULL, "rto", &rto_clk),
@@ -1422,8 +1423,6 @@ static int __init dm365_init_devices(void)
 
         platform_device_register(&dm365_mdio_device);
         platform_device_register(&dm365_emac_device);
-        clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev),
-                      NULL, &dm365_emac_device.dev);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 23de0dea9884..4f74682293d6 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -307,6 +307,7 @@ static struct clk_lookup dm644x_clks[] = {
         CLK("serial8250.1", NULL, &uart1_clk),
         CLK("serial8250.2", NULL, &uart2_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("palm_bk3710", NULL, &ide_clk),
         CLK("davinci-mcbsp", NULL, &asp_clk),
@@ -950,8 +951,6 @@ static int __init dm644x_init_devices(void)
 
         platform_device_register(&dm644x_mdio_device);
         platform_device_register(&dm644x_emac_device);
-        clk_add_alias(NULL, dev_name(&dm644x_mdio_device.dev),
-                      NULL, &dm644x_emac_device.dev);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 4b258042dff9..68f8d1f1aca1 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -351,6 +351,7 @@ static struct clk_lookup dm646x_clks[] = {
         CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
         CLK(NULL, "aemif", &aemif_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK(NULL, "pwm0", &pwm0_clk),
         CLK(NULL, "pwm1", &pwm1_clk),
         CLK(NULL, "timer0", &timer0_clk),
@@ -940,8 +941,6 @@ static int __init dm646x_init_devices(void)
 
         platform_device_register(&dm646x_mdio_device);
         platform_device_register(&dm646x_emac_device);
-        clk_add_alias(NULL, dev_name(&dm646x_mdio_device.dev),
-                      NULL, &dm646x_emac_device.dev);
 
         return 0;
 }