Merge branch 'old_next' into next

[pandora-kernel.git] / arch / arm / mach-davinci / da830.c

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index ec23ab4..2ed2f82 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -148,7 +148,7 @@ static struct clk scr2_ss_clk = {
 static struct clk dmax_clk = {
        .name           = "dmax",
        .parent         = &pll0_sysclk2,
-       .lpsc           = DA8XX_LPSC0_DMAX,
+       .lpsc           = DA8XX_LPSC0_PRUSS,
        .flags          = ALWAYS_ENABLED,
 };
 
@@ -397,8 +397,8 @@ static struct clk_lookup da830_clks[] = {
        CLK(NULL,               "uart0",        &uart0_clk),
        CLK(NULL,               "uart1",        &uart1_clk),
        CLK(NULL,               "uart2",        &uart2_clk),
-       CLK("dm_spi.0",         NULL,           &spi0_clk),
-       CLK("dm_spi.1",         NULL,           &spi1_clk),
+       CLK("spi_davinci.0",    NULL,           &spi0_clk),
+       CLK("spi_davinci.1",    NULL,           &spi1_clk),
        CLK(NULL,               "ecap0",        &ecap0_clk),
        CLK(NULL,               "ecap1",        &ecap1_clk),
        CLK(NULL,               "ecap2",        &ecap2_clk),