From 1be9ba20e1b3dccc7fb972f0f370ae27c0187718 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 29 Aug 2013 08:36:22 -0300
Subject: [PATCH] [media] v4l: omap4iss: csi2: Enable automatic ULP mode
 transition

Automatically switch between ULP and ON states based on ULPM signal from
complex I/O.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 drivers/staging/media/omap4iss/iss_csiphy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index 25e6f8990242..d5c7cec9b997 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -63,8 +63,8 @@ static int csiphy_set_power(struct iss_csiphy *phy, u32 power)
 
 	writel((readl(phy->cfg_regs + CSI2_COMPLEXIO_CFG) &
 		~CSI2_COMPLEXIO_CFG_PWD_CMD_MASK) |
-		power,
-		phy->cfg_regs + CSI2_COMPLEXIO_CFG);
+	       power | CSI2_COMPLEXIO_CFG_PWR_AUTO,
+	       phy->cfg_regs + CSI2_COMPLEXIO_CFG);
 
 	retry_count = 0;
 	do {
-- 
2.34.1