Commit d4d72d56fdc67603633f0168073713180934dbc0
Exists in
smarc-ti-linux-3.14.y
and in
1 other branch
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-ke…
…rnel/platform-linux-feature-tree into ti-linux-3.14.y TI-Feature: platform_base TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git TI-Branch: platform-ti-linux-3.14.y * 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree: ARM: DRA7: hwmod: Fix gpmc hwmod Conflicts: arch/arm/mach-omap2/omap_hwmod_7xx_data.c Signed-off-by: Dan Murphy <DMurphy@ti.com>
Showing 1 changed file Side-by-side Diff
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
| ... | ... | @@ -1245,8 +1245,7 @@ |
| 1245 | 1245 | .syss_offs = 0x0014, |
| 1246 | 1246 | .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE | |
| 1247 | 1247 | SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), |
| 1248 | - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | | |
| 1249 | - SIDLE_SMART_WKUP), | |
| 1248 | + .idlemodes = SIDLE_FORCE | SIDLE_NO | SIDLE_SMART, | |
| 1250 | 1249 | .sysc_fields = &omap_hwmod_sysc_type1, |
| 1251 | 1250 | }; |
| 1252 | 1251 |