Skip to contentSkip to conversation

soc-camera: tw9910: Add power control

PATCH Superseded Kuninori Morimoto 2 participants 3 messages Nov 2, 2009 – Nov 4, 2009 Media (V4L/DVB)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/4 soc-camera: tw9910: Add power control

---
 drivers/media/video/tw9910.c |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)
drivers/media/video/tw9910.c +27 -4
index a0b5bbe..8debcd6 100644
@@ -152,7 +152,9 @@
 			 /* 1 : non-auto */
 #define VSCTL       0x08 /* 1 : Vertical out ctrl by DVALID */
 			 /* 0 : Vertical out ctrl by HACTIVE and DVALID */
-#define OEN         0x04 /* Output Enable together with TRI_SEL. */
+#define OEN_TRI_SEL_ALL_ON 0x00 /* Enable output */
+#define OEN_TRI_SEL_CLK_ON 0x04 /* TRI_SEL output */
+
 
 /* OUTCTR1 */
 #define VSP_LO      0x00 /* 0 : VS pin output polarity is active low */
@@ -178,6 +180,12 @@
 			  * but all register content remain unchanged.
 			  * This bit is self-resetting.
 			  */
+#define CLK_PDN    0x08 /* clock power down */
+#define Y_PDN      0x04 /* Luma ADC power down */
+#define C_PDN      0x02 /* Chroma ADC power down */
+
+/* ACNTL2 */
+#define PLL_PDN    0x40 /* PLL power down */
 
 /* VBICNTL */
 
