diff options
| author | Evan Wilson <evan@oliodevices.com> | 2016-04-28 18:18:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 5b7c616aa581f54cfe21b3045776f99a232852fe (patch) | |
| tree | d0c46130dc46d286dcadef67c770430c4f41bea8 /arch/arm/mach-omap2 | |
| parent | f8684ce86c0d7b23ee9f617e5d6d0a5e9d6e4c07 (diff) | |
| parent | 19989529b798a6e6fe5fa8d6dfed6b4580da63a9 (diff) | |
| download | olio-linux-3.10-5b7c616aa581f54cfe21b3045776f99a232852fe.tar.xz olio-linux-3.10-5b7c616aa581f54cfe21b3045776f99a232852fe.zip | |
Merge "Fixes for mic -> bluetooth connection. Also changed name of machine to something that can be used in a filename." into android-3.10-bringup
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index a83a3416f06..7cfc31b9162 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -524,7 +524,7 @@ static const char *omap3_h1_boards_compat[] __initdata = { NULL, }; -DT_MACHINE_START(OMAP3_H1, "Olio OMAP3 H1 (Flattened Device Tree)") +DT_MACHINE_START(OMAP3_H1, "Olio_OMAP3_H1_FDT") .atag_offset = 0x100, .reserve = omap_reserve, .map_io = omap3_map_io, @@ -534,11 +534,11 @@ 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_sync32k_timer_init, -/* .init_time = omap3_secure_sync32k_timer_init, */ + .init_time = omap3_sync32k_timer_init, +/* .init_time = omap3_secure_sync32k_timer_init, -our chip does not support secure- */ .dt_compat = omap3_h1_boards_compat, .restart = omap3xxx_restart, - MACHINE_END +MACHINE_END #if 0 /* removing ... for now */ MACHINE_START(OMAP3_H1, "Olio OMAP3 H1 Board") diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index f9b8a4c965a..9f1ae8b2af8 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -3976,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; - /* OLIO: We don't want these clocks running */ + /* OLIO: We don't want these clocks running + since we lack the secure features of the chip. */ /* h_gp = omap36xx_gp_hwmod_ocp_ifs; */ } else { WARN(1, "OMAP3 hwmod family init: unknown chip type\n"); |