aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2011-06-24 20:31:33 -0500
committerNishanth Menon <nm@ti.com>2011-06-29 13:30:59 -0700
commit7f0fd664ff4e741d98746d2ad90db659315ae035 (patch)
treeb72c1e5685997cd236d2bfbd830426a26f30e7f7 /arch/arm
parent3a147298d14dcd2e012716c403448e49a2a38874 (diff)
downloadkernel_samsung_tuna-7f0fd664ff4e741d98746d2ad90db659315ae035.zip
kernel_samsung_tuna-7f0fd664ff4e741d98746d2ad90db659315ae035.tar.gz
kernel_samsung_tuna-7f0fd664ff4e741d98746d2ad90db659315ae035.tar.bz2
OMAP4: clocks: Remove ENABLE_ON_INIT flag from emif clock nodes
This reverts commit 090830b4c79cd5ac85430822a9b87c90848bedcf. ENABLE_ON_INIT flag is not needed anymore for EMIF clock nodes since the HWMOD framework and emif driver takes care of this This patch reverts the commit which introduced this change to keep reset unused clock feature working Tested-by: Girish S G <girishsg@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/clock44xx_data.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 7478096..d6fb1de 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -1560,7 +1560,6 @@ static struct clk emif1_fck = {
.ops = &clkops_omap4_dflt_wait,
.enable_reg = OMAP4430_CM_MEMIF_EMIF_1_CLKCTRL,
.enable_bit = OMAP4430_MODULEMODE_HWCTRL,
- .flags = ENABLE_ON_INIT,
.clkdm_name = "l3_emif_clkdm",
.parent = &ddrphy_ck,
.recalc = &followparent_recalc,
@@ -1571,7 +1570,6 @@ static struct clk emif2_fck = {
.ops = &clkops_omap4_dflt_wait,
.enable_reg = OMAP4430_CM_MEMIF_EMIF_2_CLKCTRL,
.enable_bit = OMAP4430_MODULEMODE_HWCTRL,
- .flags = ENABLE_ON_INIT,
.clkdm_name = "l3_emif_clkdm",
.parent = &ddrphy_ck,
.recalc = &followparent_recalc,