aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Murphy2015-06-02 12:05:14 -0500
committerDan Murphy2015-06-02 12:05:14 -0500
commitf1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac (patch)
treee0974c95ebdf66c998e2428d5d3af271a0ae323f
parentc12a0f63ff2636cb406f249ca286d1d80bbac5c8 (diff)
parent751538848cfa150c6ff8ff5a12add7ea456e881d (diff)
downloadprocessor-sdk-linux-f1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac.tar.gz
processor-sdk-linux-f1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac.tar.xz
processor-sdk-linux-f1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac.zip
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/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>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_7xx_data.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 31b392b398b9..d10618841fb8 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -1261,8 +1261,6 @@ static struct omap_hwmod dra7xx_gpmc_hwmod = {
1261 .name = "gpmc", 1261 .name = "gpmc",
1262 .class = &dra7xx_gpmc_hwmod_class, 1262 .class = &dra7xx_gpmc_hwmod_class,
1263 .clkdm_name = "l3main1_clkdm", 1263 .clkdm_name = "l3main1_clkdm",
1264 .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |
1265 HWMOD_SWSUP_SIDLE),
1266 .main_clk = "l3_iclk_div", 1264 .main_clk = "l3_iclk_div",
1267 .prcm = { 1265 .prcm = {
1268 .omap4 = { 1266 .omap4 = {