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

[linux-2.6-block.git] / arch / arm / mach-omap2 / board-generic.c

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index b61c049f92d6a361de57b16fe11c4773c12b88c6..34ff14b7beabb0bba487b517cb0430b19a0c9441 100644 (file)
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -162,6 +162,42 @@ DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
+#ifdef CONFIG_SOC_TI81XX
+static const char *const ti814x_boards_compat[] __initconst = {
+       "ti,dm8148",
+       "ti,dm814",
+       NULL,
+};
+
+DT_MACHINE_START(TI81XX_DT, "Generic ti814x (Flattened Device Tree)")
+       .reserve        = omap_reserve,
+       .map_io         = ti81xx_map_io,
+       .init_early     = ti814x_init_early,
+       .init_machine   = omap_generic_init,
+       .init_late      = ti81xx_init_late,
+       .init_time      = omap3_gptimer_timer_init,
+       .dt_compat      = ti814x_boards_compat,
+       .restart        = ti81xx_restart,
+MACHINE_END
+
+static const char *const ti816x_boards_compat[] __initconst = {
+       "ti,dm8168",
+       "ti,dm816",
+       NULL,
+};
+
+DT_MACHINE_START(TI816X_DT, "Generic ti816x (Flattened Device Tree)")
+       .reserve        = omap_reserve,
+       .map_io         = ti81xx_map_io,
+       .init_early     = ti816x_init_early,
+       .init_machine   = omap_generic_init,
+       .init_late      = ti81xx_init_late,
+       .init_time      = omap3_gptimer_timer_init,
+       .dt_compat      = ti816x_boards_compat,
+       .restart        = ti81xx_restart,
+MACHINE_END
+#endif
+
 #ifdef CONFIG_SOC_AM33XX
 static const char *const am33xx_boards_compat[] __initconst = {
        "ti,am33xx",
@@ -189,6 +225,9 @@ static const char *const omap4_boards_compat[] __initconst = {
 };
 
 DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
+       .l2c_aux_val    = OMAP_L2C_AUX_CTRL,
+       .l2c_aux_mask   = 0xcf9fffff,
+       .l2c_write_sec  = omap4_l2c310_write_sec,
        .reserve        = omap_reserve,
        .smp            = smp_ops(omap4_smp_ops),
        .map_io         = omap4_map_io,
@@ -232,6 +271,9 @@ static const char *const am43_boards_compat[] __initconst = {
 };
 
 DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
+       .l2c_aux_val    = OMAP_L2C_AUX_CTRL,
+       .l2c_aux_mask   = 0xcf9fffff,
+       .l2c_write_sec  = omap4_l2c310_write_sec,
        .map_io         = am33xx_map_io,
        .init_early     = am43xx_init_early,
        .init_late      = am43xx_init_late,