Commit f1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac
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 from preventing core suspend 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
| ... | ... | @@ -1261,8 +1261,6 @@ |
| 1261 | 1261 | .name = "gpmc", |
| 1262 | 1262 | .class = &dra7xx_gpmc_hwmod_class, |
| 1263 | 1263 | .clkdm_name = "l3main1_clkdm", |
| 1264 | - .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET | | |
| 1265 | - HWMOD_SWSUP_SIDLE), | |
| 1266 | 1264 | .main_clk = "l3_iclk_div", |
| 1267 | 1265 | .prcm = { |
| 1268 | 1266 | .omap4 = { |