diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index d97f51f76be..61c01c90a8f 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -1243,7 +1243,8 @@ DT_MACHINE_START(OMAP3_H1, "Olio OMAP3 H1 (Flattened Device Tree)") .handle_irq = omap3_intc_handle_irq, .init_machine = omap3_h1_init, .init_late = omap3630_init_late, - .init_time = omap3_secure_sync32k_timer_init, + .init_time = omap3_sync32k_timer_init, + /* .init_time = omap3_secure_sync32k_timer_init, */ .dt_compat = omap3_h1_boards_compat, .restart = omap3xxx_restart, MACHINE_END @@ -1258,7 +1259,8 @@ MACHINE_START(OMAP3_H1, "Olio OMAP3 H1 Board") .handle_irq = omap3_intc_handle_irq, .init_machine = omap3_h1_init, .init_late = omap3630_init_late, - .init_time = omap3_secure_sync32k_timer_init, + .init_time = omap3_sync32k_timer_init, + /* .init_time = omap3_secure_sync32k_timer_init, */ /* .dt_compat = omap3_h1_boards_compat, */ .restart = omap3xxx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 7c5a6b81875..f9b8a4c965a 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -3818,6 +3818,7 @@ static struct omap_hwmod_ocp_if *omap34xx_gp_hwmod_ocp_ifs[] __initdata = { NULL }; + static struct omap_hwmod_ocp_if *omap36xx_gp_hwmod_ocp_ifs[] __initdata = { &omap3xxx_l4_sec__timer12, &omap3xxx_l4_core__sham, @@ -3975,7 +3976,8 @@ int __init omap3xxx_hwmod_init(void) } else if (rev == OMAP3630_REV_ES1_0 || rev == OMAP3630_REV_ES1_1 || rev == OMAP3630_REV_ES1_2) { h = omap36xx_hwmod_ocp_ifs; - h_gp = omap36xx_gp_hwmod_ocp_ifs; + /* OLIO: We don't want these clocks running */ + /* h_gp = omap36xx_gp_hwmod_ocp_ifs; */ } else { WARN(1, "OMAP3 hwmod family init: unknown chip type\n"); return -EINVAL; |