1 files changed, 25 insertions, 15 deletions

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 7781e35daec3..4604e72d7d99 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "usb", &usb_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
         CLK("davinci_voicecodec", NULL, &voicecodec_clk),
-        CLK("davinci-asp.0", NULL, &asp0_clk),
+        CLK("davinci-mcbsp", NULL, &asp0_clk),
         CLK(NULL, "rto", &rto_clk),
         CLK(NULL, "mjcp", &mjcp_clk),
         CLK(NULL, NULL, NULL),
@@ -625,12 +625,7 @@ static u64 dm365_spi0_dma_mask = DMA_BIT_MASK(32);
 static struct davinci_spi_platform_data dm365_spi0_pdata = {
         .version        = SPI_VERSION_1,
         .num_chipselect = 2,
-        .clk_internal   = 1,
-        .cs_hold        = 1,
-        .intr_level     = 0,
-        .poll_mode      = 1,    /* 0 -> interrupt mode 1-> polling mode */
-        .c2tdelay       = 0,
-        .t2cdelay       = 0,
+        .dma_event_q    = EVENTQ_3,
 };
 
 static struct resource dm365_spi0_resources[] = {
@@ -651,10 +646,6 @@ static struct resource dm365_spi0_resources[] = {
                 .start = 16,
                 .flags = IORESOURCE_DMA,
         },
-        {
-                .start = EVENTQ_3,
-                .flags = IORESOURCE_DMA,
-        },
 };
 
 static struct platform_device dm365_spi0_device = {
@@ -691,7 +682,6 @@ static struct emac_platform_data dm365_emac_pdata = {
         .ctrl_reg_offset        = DM365_EMAC_CNTRL_OFFSET,
         .ctrl_mod_reg_offset    = DM365_EMAC_CNTRL_MOD_OFFSET,
         .ctrl_ram_offset        = DM365_EMAC_CNTRL_RAM_OFFSET,
-        .mdio_reg_offset        = DM365_EMAC_MDIO_OFFSET,
         .ctrl_ram_size          = DM365_EMAC_CNTRL_RAM_SIZE,
         .version                = EMAC_VERSION_2,
 };
@@ -699,7 +689,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 +724,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,
@@ -908,8 +913,8 @@ static struct resource dm365_asp_resources[] = {
 };
 
 static struct platform_device dm365_asp_device = {
-        .name           = "davinci-asp",
-        .id             = 0,
+        .name           = "davinci-mcbsp",
+        .id             = -1,
         .num_resources  = ARRAY_SIZE(dm365_asp_resources),
         .resource       = dm365_asp_resources,
 };
@@ -1219,7 +1224,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);