@@ -236,7 +244,6 @@ struct tw9910_priv {
 
 static const struct regval_list tw9910_default_regs[] =
 {
-	{ OPFORM,  0x00 },
 	{ OUTCTR1, VSP_LO | VSSL_VVALID | HSP_HI | HSSL_HSYNC },
 	ENDMARKER,
 };
@@ -471,10 +478,24 @@ static int tw9910_mask_set(struct i2c_client *client, u8 command,
 
 static void tw9910_reset(struct i2c_client *client)
 {
-	i2c_smbus_write_byte_data(client, ACNTL1, SRESET);
+	tw9910_mask_set(client, ACNTL1, SRESET, SRESET);
 	msleep(1);
 }
 
+static void tw9910_power(struct i2c_client *client, int enable)
+{
+	u8 acntl1 = 0;
+	u8 acntl2 = 0;
+
+	if (!enable) {
+		acntl1 = CLK_PDN | Y_PDN | C_PDN;
+		acntl2 = PLL_PDN;
+	}
+
+	tw9910_mask_set(client, ACNTL1, 0x0e, acntl1);
+	tw9910_mask_set(client, ACNTL2, 0x40, acntl2);
+}
+
 static const struct tw9910_scale_ctrl*
 tw9910_select_norm(struct soc_camera_device *icd, u32 width, u32 height)
 {
@@ -514,6 +535,8 @@ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 	struct i2c_client *client = sd->priv;
 	struct tw9910_priv *priv = to_tw9910(client);
 
+	tw9910_power(client, enable);
+
 	if (!enable)
 		return 0;
 
@@ -527,7 +550,7 @@ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 		 priv->scale->width,
 		 priv->scale->height);
 
-	return 0;
+	return tw9910_mask_set(client, OPFORM, 0x7, OEN_TRI_SEL_ALL_ON);
 }
 
 static int tw9910_set_bus_param(struct soc_camera_device *icd,
Signature · 6 lines
1.6.0.4

--
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
#1 lore raw
Quoted 11 lines · Kuninori Morimoto
---
 drivers/media/video/tw9910.c |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)
drivers/media/video/tw9910.c +0 -0
index a0b5bbe..8debcd6 100644

drivers/media/video/tw9910.c line 156

Quoted 6 lines
drivers/media/video/tw9910.c +2 -1
@@ -152,7 +152,9 @@
 			 /* 1 : non-auto */
 #define VSCTL       0x08 /* 1 : Vertical out ctrl by DVALID */
 			 /* 0 : Vertical out ctrl by HACTIVE and DVALID */
-#define OEN         0x04 /* Output Enable together with TRI_SEL. */
+#define OEN_TRI_SEL_ALL_ON 0x00 /* Enable output */
+#define OEN_TRI_SEL_CLK_ON 0x04 /* TRI_SEL output */

You don't seem to use the OEN_TRI_SEL_CLK_ON macro. Didn't you want to tristate pins when inactive?

drivers/media/video/tw9910.c line 157

Quoted 1 line
drivers/media/video/tw9910.c +1 -0
+

Why an extra empty line?

drivers/media/video/tw9910.c line 183

Quoted 8 lines
drivers/media/video/tw9910.c +1 -0
 /* OUTCTR1 */
 #define VSP_LO      0x00 /* 0 : VS pin output polarity is active low */
@@ -178,6 +180,12 @@
 			  * but all register content remain unchanged.
 			  * This bit is self-resetting.
 			  */
+#define CLK_PDN    0x08 /* clock power down */

Hopefully, switching clock off doesn't destroy register content?

Quoted 43 lines
drivers/media/video/tw9910.c +20 -2
+#define Y_PDN      0x04 /* Luma ADC power down */
+#define C_PDN      0x02 /* Chroma ADC power down */
+
+/* ACNTL2 */
+#define PLL_PDN    0x40 /* PLL power down */
 
 /* VBICNTL */
 
@@ -236,7 +244,6 @@ struct tw9910_priv {
 
 static const struct regval_list tw9910_default_regs[] =
 {
-	{ OPFORM,  0x00 },
 	{ OUTCTR1, VSP_LO | VSSL_VVALID | HSP_HI | HSSL_HSYNC },
 	ENDMARKER,
 };
@@ -471,10 +478,24 @@ static int tw9910_mask_set(struct i2c_client *client, u8 command,
 
 static void tw9910_reset(struct i2c_client *client)
 {
-	i2c_smbus_write_byte_data(client, ACNTL1, SRESET);
+	tw9910_mask_set(client, ACNTL1, SRESET, SRESET);
 	msleep(1);
 }
 
+static void tw9910_power(struct i2c_client *client, int enable)
+{
+	u8 acntl1 = 0;
+	u8 acntl2 = 0;
+
+	if (!enable) {
+		acntl1 = CLK_PDN | Y_PDN | C_PDN;
+		acntl2 = PLL_PDN;
+	}
+
+	tw9910_mask_set(client, ACNTL1, 0x0e, acntl1);
+	tw9910_mask_set(client, ACNTL2, 0x40, acntl2);
+}
+
 static const struct tw9910_scale_ctrl*
 tw9910_select_norm(struct soc_camera_device *icd, u32 width, u32 height)
 {

drivers/media/video/tw9910.c static int tw9910_s_stream(struct v4l2_subdev *sd, int enable) · line 539

Quoted 5 lines
drivers/media/video/tw9910.c +2 -0
@@ -514,6 +535,8 @@ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 	struct i2c_client *client = sd->priv;
 	struct tw9910_priv *priv = to_tw9910(client);
 
+	tw9910_power(client, enable);
+

I think you should check the return code here, at least for the stream-on case. You shouldn't return success if register accesses failed.

Quoted 15 lines
drivers/media/video/tw9910.c +1 -1
 	if (!enable)
 		return 0;
 
@@ -527,7 +550,7 @@ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 		 priv->scale->width,
 		 priv->scale->height);
 
-	return 0;
+	return tw9910_mask_set(client, OPFORM, 0x7, OEN_TRI_SEL_ALL_ON);
 }
 
 static int tw9910_set_bus_param(struct soc_camera_device *icd,
Signature · 1 line
1.6.0.4

Thanks
Guennadi
---
Guennadi Liakhovetski

--
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

#2 lore raw

Dear Guennadi

Thank you for checking patch.

Quoted 6 lines

drivers/media/video/tw9910.c line 156

Quoted 3 lines
drivers/media/video/tw9910.c +2 -1
-#define OEN         0x04 /* Output Enable together with TRI_SEL. */
+#define OEN_TRI_SEL_ALL_ON 0x00 /* Enable output */
+#define OEN_TRI_SEL_CLK_ON 0x04 /* TRI_SEL output */

You don't seem to use the OEN_TRI_SEL_CLK_ON macro. Didn't you want to tristate pins when inactive?

I thought tristate control is not needed,
because I add power control.
But it seems wrong.
I will add tristate control.
Thank you

Quoted 3 lines
Quoted 1 line

+#define CLK_PDN 0x08 /* clock power down */

Hopefully, switching clock off doesn't destroy register content?

There are no document,
but it seems no problem.
I checked it by hand

Best regards
--
Kuninori Morimoto

--
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list