Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / mach-shmobile / board-lager-reference.c

diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 8dcff51..41c808e 100644 (file)
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -100,23 +100,9 @@ static const struct clk_name clk_names[] __initconst = {
        { "lvds1", "lvds.1", "rcar-du-r8a7790" },
 };
 
-/*
- * This is a really crude hack to work around core platform clock issues
- */
-static const struct clk_name clk_enables[] __initconst = {
-       { "ether", NULL, "ee700000.ethernet" },
-       { "msiof1", NULL, "e6e10000.spi" },
-       { "mmcif1", NULL, "ee220000.mmc" },
-       { "qspi_mod", NULL, "e6b10000.spi" },
-       { "sdhi0", NULL, "ee100000.sd" },
-       { "sdhi2", NULL, "ee140000.sd" },
-       { "thermal", NULL, "e61f0000.thermal" },
-};
-
 static void __init lager_add_standard_devices(void)
 {
        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-       shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
        r8a7790_add_dt_devices();
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
@@ -135,5 +121,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
        .init_time      = rcar_gen2_timer_init,
        .init_machine   = lager_add_standard_devices,
        .init_late      = shmobile_init_late,
+       .reserve        = rcar_gen2_reserve,
        .dt_compat      = lager_boards_compat_dt,
 MACHINE_END