7 files changed, 92 insertions, 5 deletions

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index caeb7f4a3a6d..9039221649d4 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -352,7 +352,7 @@ int __init da8xx_register_watchdog(void)
 static struct resource da8xx_emac_resources[] = {
         {
                 .start  = DA8XX_EMAC_CPPI_PORT_BASE,
-                .end    = DA8XX_EMAC_CPPI_PORT_BASE + 0x5000 - 1,
+                .end    = DA8XX_EMAC_CPPI_PORT_BASE + SZ_16K - 1,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -396,9 +396,34 @@ static struct platform_device da8xx_emac_device = {
         .resource       = da8xx_emac_resources,
 };
 
+static struct resource da8xx_mdio_resources[] = {
+        {
+                .start  = DA8XX_EMAC_MDIO_BASE,
+                .end    = DA8XX_EMAC_MDIO_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device da8xx_mdio_device = {
+        .name           = "davinci_mdio",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(da8xx_mdio_resources),
+        .resource       = da8xx_mdio_resources,
+};
+
 int __init da8xx_register_emac(void)
 {
-        return platform_device_register(&da8xx_emac_device);
+        int ret;
+
+        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;
 }
 
 static struct resource da830_mcasp1_resources[] = {
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 6b6f4c643709..71f0f9d5c56a 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -699,7 +699,7 @@ static struct emac_platform_data dm365_emac_pdata = {
 static struct resource dm365_emac_resources[] = {
         {
                 .start  = DM365_EMAC_BASE,
-                .end    = DM365_EMAC_BASE + 0x47ff,
+                .end    = DM365_EMAC_BASE + SZ_16K - 1,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -734,6 +734,21 @@ static struct platform_device dm365_emac_device = {
         .resource       = dm365_emac_resources,
 };
 
+static struct resource dm365_mdio_resources[] = {
+        {
+                .start  = DM365_EMAC_MDIO_BASE,
+                .end    = DM365_EMAC_MDIO_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device dm365_mdio_device = {
+        .name           = "davinci_mdio",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(dm365_mdio_resources),
+        .resource       = dm365_mdio_resources,
+};
+
 static u8 dm365_default_priorities[DAVINCI_N_AINTC_IRQ] = {
         [IRQ_VDINT0]                    = 2,
         [IRQ_VDINT1]                    = 6,
@@ -1220,7 +1235,12 @@ static int __init dm365_init_devices(void)
 
         davinci_cfg_reg(DM365_INT_EDMA_CC);
         platform_device_register(&dm365_edma_device);
+
+        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);
+
         /* Add isif clock alias */
         clk_add_alias("master", dm365_isif_dev.name, "vpss_master", NULL);
         platform_device_register(&dm365_vpss_device);
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 40fec315c99a..c103b2c8caff 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -330,7 +330,7 @@ static struct emac_platform_data dm644x_emac_pdata = {
 static struct resource dm644x_emac_resources[] = {
         {
                 .start  = DM644X_EMAC_BASE,
-                .end    = DM644X_EMAC_BASE + 0x47ff,
+                .end    = DM644X_EMAC_BASE + SZ_16K - 1,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -350,6 +350,21 @@ static struct platform_device dm644x_emac_device = {
        .resource        = dm644x_emac_resources,
 };
 
+static struct resource dm644x_mdio_resources[] = {
+        {
+                .start  = DM644X_EMAC_MDIO_BASE,
+                .end    = DM644X_EMAC_MDIO_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device dm644x_mdio_device = {
+        .name           = "davinci_mdio",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(dm644x_mdio_resources),
+        .resource       = dm644x_mdio_resources,
+};
+
 /*
  * Device specific mux setup
  *
@@ -777,7 +792,12 @@ static int __init dm644x_init_devices(void)
         clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL);
         clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL);
         platform_device_register(&dm644x_edma_device);
+
+        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);
+
         platform_device_register(&dm644x_vpss_device);
         platform_device_register(&dm644x_ccdc_dev);
         platform_device_register(&vpfe_capture_dev);
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index e4a3df1872ac..8da886bc6df5 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -366,7 +366,7 @@ static struct emac_platform_data dm646x_emac_pdata = {
 static struct resource dm646x_emac_resources[] = {
         {
                 .start  = DM646X_EMAC_BASE,
-                .end    = DM646X_EMAC_BASE + 0x47ff,
+                .end    = DM646X_EMAC_BASE + SZ_16K - 1,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -401,6 +401,21 @@ static struct platform_device dm646x_emac_device = {
         .resource       = dm646x_emac_resources,
 };
 
+static struct resource dm646x_mdio_resources[] = {
+        {
+                .start  = DM646X_EMAC_MDIO_BASE,
+                .end    = DM646X_EMAC_MDIO_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device dm646x_mdio_device = {
+        .name           = "davinci_mdio",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(dm646x_mdio_resources),
+        .resource       = dm646x_mdio_resources,
+};
+
 /*
  * Device specific mux setup
  *
@@ -897,7 +912,11 @@ static int __init dm646x_init_devices(void)
         if (!cpu_is_davinci_dm646x())
                 return 0;
 
+        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;
 }
 postcore_initcall(dm646x_init_devices);
diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
index ea5df3b49ec4..dbb5052b6c85 100644
--- a/arch/arm/mach-davinci/include/mach/dm365.h
+++ b/arch/arm/mach-davinci/include/mach/dm365.h
@@ -21,6 +21,7 @@
 #include <media/davinci/vpfe_capture.h>
 
 #define DM365_EMAC_BASE                 (0x01D07000)
+#define DM365_EMAC_MDIO_BASE            (DM365_EMAC_BASE + 0x4000)
 #define DM365_EMAC_CNTRL_OFFSET         (0x0000)
 #define DM365_EMAC_CNTRL_MOD_OFFSET     (0x3000)
 #define DM365_EMAC_CNTRL_RAM_OFFSET     (0x1000)
diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h
index 6fca568a0fd2..515911711a29 100644
--- a/arch/arm/mach-davinci/include/mach/dm644x.h
+++ b/arch/arm/mach-davinci/include/mach/dm644x.h
@@ -28,6 +28,7 @@
 #include <media/davinci/vpfe_capture.h>
 
 #define DM644X_EMAC_BASE                (0x01C80000)
+#define DM644X_EMAC_MDIO_BASE           (DM644X_EMAC_BASE + 0x4000)
 #define DM644X_EMAC_CNTRL_OFFSET        (0x0000)
 #define DM644X_EMAC_CNTRL_MOD_OFFSET    (0x1000)
 #define DM644X_EMAC_CNTRL_RAM_OFFSET    (0x2000)
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index 0a27ee9a70e1..1c4dca924ac0 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -19,6 +19,7 @@
 #include <linux/davinci_emac.h>
 
 #define DM646X_EMAC_BASE                (0x01C80000)
+#define DM646X_EMAC_MDIO_BASE           (DM646X_EMAC_BASE + 0x4000)
 #define DM646X_EMAC_CNTRL_OFFSET        (0x0000)
 #define DM646X_EMAC_CNTRL_MOD_OFFSET    (0x1000)
 #define DM646X_EMAC_CNTRL_RAM_OFFSET    (0x2000)