mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
V4L/DVB (13657): tw9910: Add revision control to tw9910_set_hsync
Bits 10-3 of hsync control are the same for Rev0 and Rev1, but only Rev1 also has bits 2-0 for hsync. Account for this difference and also fix a register name. Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
2079708381
commit
faa582610d
1 changed files with 8 additions and 5 deletions
|
@ -117,7 +117,7 @@
|
||||||
#define LCTL24 0x68
|
#define LCTL24 0x68
|
||||||
#define LCTL25 0x69
|
#define LCTL25 0x69
|
||||||
#define LCTL26 0x6A
|
#define LCTL26 0x6A
|
||||||
#define HSGEGIN 0x6B
|
#define HSBEGIN 0x6B
|
||||||
#define HSEND 0x6C
|
#define HSEND 0x6C
|
||||||
#define OVSDLY 0x6D
|
#define OVSDLY 0x6D
|
||||||
#define OVSEND 0x6E
|
#define OVSEND 0x6E
|
||||||
|
@ -443,10 +443,11 @@ static int tw9910_set_cropping(struct i2c_client *client,
|
||||||
static int tw9910_set_hsync(struct i2c_client *client,
|
static int tw9910_set_hsync(struct i2c_client *client,
|
||||||
const struct tw9910_hsync_ctrl *hsync)
|
const struct tw9910_hsync_ctrl *hsync)
|
||||||
{
|
{
|
||||||
|
struct tw9910_priv *priv = to_tw9910(client);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* bit 10 - 3 */
|
/* bit 10 - 3 */
|
||||||
ret = i2c_smbus_write_byte_data(client, HSGEGIN,
|
ret = i2c_smbus_write_byte_data(client, HSBEGIN,
|
||||||
(hsync->start & 0x07F8) >> 3);
|
(hsync->start & 0x07F8) >> 3);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -457,10 +458,12 @@ static int tw9910_set_hsync(struct i2c_client *client,
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
/* So far only revisions 0 and 1 have been seen */
|
||||||
/* bit 2 - 0 */
|
/* bit 2 - 0 */
|
||||||
ret = tw9910_mask_set(client, HSLOWCTL, 0x77,
|
if (1 == priv->revision)
|
||||||
(hsync->start & 0x0007) << 4 |
|
ret = tw9910_mask_set(client, HSLOWCTL, 0x77,
|
||||||
(hsync->end & 0x0007));
|
(hsync->start & 0x0007) << 4 |
|
||||||
|
(hsync->end & 0x0007));
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue