diff options
author | Volokh Konstantin <volokh84@gmail.com> | 2013-01-16 07:00:50 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 06:02:59 -0500 |
commit | d18b6acfe2f1c279ab2fb510eabc405cf538fb68 (patch) | |
tree | 54b792fadc66a2c294f9e50e56b0028d5205ce74 | |
parent | 7a295d1289f2be16f80f0a5242db330d542e0037 (diff) |
[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.c | 5 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-usb.c | 3 |
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 00014e754c75..0aaeb0aeb99e 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) | |||
173 | go7007_write_addr(go, 0x3c82, 0x0001); | 173 | go7007_write_addr(go, 0x3c82, 0x0001); |
174 | go7007_write_addr(go, 0x3c80, 0x00fe); | 174 | go7007_write_addr(go, 0x3c80, 0x00fe); |
175 | } | 175 | } |
176 | if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) { | ||
177 | /* set GPIO5 to be an output, currently low */ | ||
178 | go7007_write_addr(go, 0x3c82, 0x0000); | ||
179 | go7007_write_addr(go, 0x3c80, 0x00df); | ||
180 | } | ||
176 | return 0; | 181 | return 0; |
177 | } | 182 | } |
178 | 183 | ||
diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c index a6cad1589475..9dbf5ecd05a2 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, | |||
1110 | } else { | 1110 | } else { |
1111 | u16 channel; | 1111 | u16 channel; |
1112 | 1112 | ||
1113 | /* set GPIO5 to be an output, currently low */ | ||
1114 | go7007_write_addr(go, 0x3c82, 0x0000); | ||
1115 | go7007_write_addr(go, 0x3c80, 0x00df); | ||
1116 | /* read channel number from GPIO[1:0] */ | 1113 | /* read channel number from GPIO[1:0] */ |
1117 | go7007_read_addr(go, 0x3c81, &channel); | 1114 | go7007_read_addr(go, 0x3c81, &channel); |
1118 | channel &= 0x3; | 1115 | channel &= 0x3; |