Merge tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / mach-tegra / board-dt-tegra30.c

diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c
index b4124b12a779682e67b95010de14983d1a27f15a..5f7c03e972f3dc2654f82022d81129bb5982b0d7 100644 (file)
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@ -56,7 +56,7 @@ struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = {
 
 static __initdata struct tegra_clk_init_table tegra_dt_clk_init_table[] = {
        /* name         parent          rate            enabled */
-       { "uartd",      "pll_p",        408000000,      true },
+       { "uarta",      "pll_p",        408000000,      true },
        { NULL,         NULL,           0,              0},
 };
 
@@ -69,7 +69,7 @@ static void __init tegra30_dt_init(void)
 }
 
 static const char *tegra30_dt_board_compat[] = {
-       "nvidia,cardhu",
+       "nvidia,tegra30",
        NULL
 };