Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 14 deletions

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 9be261beae7d..a3a94e9c9378 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -314,7 +314,7 @@ static struct clk timer2_clk = {
         .name = "timer2",
         .parent = &pll1_aux_clk,
         .lpsc = DAVINCI_LPSC_TIMER2,
-        .usecount = 1,              /* REVISIT: why cant' this be disabled? */
+        .usecount = 1,              /* REVISIT: why can't this be disabled? */
 };
 
 static struct clk timer3_clk = {
@@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = {
         CLK(NULL, "uart1", &uart1_clk),
         CLK(NULL, "uart2", &uart2_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
-        CLK("davinci-asp.0", NULL, &asp0_clk),
-        CLK("davinci-asp.1", NULL, &asp1_clk),
+        CLK("davinci-mcbsp.0", NULL, &asp0_clk),
+        CLK("davinci-mcbsp.1", NULL, &asp1_clk),
         CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
         CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
         CLK("spi_davinci.0", NULL, &spi0_clk),
@@ -403,21 +403,13 @@ static struct resource dm355_spi0_resources[] = {
                 .start = 16,
                 .flags = IORESOURCE_DMA,
         },
-        {
-                .start = EVENTQ_1,
-                .flags = IORESOURCE_DMA,
-        },
 };
 
 static struct davinci_spi_platform_data dm355_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,
+        .cshold_bug     = true,
+        .dma_event_q    = EVENTQ_1,
 };
 static struct platform_device dm355_spi0_device = {
         .name = "spi_davinci",
@@ -664,7 +656,7 @@ static struct resource dm355_asp1_resources[] = {
 };
 
 static struct platform_device dm355_asp1_device = {
-        .name           = "davinci-asp",
+        .name           = "davinci-mcbsp",
         .id             = 1,
         .num_resources  = ARRAY_SIZE(dm355_asp1_resources),
         .resource       = dm355_asp1_resources,