summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolokh Konstantin <volokh84@gmail.com>2013-01-16 09:00:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-06 09:02:59 -0200
commitd18b6acfe2f1c279ab2fb510eabc405cf538fb68 (patch)
tree54b792fadc66a2c294f9e50e56b0028d5205ce74
parent7a295d1289f2be16f80f0a5242db330d542e0037 (diff)
downloadop-kernel-dev-d18b6acfe2f1c279ab2fb510eabc405cf538fb68.zip
op-kernel-dev-d18b6acfe2f1c279ab2fb510eabc405cf538fb68.tar.gz
[media] staging: media: go7007: i2c GPIO initialization Reset i2c stuff for GO7007_BOARDID_ADLINK_MPG24 need reset GPIO always when encoder initialize
Signed-off-by: Volokh Konstantin <volokh84@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/media/go7007/go7007-driver.c5
-rw-r--r--drivers/staging/media/go7007/go7007-usb.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/media/go7007/go7007-driver.c b/drivers/staging/media/go7007/go7007-driver.c
index 00014e7..0aaeb0a 100644
--- a/drivers/staging/media/go7007/go7007-driver.c
+++ b/drivers/staging/media/go7007/go7007-driver.c
@@ -173,6 +173,11 @@ static int go7007_init_encoder(struct go7007 *go)
go7007_write_addr(go, 0x3c82, 0x0001);
go7007_write_addr(go, 0x3c80, 0x00fe);
}
+ if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) {
+ /* set GPIO5 to be an output, currently low */
+ go7007_write_addr(go, 0x3c82, 0x0000);
+ go7007_write_addr(go, 0x3c80, 0x00df);
+ }
return 0;
}
diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index a6cad15..9dbf5ec 100644
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -1110,9 +1110,6 @@ static int go7007_usb_probe(struct usb_interface *intf,
} else {
u16 channel;
- /* set GPIO5 to be an output, currently low */
- go7007_write_addr(go, 0x3c82, 0x0000);
- go7007_write_addr(go, 0x3c80, 0x00df);
/* read channel number from GPIO[1:0] */
go7007_read_addr(go, 0x3c81, &channel);
channel &= 0x3;
OpenPOWER on IntegriCloud