Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[linux-2.6-microblaze.git] / arch / arm / mach-davinci / tnetv107x.c

diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c
index 4545667..f4d7fbb 100644 (file)
--- a/arch/arm/mach-davinci/tnetv107x.c
+++ b/arch/arm/mach-davinci/tnetv107x.c
@@ -264,7 +264,7 @@ static struct clk_lookup clks[] = {
        CLK(NULL,               "clk_chipcfg",          &clk_chipcfg),
        CLK("tnetv107x-ts.0",   NULL,                   &clk_tsc),
        CLK(NULL,               "clk_rom",              &clk_rom),
-       CLK(NULL,               "uart2",                &clk_uart2),
+       CLK("serial8250.2",     NULL,                   &clk_uart2),
        CLK(NULL,               "clk_pktsec",           &clk_pktsec),
        CLK("tnetv107x-rng.0",  NULL,                   &clk_rng),
        CLK("tnetv107x-pka.0",  NULL,                   &clk_pka),
@@ -274,8 +274,8 @@ static struct clk_lookup clks[] = {
        CLK(NULL,               "clk_gpio",             &clk_gpio),
        CLK(NULL,               "clk_mdio",             &clk_mdio),
        CLK("dm6441-mmc.0",     NULL,                   &clk_sdio0),
-       CLK(NULL,               "uart0",                &clk_uart0),
-       CLK(NULL,               "uart1",                &clk_uart1),
+       CLK("serial8250.0",     NULL,                   &clk_uart0),
+       CLK("serial8250.1",     NULL,                   &clk_uart1),
        CLK(NULL,               "timer0",               &clk_timer0),
        CLK(NULL,               "timer1",               &clk_timer1),
        CLK("tnetv107x_wdt.0",  NULL,                   &clk_wdt_arm),
@@ -757,7 +757,7 @@ static struct davinci_soc_info tnetv107x_soc_info = {
        .gpio_type              = GPIO_TYPE_TNETV107X,
        .gpio_num               = TNETV107X_N_GPIO,
        .timer_info             = &timer_info,
-       .serial_dev             = &tnetv107x_serial_device,
+       .serial_dev             = tnetv107x_serial_device,
 };
 
 void __init tnetv107x_init(void)