summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubramaniam C.A <subramaniam.ca@ti.com>2012-02-02 03:41:39 +0100
committerAndy Green <andy.green@linaro.org>2012-03-13 11:20:21 +0800
commit639ea8ec82c59fde7261244750573b7c28f1af0b (patch)
treea7f4ebab0cda037916c0ecd090aa57f9a841780f
parent1df0329a93a85c0a42238477556c8357280bf5f2 (diff)
ARM: omap5: hwmod: correct and enable iss
Corrected the iss hwmod data, and enabled it. Signed-off-by: Cris Jansson <cjansson@ti.com> Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_54xx_data.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 3e8761ab393..feb2735b5b8 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -3225,10 +3225,11 @@ static struct omap_hwmod_opt_clk iss_opt_clks[] = {
static struct omap_hwmod omap54xx_iss_hwmod = {
.name = "iss",
.class = &omap54xx_iss_hwmod_class,
+ .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
.clkdm_name = "cam_clkdm",
.mpu_irqs = omap54xx_iss_irqs,
.sdma_reqs = omap54xx_iss_sdma_reqs,
- .main_clk = "dpll_core_h22x2_ck",
+ .main_clk = "iss_fck",
.prcm = {
.omap4 = {
.clkctrl_offs = OMAP54XX_CM_CAM_ISS_CLKCTRL_OFFSET,
@@ -6429,7 +6430,7 @@ static __initdata struct omap_hwmod *omap54xx_hwmods[] = {
#endif
/* iss class */
-/* &omap54xx_iss_hwmod, */
+ &omap54xx_iss_hwmod,
#ifndef CONFIG_OMAP_PM_STANDALONE
/* iva class */