Skip to content

L
linux
Commit 56ea37da authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] m88ds3103: use own reg update_bits() implementation 

Device stopped to tuning some channels after regmap conversion.
Reason is that regmap_update_bits() works a bit differently for
partially volatile registers than old homemade routine. Return
back to old routine in order to fix issue.

Fixes: 478932b1

Cc: <stable@kernel.org> # 4.2+
Reported-by: default avatarMark Clarkstone <hello@markclarkstone.co.uk>
Tested-by: default avatarMark Clarkstone <hello@markclarkstone.co.uk>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d18ca5b7
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 26 deletions
drivers/media/dvb-frontends/m88ds3103.c
View file @ 56ea37da
...@@ -18,6 +18,27 @@ ...@@ -18,6 +18,27 @@
static struct dvb_frontend_ops m88ds3103_ops; static struct dvb_frontend_ops m88ds3103_ops;
/* write single register with mask */
static int m88ds3103_update_bits(struct m88ds3103_dev *dev,
u8 reg, u8 mask, u8 val)
{
int ret;
u8 tmp;
/* no need for read if whole reg is written */
if (mask != 0xff) {
ret = regmap_bulk_read(dev->regmap, reg, &tmp, 1);
if (ret)
return ret;
val &= mask;
tmp &= ~mask;
val |= tmp;
}
return regmap_bulk_write(dev->regmap, reg, &val, 1);
}
/* write reg val table using reg addr auto increment */ /* write reg val table using reg addr auto increment */
static int m88ds3103_wr_reg_val_tab(struct m88ds3103_dev *dev, static int m88ds3103_wr_reg_val_tab(struct m88ds3103_dev *dev,
const struct m88ds3103_reg_val *tab, int tab_len) const struct m88ds3103_reg_val *tab, int tab_len)
...@@ -394,10 +415,10 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) ...@@ -394,10 +415,10 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
u8tmp2 = 0x00; /* 0b00 */ u8tmp2 = 0x00; /* 0b00 */
break; break;
} }
ret = regmap_update_bits(dev->regmap, 0x22, 0xc0, u8tmp1 << 6); ret = m88ds3103_update_bits(dev, 0x22, 0xc0, u8tmp1 << 6);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x24, 0xc0, u8tmp2 << 6); ret = m88ds3103_update_bits(dev, 0x24, 0xc0, u8tmp2 << 6);
if (ret) if (ret)
goto err; goto err;
} }
...@@ -455,13 +476,13 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) ...@@ -455,13 +476,13 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
if (ret) if (ret)
goto err; goto err;
} }
ret = regmap_update_bits(dev->regmap, 0x9d, 0x08, 0x08); ret = m88ds3103_update_bits(dev, 0x9d, 0x08, 0x08);
if (ret) if (ret)
goto err; goto err;
ret = regmap_write(dev->regmap, 0xf1, 0x01); ret = regmap_write(dev->regmap, 0xf1, 0x01);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x30, 0x80, 0x80); ret = m88ds3103_update_bits(dev, 0x30, 0x80, 0x80);
if (ret) if (ret)
goto err; goto err;
} }
...@@ -498,7 +519,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) ...@@ -498,7 +519,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
switch (dev->cfg->ts_mode) { switch (dev->cfg->ts_mode) {
case M88DS3103_TS_SERIAL: case M88DS3103_TS_SERIAL:
case M88DS3103_TS_SERIAL_D7: case M88DS3103_TS_SERIAL_D7:
ret = regmap_update_bits(dev->regmap, 0x29, 0x20, u8tmp1); ret = m88ds3103_update_bits(dev, 0x29, 0x20, u8tmp1);
if (ret) if (ret)
goto err; goto err;
u8tmp1 = 0; u8tmp1 = 0;
...@@ -567,11 +588,11 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) ...@@ -567,11 +588,11 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x4d, 0x02, dev->cfg->spec_inv << 1); ret = m88ds3103_update_bits(dev, 0x4d, 0x02, dev->cfg->spec_inv << 1);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x30, 0x10, dev->cfg->agc_inv << 4); ret = m88ds3103_update_bits(dev, 0x30, 0x10, dev->cfg->agc_inv << 4);
if (ret) if (ret)
goto err; goto err;
...@@ -625,13 +646,13 @@ static int m88ds3103_init(struct dvb_frontend *fe) ...@@ -625,13 +646,13 @@ static int m88ds3103_init(struct dvb_frontend *fe)
dev->warm = false; dev->warm = false;
/* wake up device from sleep */ /* wake up device from sleep */
ret = regmap_update_bits(dev->regmap, 0x08, 0x01, 0x01); ret = m88ds3103_update_bits(dev, 0x08, 0x01, 0x01);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x04, 0x01, 0x00); ret = m88ds3103_update_bits(dev, 0x04, 0x01, 0x00);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x23, 0x10, 0x00); ret = m88ds3103_update_bits(dev, 0x23, 0x10, 0x00);
if (ret) if (ret)
goto err; goto err;
...@@ -749,18 +770,18 @@ static int m88ds3103_sleep(struct dvb_frontend *fe) ...@@ -749,18 +770,18 @@ static int m88ds3103_sleep(struct dvb_frontend *fe)
utmp = 0x29; utmp = 0x29;
else else
utmp = 0x27; utmp = 0x27;
ret = regmap_update_bits(dev->regmap, utmp, 0x01, 0x00); ret = m88ds3103_update_bits(dev, utmp, 0x01, 0x00);
if (ret) if (ret)
goto err; goto err;
/* sleep */ /* sleep */
ret = regmap_update_bits(dev->regmap, 0x08, 0x01, 0x00); ret = m88ds3103_update_bits(dev, 0x08, 0x01, 0x00);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x04, 0x01, 0x01); ret = m88ds3103_update_bits(dev, 0x04, 0x01, 0x01);
if (ret) if (ret)
goto err; goto err;
ret = regmap_update_bits(dev->regmap, 0x23, 0x10, 0x10); ret = m88ds3103_update_bits(dev, 0x23, 0x10, 0x10);
if (ret) if (ret)
goto err; goto err;
...@@ -992,12 +1013,12 @@ static int m88ds3103_set_tone(struct dvb_frontend *fe, ...@@ -992,12 +1013,12 @@ static int m88ds3103_set_tone(struct dvb_frontend *fe,
} }
utmp = tone << 7 | dev->cfg->envelope_mode << 5; utmp = tone << 7 | dev->cfg->envelope_mode << 5;
ret = regmap_update_bits(dev->regmap, 0xa2, 0xe0, utmp); ret = m88ds3103_update_bits(dev, 0xa2, 0xe0, utmp);
if (ret) if (ret)
goto err; goto err;
utmp = 1 << 2; utmp = 1 << 2;
ret = regmap_update_bits(dev->regmap, 0xa1, reg_a1_mask, utmp); ret = m88ds3103_update_bits(dev, 0xa1, reg_a1_mask, utmp);
if (ret) if (ret)
goto err; goto err;
...@@ -1047,7 +1068,7 @@ static int m88ds3103_set_voltage(struct dvb_frontend *fe, ...@@ -1047,7 +1068,7 @@ static int m88ds3103_set_voltage(struct dvb_frontend *fe,
voltage_dis ^= dev->cfg->lnb_en_pol; voltage_dis ^= dev->cfg->lnb_en_pol;
utmp = voltage_dis << 1 | voltage_sel << 0; utmp = voltage_dis << 1 | voltage_sel << 0;
ret = regmap_update_bits(dev->regmap, 0xa2, 0x03, utmp); ret = m88ds3103_update_bits(dev, 0xa2, 0x03, utmp);
if (ret) if (ret)
goto err; goto err;
...@@ -1080,7 +1101,7 @@ static int m88ds3103_diseqc_send_master_cmd(struct dvb_frontend *fe, ...@@ -1080,7 +1101,7 @@ static int m88ds3103_diseqc_send_master_cmd(struct dvb_frontend *fe,
} }
utmp = dev->cfg->envelope_mode << 5; utmp = dev->cfg->envelope_mode << 5;
ret = regmap_update_bits(dev->regmap, 0xa2, 0xe0, utmp); ret = m88ds3103_update_bits(dev, 0xa2, 0xe0, utmp);
if (ret) if (ret)
goto err; goto err;
...@@ -1115,12 +1136,12 @@ static int m88ds3103_diseqc_send_master_cmd(struct dvb_frontend *fe, ...@@ -1115,12 +1136,12 @@ static int m88ds3103_diseqc_send_master_cmd(struct dvb_frontend *fe,
} else { } else {
dev_dbg(&client->dev, "diseqc tx timeout\n"); dev_dbg(&client->dev, "diseqc tx timeout\n");
ret = regmap_update_bits(dev->regmap, 0xa1, 0xc0, 0x40); ret = m88ds3103_update_bits(dev, 0xa1, 0xc0, 0x40);
if (ret) if (ret)
goto err; goto err;
} }
ret = regmap_update_bits(dev->regmap, 0xa2, 0xc0, 0x80); ret = m88ds3103_update_bits(dev, 0xa2, 0xc0, 0x80);
if (ret) if (ret)
goto err; goto err;
...@@ -1152,7 +1173,7 @@ static int m88ds3103_diseqc_send_burst(struct dvb_frontend *fe, ...@@ -1152,7 +1173,7 @@ static int m88ds3103_diseqc_send_burst(struct dvb_frontend *fe,
} }
utmp = dev->cfg->envelope_mode << 5; utmp = dev->cfg->envelope_mode << 5;
ret = regmap_update_bits(dev->regmap, 0xa2, 0xe0, utmp); ret = m88ds3103_update_bits(dev, 0xa2, 0xe0, utmp);
if (ret) if (ret)
goto err; goto err;
...@@ -1194,12 +1215,12 @@ static int m88ds3103_diseqc_send_burst(struct dvb_frontend *fe, ...@@ -1194,12 +1215,12 @@ static int m88ds3103_diseqc_send_burst(struct dvb_frontend *fe,
} else { } else {
dev_dbg(&client->dev, "diseqc tx timeout\n"); dev_dbg(&client->dev, "diseqc tx timeout\n");
ret = regmap_update_bits(dev->regmap, 0xa1, 0xc0, 0x40); ret = m88ds3103_update_bits(dev, 0xa1, 0xc0, 0x40);
if (ret) if (ret)
goto err; goto err;
} }
ret = regmap_update_bits(dev->regmap, 0xa2, 0xc0, 0x80); ret = m88ds3103_update_bits(dev, 0xa2, 0xc0, 0x80);
if (ret) if (ret)
goto err; goto err;
...@@ -1435,13 +1456,13 @@ static int m88ds3103_probe(struct i2c_client *client, ...@@ -1435,13 +1456,13 @@ static int m88ds3103_probe(struct i2c_client *client,
goto err_kfree; goto err_kfree;
/* sleep */ /* sleep */
ret = regmap_update_bits(dev->regmap, 0x08, 0x01, 0x00); ret = m88ds3103_update_bits(dev, 0x08, 0x01, 0x00);
if (ret) if (ret)
goto err_kfree; goto err_kfree;
ret = regmap_update_bits(dev->regmap, 0x04, 0x01, 0x01); ret = m88ds3103_update_bits(dev, 0x04, 0x01, 0x01);
if (ret) if (ret)
goto err_kfree; goto err_kfree;
ret = regmap_update_bits(dev->regmap, 0x23, 0x10, 0x10); ret = m88ds3103_update_bits(dev, 0x23, 0x10, 0x10);
if (ret) if (ret)
goto err_kfree; goto err_kfree;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7