* [PATCH 02/37] af9035: enable AF9033 demod clock source for IT9135
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 03/37] it913x: fix tuner sleep power leak Antti Palosaari
` (34 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari, Bimow Chen
Integrated RF tuner of IT9135 is connected to demod clock source
named dyn0_clk. Enable that clock source in order to provide stable
clock early enough.
Cc: Bimow Chen <Bimow.Chen@ite.com.tw>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index c82beac..8ac0423 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -647,16 +647,19 @@ static int af9035_read_config(struct dvb_usb_device *d)
state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
state->af9033_config[1].ts_mode = AF9033_TS_MODE_SERIAL;
- /* eeprom memory mapped location */
if (state->chip_type == 0x9135) {
+ /* feed clock for integrated RF tuner */
+ state->af9033_config[0].dyn0_clk = true;
+ state->af9033_config[1].dyn0_clk = true;
+
if (state->chip_version == 0x02) {
state->af9033_config[0].tuner = AF9033_TUNER_IT9135_60;
state->af9033_config[1].tuner = AF9033_TUNER_IT9135_60;
- tmp16 = 0x00461d;
+ tmp16 = 0x00461d; /* eeprom memory mapped location */
} else {
state->af9033_config[0].tuner = AF9033_TUNER_IT9135_38;
state->af9033_config[1].tuner = AF9033_TUNER_IT9135_38;
- tmp16 = 0x00461b;
+ tmp16 = 0x00461b; /* eeprom memory mapped location */
}
/* check if eeprom exists */
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 03/37] it913x: fix tuner sleep power leak
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
2014-09-04 2:36 ` [PATCH 02/37] af9035: enable AF9033 demod clock source for IT9135 Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 04/37] it913x: avoid division by zero on error case Antti Palosaari
` (33 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari, Bimow Chen
IT913x tuner driver disables own clock, provided by demod core, as
very a first operation when tuner is put on *sleep*. That likely
causes failure of all the rest commands on sleep sequence, which
leads situation where tuner is not actually on sleep, but consuming
a lot of power.
I measured 102mA current consumption from the USB before change
and after change it was only 32mA. Used device was single tuner
IT9135 BX.
Second reason to remove that register from tuner driver is reason
it is simply on wrong driver (demod vs. tuner), breaking the
principle of correct driver.
Clock is now provided more correctly af9033 demod driver as a
config option.
Cc: Bimow Chen <Bimow.Chen@ite.com.tw>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/tuner_it913x.c | 1 -
drivers/media/tuners/tuner_it913x_priv.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/media/tuners/tuner_it913x.c b/drivers/media/tuners/tuner_it913x.c
index 3d83c42..3265d9a 100644
--- a/drivers/media/tuners/tuner_it913x.c
+++ b/drivers/media/tuners/tuner_it913x.c
@@ -202,7 +202,6 @@ static int it913x_init(struct dvb_frontend *fe)
/* Power Up Tuner - common all versions */
ret = it913x_wr_reg(state, PRO_DMOD, 0xec40, 0x1);
- ret |= it913x_wr_reg(state, PRO_DMOD, 0xfba8, 0x0);
ret |= it913x_wr_reg(state, PRO_DMOD, 0xec57, 0x0);
ret |= it913x_wr_reg(state, PRO_DMOD, 0xec58, 0x0);
diff --git a/drivers/media/tuners/tuner_it913x_priv.h b/drivers/media/tuners/tuner_it913x_priv.h
index ce65210..8e85a61 100644
--- a/drivers/media/tuners/tuner_it913x_priv.h
+++ b/drivers/media/tuners/tuner_it913x_priv.h
@@ -38,7 +38,6 @@ struct it913xset { u32 pro;
/* Tuner setting scripts (still keeping it9137) */
static struct it913xset it9137_tuner_off[] = {
- {PRO_DMOD, 0xfba8, {0x01}, 0x01}, /* Tuner Clock Off */
{PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
{PRO_DMOD, 0xec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},
{PRO_DMOD, 0xec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 04/37] it913x: avoid division by zero on error case
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
2014-09-04 2:36 ` [PATCH 02/37] af9035: enable AF9033 demod clock source for IT9135 Antti Palosaari
2014-09-04 2:36 ` [PATCH 03/37] it913x: fix tuner sleep power leak Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 05/37] it913x: fix IT9135 AX sleep Antti Palosaari
` (32 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Error on init leaves some internal divisor zero, which causes oops
later. Fix it by populating divisors even it fails.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/tuner_it913x.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/tuners/tuner_it913x.c b/drivers/media/tuners/tuner_it913x.c
index 3265d9a..cd20c5b 100644
--- a/drivers/media/tuners/tuner_it913x.c
+++ b/drivers/media/tuners/tuner_it913x.c
@@ -154,6 +154,9 @@ static int it913x_init(struct dvb_frontend *fe)
val = 16;
break;
case -ENODEV:
+ /* FIXME: these are just avoid divide by 0 */
+ state->tun_xtal = 2000;
+ state->tun_fdiv = 3;
return -ENODEV;
case 1:
default:
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 05/37] it913x: fix IT9135 AX sleep
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (2 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 04/37] it913x: avoid division by zero on error case Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 06/37] af9035: remove AVerMedia eeprom override Antti Palosaari
` (31 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari, Bimow Chen
Old IT9135 AX needs a little bit different register settings for
sleep than newer IT9135 BX. This has been broken always, as power
management of the whole driver, but it started to be problem as I
fixed clock. Earlier clock was disabled very first on sleep and
rest of the commands were skipped by the chip as no clock, leaving
tuner full power state. When I fixed clocks these PM bugs started
raising out as I/O errors.
Cc: Bimow Chen <Bimow.Chen@ite.com.tw>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/tuner_it913x.c | 6 +++++-
drivers/media/tuners/tuner_it913x_priv.h | 11 +++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/media/tuners/tuner_it913x.c b/drivers/media/tuners/tuner_it913x.c
index cd20c5b..281d8c5 100644
--- a/drivers/media/tuners/tuner_it913x.c
+++ b/drivers/media/tuners/tuner_it913x.c
@@ -371,7 +371,11 @@ static int it9137_set_params(struct dvb_frontend *fe)
static int it913x_sleep(struct dvb_frontend *fe)
{
struct it913x_state *state = fe->tuner_priv;
- return it913x_script_loader(state, it9137_tuner_off);
+
+ if (state->chip_ver == 0x01)
+ return it913x_script_loader(state, it9135ax_tuner_off);
+ else
+ return it913x_script_loader(state, it9137_tuner_off);
}
static int it913x_release(struct dvb_frontend *fe)
diff --git a/drivers/media/tuners/tuner_it913x_priv.h b/drivers/media/tuners/tuner_it913x_priv.h
index 8e85a61..cc6f4b1 100644
--- a/drivers/media/tuners/tuner_it913x_priv.h
+++ b/drivers/media/tuners/tuner_it913x_priv.h
@@ -36,6 +36,17 @@ struct it913xset { u32 pro;
u8 count;
};
+/* Tuner setting scripts for IT9135 AX */
+static struct it913xset it9135ax_tuner_off[] = {
+ {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
+ {PRO_DMOD, 0xec02, {0x3f}, 0x01},
+ {PRO_DMOD, 0xec03, {0x1f}, 0x01},
+ {PRO_DMOD, 0xec04, {0x3f}, 0x01},
+ {PRO_DMOD, 0xec05, {0x3f}, 0x01},
+ {PRO_DMOD, 0xec3f, {0x01}, 0x01},
+ {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+};
+
/* Tuner setting scripts (still keeping it9137) */
static struct it913xset it9137_tuner_off[] = {
{PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 06/37] af9035: remove AVerMedia eeprom override
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (3 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 05/37] it913x: fix IT9135 AX sleep Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 07/37] af9035: make checkpatch.pl happy Antti Palosaari
` (30 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Reverts commit 3ab25123373270152a9fae98e3c48ef1b2a878c0
[media] af9035: override tuner for AVerMedia A835B devices
Original commit itself is correct, but it was replaced by more
general solution (commit 1cbbf90d0406913ad4b44194b07f4f41bde84e54).
This old solution was committed by a accident and is not needed
anymore.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 8ac0423..85f2c4b 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -802,25 +802,6 @@ static int af9035_read_config(struct dvb_usb_device *d)
addr += 0x10; /* shift for the 2nd tuner params */
}
- /*
- * These AVerMedia devices has a bad EEPROM content :-(
- * Override some wrong values here.
- */
- if (le16_to_cpu(d->udev->descriptor.idVendor) == USB_VID_AVERMEDIA) {
- switch (le16_to_cpu(d->udev->descriptor.idProduct)) {
- case USB_PID_AVERMEDIA_A835B_1835:
- case USB_PID_AVERMEDIA_A835B_2835:
- case USB_PID_AVERMEDIA_A835B_3835:
- dev_info(&d->udev->dev,
- "%s: overriding tuner from %02x to %02x\n",
- KBUILD_MODNAME, state->af9033_config[0].tuner,
- AF9033_TUNER_IT9135_60);
-
- state->af9033_config[0].tuner = AF9033_TUNER_IT9135_60;
- break;
- }
- }
-
skip_eeprom:
/* get demod clock */
ret = af9035_rd_reg(d, 0x00d800, &tmp);
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 07/37] af9035: make checkpatch.pl happy
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (4 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 06/37] af9035: remove AVerMedia eeprom override Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 08/37] af9033: " Antti Palosaari
` (29 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Correct issues reported by checkpatch.pl.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 85f2c4b..f37cf7d 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -536,6 +536,7 @@ static int af9035_download_firmware(struct dvb_usb_device *d,
u8 tmp;
struct usb_req req = { 0, 0, 0, NULL, 0, NULL };
struct usb_req req_fw_ver = { CMD_FW_QUERYINFO, 0, 1, wbuf, 4, rbuf };
+
dev_dbg(&d->udev->dev, "%s:\n", __func__);
/*
@@ -974,6 +975,7 @@ static int af9035_frontend_callback(void *adapter_priv, int component,
static int af9035_get_adapter_count(struct dvb_usb_device *d)
{
struct state *state = d_to_priv(d);
+
return state->dual_mode + 1;
}
@@ -982,6 +984,7 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
struct state *state = adap_to_priv(adap);
struct dvb_usb_device *d = adap_to_d(adap);
int ret;
+
dev_dbg(&d->udev->dev, "%s:\n", __func__);
if (!state->af9033_config[adap->id].tuner) {
@@ -1068,6 +1071,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
struct dvb_frontend *fe;
struct i2c_msg msg[1];
u8 tuner_addr;
+
dev_dbg(&d->udev->dev, "%s:\n", __func__);
/*
@@ -1393,6 +1397,7 @@ static int af9035_get_stream_config(struct dvb_frontend *fe, u8 *ts_type,
struct usb_data_stream_properties *stream)
{
struct dvb_usb_device *d = fe_to_d(fe);
+
dev_dbg(&d->udev->dev, "%s: adap=%d\n", __func__, fe_to_adap(fe)->id);
if (d->udev->speed == USB_SPEED_FULL)
@@ -1554,7 +1559,8 @@ static const struct usb_device_id af9035_id_table[] = {
RC_MAP_IT913X_V1) },
/* XXX: that same ID [0ccd:0099] is used by af9015 driver too */
{ DVB_USB_DEVICE(USB_VID_TERRATEC, 0x0099,
- &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) },
+ &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)",
+ NULL) },
{ DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a05,
&af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) },
{ DVB_USB_DEVICE(USB_VID_HAUPPAUGE, 0xf900,
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 08/37] af9033: make checkpatch.pl happy
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (5 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 07/37] af9035: make checkpatch.pl happy Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 09/37] it913x: " Antti Palosaari
` (28 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Correct issues reported by checkpatch.pl.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 2a4dfd2..7f22f01 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -69,8 +69,9 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val,
if (ret == 1) {
ret = 0;
} else {
- dev_warn(&state->i2c->dev, "%s: i2c wr failed=%d reg=%06x " \
- "len=%d\n", KBUILD_MODNAME, ret, reg, len);
+ dev_warn(&state->i2c->dev,
+ "%s: i2c wr failed=%d reg=%06x len=%d\n",
+ KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
}
@@ -101,8 +102,9 @@ static int af9033_rd_regs(struct af9033_state *state, u32 reg, u8 *val, int len)
if (ret == 2) {
ret = 0;
} else {
- dev_warn(&state->i2c->dev, "%s: i2c rd failed=%d reg=%06x " \
- "len=%d\n", KBUILD_MODNAME, ret, reg, len);
+ dev_warn(&state->i2c->dev,
+ "%s: i2c rd failed=%d reg=%06x len=%d\n",
+ KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
}
@@ -835,7 +837,7 @@ static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
int ret, i, len;
u8 buf[3], tmp;
u32 snr_val;
- const struct val_snr *uninitialized_var(snr_lut);
+ const struct val_snr *snr_lut;
/* read value */
ret = af9033_rd_regs(state, 0x80002c, buf, 3);
@@ -928,7 +930,9 @@ static int af9033_update_ch_stat(struct af9033_state *state)
abort_cnt = 1000;
state->ber = 0xffffffff;
} else {
- /* 8 byte packets, that have not been rejected already */
+ /*
+ * 8 byte packets, that have not been rejected already
+ */
bit_cnt -= (u32)abort_cnt;
if (bit_cnt == 0) {
state->ber = 0xffffffff;
@@ -1015,7 +1019,8 @@ err:
return ret;
}
-static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid, int onoff)
+static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
+ int onoff)
{
struct af9033_state *state = fe->demodulator_priv;
int ret;
@@ -1069,8 +1074,8 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
memcpy(&state->cfg, config, sizeof(struct af9033_config));
if (state->cfg.clock != 12000000) {
- dev_err(&state->i2c->dev, "%s: af9033: unsupported clock=%d, " \
- "only 12000000 Hz is supported currently\n",
+ dev_err(&state->i2c->dev,
+ "%s: af9033: unsupported clock=%d, only 12000000 Hz is supported currently\n",
KBUILD_MODNAME, state->cfg.clock);
goto err;
}
@@ -1084,9 +1089,10 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
if (ret < 0)
goto err;
- dev_info(&state->i2c->dev, "%s: firmware version: LINK=%d.%d.%d.%d " \
- "OFDM=%d.%d.%d.%d\n", KBUILD_MODNAME, buf[0], buf[1],
- buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);
+ dev_info(&state->i2c->dev,
+ "%s: firmware version: LINK=%d.%d.%d.%d OFDM=%d.%d.%d.%d\n",
+ KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3], buf[4],
+ buf[5], buf[6], buf[7]);
/* sleep */
switch (state->cfg.tuner) {
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 09/37] it913x: make checkpatch.pl happy
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (6 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 08/37] af9033: " Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 10/37] it913x: rename tuner_it913x => it913x Antti Palosaari
` (27 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Correct issues reported by checkpatch.pl
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/tuner_it913x.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/tuners/tuner_it913x.c b/drivers/media/tuners/tuner_it913x.c
index 281d8c5..b92d599 100644
--- a/drivers/media/tuners/tuner_it913x.c
+++ b/drivers/media/tuners/tuner_it913x.c
@@ -46,6 +46,7 @@ static int it913x_rd_regs(struct it913x_state *state,
{ .addr = state->i2c_addr, .flags = I2C_M_RD,
.buf = data, .len = count }
};
+
b[0] = (u8)(reg >> 16) & 0xff;
b[1] = (u8)(reg >> 8) & 0xff;
b[2] = (u8) reg & 0xff;
@@ -61,6 +62,7 @@ static int it913x_rd_reg(struct it913x_state *state, u32 reg)
{
int ret;
u8 b[1];
+
ret = it913x_rd_regs(state, reg, &b[0], sizeof(b));
return (ret < 0) ? -ENODEV : b[0];
}
@@ -75,6 +77,7 @@ static int it913x_wr_regs(struct it913x_state *state,
.buf = b, .len = 3 + count }
};
int ret;
+
b[0] = (u8)(reg >> 16) & 0xff;
b[1] = (u8)(reg >> 8) & 0xff;
b[2] = (u8) reg & 0xff;
@@ -122,6 +125,7 @@ static int it913x_script_loader(struct it913x_state *state,
struct it913xset *loadscript)
{
int ret, i;
+
if (loadscript == NULL)
return -EINVAL;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 10/37] it913x: rename tuner_it913x => it913x
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (7 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 09/37] it913x: " Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 11/37] af9035: do not attach IT9135 tuner Antti Palosaari
` (26 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Remove tuner_ prefix from module name and file names. Prefix was
added due to file name conflict on media out-tree build system.
Demodulator having same name does not exists anymore. So lets
remove dumb prefix.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/Makefile | 2 +-
drivers/media/tuners/it913x.c | 463 +++++++++++++++++++++++++++++++
drivers/media/tuners/it913x.h | 45 +++
drivers/media/tuners/it913x_priv.h | 88 ++++++
drivers/media/tuners/tuner_it913x.c | 463 -------------------------------
drivers/media/tuners/tuner_it913x.h | 45 ---
drivers/media/tuners/tuner_it913x_priv.h | 88 ------
drivers/media/usb/dvb-usb-v2/af9035.h | 2 +-
8 files changed, 598 insertions(+), 598 deletions(-)
create mode 100644 drivers/media/tuners/it913x.c
create mode 100644 drivers/media/tuners/it913x.h
create mode 100644 drivers/media/tuners/it913x_priv.h
delete mode 100644 drivers/media/tuners/tuner_it913x.c
delete mode 100644 drivers/media/tuners/tuner_it913x.h
delete mode 100644 drivers/media/tuners/tuner_it913x_priv.h
diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile
index 5591699..7eede5c 100644
--- a/drivers/media/tuners/Makefile
+++ b/drivers/media/tuners/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_MEDIA_TUNER_M88TS2022) += m88ts2022.o
obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o
obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o
obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o
-obj-$(CONFIG_MEDIA_TUNER_IT913X) += tuner_it913x.o
+obj-$(CONFIG_MEDIA_TUNER_IT913X) += it913x.o
obj-$(CONFIG_MEDIA_TUNER_R820T) += r820t.o
ccflags-y += -I$(srctree)/drivers/media/dvb-core
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
new file mode 100644
index 0000000..4627925
--- /dev/null
+++ b/drivers/media/tuners/it913x.c
@@ -0,0 +1,463 @@
+/*
+ * ITE Tech IT9137 silicon tuner driver
+ *
+ * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
+ * IT9137 Copyright (C) ITE Tech Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
+ */
+
+#include "it913x_priv.h"
+
+struct it913x_state {
+ struct i2c_adapter *i2c_adap;
+ u8 i2c_addr;
+ u8 chip_ver;
+ u8 tuner_type;
+ u8 firmware_ver;
+ u16 tun_xtal;
+ u8 tun_fdiv;
+ u8 tun_clk_mode;
+ u32 tun_fn_min;
+};
+
+/* read multiple registers */
+static int it913x_rd_regs(struct it913x_state *state,
+ u32 reg, u8 *data, u8 count)
+{
+ int ret;
+ u8 b[3];
+ struct i2c_msg msg[2] = {
+ { .addr = state->i2c_addr, .flags = 0,
+ .buf = b, .len = sizeof(b) },
+ { .addr = state->i2c_addr, .flags = I2C_M_RD,
+ .buf = data, .len = count }
+ };
+
+ b[0] = (u8)(reg >> 16) & 0xff;
+ b[1] = (u8)(reg >> 8) & 0xff;
+ b[2] = (u8) reg & 0xff;
+ b[0] |= 0x80; /* All reads from demodulator */
+
+ ret = i2c_transfer(state->i2c_adap, msg, 2);
+
+ return ret;
+}
+
+/* read single register */
+static int it913x_rd_reg(struct it913x_state *state, u32 reg)
+{
+ int ret;
+ u8 b[1];
+
+ ret = it913x_rd_regs(state, reg, &b[0], sizeof(b));
+ return (ret < 0) ? -ENODEV : b[0];
+}
+
+/* write multiple registers */
+static int it913x_wr_regs(struct it913x_state *state,
+ u8 pro, u32 reg, u8 buf[], u8 count)
+{
+ u8 b[256];
+ struct i2c_msg msg[1] = {
+ { .addr = state->i2c_addr, .flags = 0,
+ .buf = b, .len = 3 + count }
+ };
+ int ret;
+
+ b[0] = (u8)(reg >> 16) & 0xff;
+ b[1] = (u8)(reg >> 8) & 0xff;
+ b[2] = (u8) reg & 0xff;
+ memcpy(&b[3], buf, count);
+
+ if (pro == PRO_DMOD)
+ b[0] |= 0x80;
+
+ ret = i2c_transfer(state->i2c_adap, msg, 1);
+
+ if (ret < 0)
+ return -EIO;
+
+ return 0;
+}
+
+/* write single register */
+static int it913x_wr_reg(struct it913x_state *state,
+ u8 pro, u32 reg, u32 data)
+{
+ int ret;
+ u8 b[4];
+ u8 s;
+
+ b[0] = data >> 24;
+ b[1] = (data >> 16) & 0xff;
+ b[2] = (data >> 8) & 0xff;
+ b[3] = data & 0xff;
+ /* expand write as needed */
+ if (data < 0x100)
+ s = 3;
+ else if (data < 0x1000)
+ s = 2;
+ else if (data < 0x100000)
+ s = 1;
+ else
+ s = 0;
+
+ ret = it913x_wr_regs(state, pro, reg, &b[s], sizeof(b) - s);
+
+ return ret;
+}
+
+static int it913x_script_loader(struct it913x_state *state,
+ struct it913xset *loadscript)
+{
+ int ret, i;
+
+ if (loadscript == NULL)
+ return -EINVAL;
+
+ for (i = 0; i < 1000; ++i) {
+ if (loadscript[i].pro == 0xff)
+ break;
+ ret = it913x_wr_regs(state, loadscript[i].pro,
+ loadscript[i].address,
+ loadscript[i].reg, loadscript[i].count);
+ if (ret < 0)
+ return -ENODEV;
+ }
+ return 0;
+}
+
+static int it913x_init(struct dvb_frontend *fe)
+{
+ struct it913x_state *state = fe->tuner_priv;
+ int ret, i, reg;
+ u8 val, nv_val;
+ u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
+ u8 b[2];
+
+ reg = it913x_rd_reg(state, 0xec86);
+ switch (reg) {
+ case 0:
+ state->tun_clk_mode = reg;
+ state->tun_xtal = 2000;
+ state->tun_fdiv = 3;
+ val = 16;
+ break;
+ case -ENODEV:
+ /* FIXME: these are just avoid divide by 0 */
+ state->tun_xtal = 2000;
+ state->tun_fdiv = 3;
+ return -ENODEV;
+ case 1:
+ default:
+ state->tun_clk_mode = reg;
+ state->tun_xtal = 640;
+ state->tun_fdiv = 1;
+ val = 6;
+ break;
+ }
+
+ reg = it913x_rd_reg(state, 0xed03);
+
+ if (reg < 0)
+ return -ENODEV;
+ else if (reg < ARRAY_SIZE(nv))
+ nv_val = nv[reg];
+ else
+ nv_val = 2;
+
+ for (i = 0; i < 50; i++) {
+ ret = it913x_rd_regs(state, 0xed23, &b[0], sizeof(b));
+ reg = (b[1] << 8) + b[0];
+ if (reg > 0)
+ break;
+ if (ret < 0)
+ return -ENODEV;
+ udelay(2000);
+ }
+ state->tun_fn_min = state->tun_xtal * reg;
+ state->tun_fn_min /= (state->tun_fdiv * nv_val);
+ dev_dbg(&state->i2c_adap->dev, "%s: Tuner fn_min %d\n", __func__,
+ state->tun_fn_min);
+
+ if (state->chip_ver > 1)
+ msleep(50);
+ else {
+ for (i = 0; i < 50; i++) {
+ reg = it913x_rd_reg(state, 0xec82);
+ if (reg > 0)
+ break;
+ if (reg < 0)
+ return -ENODEV;
+ udelay(2000);
+ }
+ }
+
+ /* Power Up Tuner - common all versions */
+ ret = it913x_wr_reg(state, PRO_DMOD, 0xec40, 0x1);
+ ret |= it913x_wr_reg(state, PRO_DMOD, 0xec57, 0x0);
+ ret |= it913x_wr_reg(state, PRO_DMOD, 0xec58, 0x0);
+
+ return it913x_wr_reg(state, PRO_DMOD, 0xed81, val);
+}
+
+static int it9137_set_params(struct dvb_frontend *fe)
+{
+ struct it913x_state *state = fe->tuner_priv;
+ struct it913xset *set_tuner = set_it9137_template;
+ struct dtv_frontend_properties *p = &fe->dtv_property_cache;
+ u32 bandwidth = p->bandwidth_hz;
+ u32 frequency_m = p->frequency;
+ int ret, reg;
+ u32 frequency = frequency_m / 1000;
+ u32 freq, temp_f, tmp;
+ u16 iqik_m_cal;
+ u16 n_div;
+ u8 n;
+ u8 l_band;
+ u8 lna_band;
+ u8 bw;
+
+ if (state->firmware_ver == 1)
+ set_tuner = set_it9135_template;
+ else
+ set_tuner = set_it9137_template;
+
+ dev_dbg(&state->i2c_adap->dev, "%s: Tuner Frequency %d Bandwidth %d\n",
+ __func__, frequency, bandwidth);
+
+ if (frequency >= 51000 && frequency <= 440000) {
+ l_band = 0;
+ lna_band = 0;
+ } else if (frequency > 440000 && frequency <= 484000) {
+ l_band = 1;
+ lna_band = 1;
+ } else if (frequency > 484000 && frequency <= 533000) {
+ l_band = 1;
+ lna_band = 2;
+ } else if (frequency > 533000 && frequency <= 587000) {
+ l_band = 1;
+ lna_band = 3;
+ } else if (frequency > 587000 && frequency <= 645000) {
+ l_band = 1;
+ lna_band = 4;
+ } else if (frequency > 645000 && frequency <= 710000) {
+ l_band = 1;
+ lna_band = 5;
+ } else if (frequency > 710000 && frequency <= 782000) {
+ l_band = 1;
+ lna_band = 6;
+ } else if (frequency > 782000 && frequency <= 860000) {
+ l_band = 1;
+ lna_band = 7;
+ } else if (frequency > 1450000 && frequency <= 1492000) {
+ l_band = 1;
+ lna_band = 0;
+ } else if (frequency > 1660000 && frequency <= 1685000) {
+ l_band = 1;
+ lna_band = 1;
+ } else
+ return -EINVAL;
+ set_tuner[0].reg[0] = lna_band;
+
+ switch (bandwidth) {
+ case 5000000:
+ bw = 0;
+ break;
+ case 6000000:
+ bw = 2;
+ break;
+ case 7000000:
+ bw = 4;
+ break;
+ default:
+ case 8000000:
+ bw = 6;
+ break;
+ }
+
+ set_tuner[1].reg[0] = bw;
+ set_tuner[2].reg[0] = 0xa0 | (l_band << 3);
+
+ if (frequency > 53000 && frequency <= 74000) {
+ n_div = 48;
+ n = 0;
+ } else if (frequency > 74000 && frequency <= 111000) {
+ n_div = 32;
+ n = 1;
+ } else if (frequency > 111000 && frequency <= 148000) {
+ n_div = 24;
+ n = 2;
+ } else if (frequency > 148000 && frequency <= 222000) {
+ n_div = 16;
+ n = 3;
+ } else if (frequency > 222000 && frequency <= 296000) {
+ n_div = 12;
+ n = 4;
+ } else if (frequency > 296000 && frequency <= 445000) {
+ n_div = 8;
+ n = 5;
+ } else if (frequency > 445000 && frequency <= state->tun_fn_min) {
+ n_div = 6;
+ n = 6;
+ } else if (frequency > state->tun_fn_min && frequency <= 950000) {
+ n_div = 4;
+ n = 7;
+ } else if (frequency > 1450000 && frequency <= 1680000) {
+ n_div = 2;
+ n = 0;
+ } else
+ return -EINVAL;
+
+ reg = it913x_rd_reg(state, 0xed81);
+ iqik_m_cal = (u16)reg * n_div;
+
+ if (reg < 0x20) {
+ if (state->tun_clk_mode == 0)
+ iqik_m_cal = (iqik_m_cal * 9) >> 5;
+ else
+ iqik_m_cal >>= 1;
+ } else {
+ iqik_m_cal = 0x40 - iqik_m_cal;
+ if (state->tun_clk_mode == 0)
+ iqik_m_cal = ~((iqik_m_cal * 9) >> 5);
+ else
+ iqik_m_cal = ~(iqik_m_cal >> 1);
+ }
+
+ temp_f = frequency * (u32)n_div * (u32)state->tun_fdiv;
+ freq = temp_f / state->tun_xtal;
+ tmp = freq * state->tun_xtal;
+
+ if ((temp_f - tmp) >= (state->tun_xtal >> 1))
+ freq++;
+
+ freq += (u32) n << 13;
+ /* Frequency OMEGA_IQIK_M_CAL_MID*/
+ temp_f = freq + (u32)iqik_m_cal;
+
+ set_tuner[3].reg[0] = temp_f & 0xff;
+ set_tuner[4].reg[0] = (temp_f >> 8) & 0xff;
+
+ dev_dbg(&state->i2c_adap->dev, "%s: High Frequency = %04x\n",
+ __func__, temp_f);
+
+ /* Lower frequency */
+ set_tuner[5].reg[0] = freq & 0xff;
+ set_tuner[6].reg[0] = (freq >> 8) & 0xff;
+
+ dev_dbg(&state->i2c_adap->dev, "%s: low Frequency = %04x\n",
+ __func__, freq);
+
+ ret = it913x_script_loader(state, set_tuner);
+
+ return (ret < 0) ? -ENODEV : 0;
+}
+
+/* Power sequence */
+/* Power Up Tuner on -> Frontend suspend off -> Tuner clk on */
+/* Power Down Frontend suspend on -> Tuner clk off -> Tuner off */
+
+static int it913x_sleep(struct dvb_frontend *fe)
+{
+ struct it913x_state *state = fe->tuner_priv;
+
+ if (state->chip_ver == 0x01)
+ return it913x_script_loader(state, it9135ax_tuner_off);
+ else
+ return it913x_script_loader(state, it9137_tuner_off);
+}
+
+static int it913x_release(struct dvb_frontend *fe)
+{
+ kfree(fe->tuner_priv);
+ return 0;
+}
+
+static const struct dvb_tuner_ops it913x_tuner_ops = {
+ .info = {
+ .name = "ITE Tech IT913X",
+ .frequency_min = 174000000,
+ .frequency_max = 862000000,
+ },
+
+ .release = it913x_release,
+
+ .init = it913x_init,
+ .sleep = it913x_sleep,
+ .set_params = it9137_set_params,
+};
+
+struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
+ struct i2c_adapter *i2c_adap, u8 i2c_addr, u8 config)
+{
+ struct it913x_state *state = NULL;
+ int ret;
+
+ /* allocate memory for the internal state */
+ state = kzalloc(sizeof(struct it913x_state), GFP_KERNEL);
+ if (state == NULL)
+ return NULL;
+
+ state->i2c_adap = i2c_adap;
+ state->i2c_addr = i2c_addr;
+
+ switch (config) {
+ case AF9033_TUNER_IT9135_38:
+ case AF9033_TUNER_IT9135_51:
+ case AF9033_TUNER_IT9135_52:
+ state->chip_ver = 0x01;
+ break;
+ case AF9033_TUNER_IT9135_60:
+ case AF9033_TUNER_IT9135_61:
+ case AF9033_TUNER_IT9135_62:
+ state->chip_ver = 0x02;
+ break;
+ default:
+ dev_dbg(&i2c_adap->dev,
+ "%s: invalid config=%02x\n", __func__, config);
+ goto error;
+ }
+
+ state->tuner_type = config;
+ state->firmware_ver = 1;
+
+ /* tuner RF initial */
+ ret = it913x_wr_reg(state, PRO_DMOD, 0xec4c, 0x68);
+ if (ret < 0)
+ goto error;
+
+ fe->tuner_priv = state;
+ memcpy(&fe->ops.tuner_ops, &it913x_tuner_ops,
+ sizeof(struct dvb_tuner_ops));
+
+ dev_info(&i2c_adap->dev,
+ "%s: ITE Tech IT913X successfully attached\n",
+ KBUILD_MODNAME);
+ dev_dbg(&i2c_adap->dev, "%s: config=%02x chip_ver=%02x\n",
+ __func__, config, state->chip_ver);
+
+ return fe;
+error:
+ kfree(state);
+ return NULL;
+}
+EXPORT_SYMBOL(it913x_attach);
+
+MODULE_DESCRIPTION("ITE Tech IT913X silicon tuner driver");
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/tuners/it913x.h b/drivers/media/tuners/it913x.h
new file mode 100644
index 0000000..12dd36b
--- /dev/null
+++ b/drivers/media/tuners/it913x.h
@@ -0,0 +1,45 @@
+/*
+ * ITE Tech IT9137 silicon tuner driver
+ *
+ * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
+ * IT9137 Copyright (C) ITE Tech Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
+ */
+
+#ifndef IT913X_H
+#define IT913X_H
+
+#include "dvb_frontend.h"
+
+#if defined(CONFIG_MEDIA_TUNER_IT913X) || \
+ (defined(CONFIG_MEDIA_TUNER_IT913X_MODULE) && defined(MODULE))
+extern struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
+ struct i2c_adapter *i2c_adap,
+ u8 i2c_addr,
+ u8 config);
+#else
+static inline struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
+ struct i2c_adapter *i2c_adap,
+ u8 i2c_addr,
+ u8 config)
+{
+ pr_warn("%s: driver disabled by Kconfig\n", __func__);
+ return NULL;
+}
+#endif
+
+#endif
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
new file mode 100644
index 0000000..781c98e
--- /dev/null
+++ b/drivers/media/tuners/it913x_priv.h
@@ -0,0 +1,88 @@
+/*
+ * ITE Tech IT9137 silicon tuner driver
+ *
+ * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
+ * IT9137 Copyright (C) ITE Tech Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
+ */
+
+#ifndef IT913X_PRIV_H
+#define IT913X_PRIV_H
+
+#include "it913x.h"
+#include "af9033.h"
+
+#define PRO_LINK 0x0
+#define PRO_DMOD 0x1
+#define TRIGGER_OFSM 0x0000
+
+struct it913xset { u32 pro;
+ u32 address;
+ u8 reg[15];
+ u8 count;
+};
+
+/* Tuner setting scripts for IT9135 AX */
+static struct it913xset it9135ax_tuner_off[] = {
+ {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
+ {PRO_DMOD, 0xec02, {0x3f}, 0x01},
+ {PRO_DMOD, 0xec03, {0x1f}, 0x01},
+ {PRO_DMOD, 0xec04, {0x3f}, 0x01},
+ {PRO_DMOD, 0xec05, {0x3f}, 0x01},
+ {PRO_DMOD, 0xec3f, {0x01}, 0x01},
+ {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+};
+
+/* Tuner setting scripts (still keeping it9137) */
+static struct it913xset it9137_tuner_off[] = {
+ {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
+ {PRO_DMOD, 0xec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},
+ {PRO_DMOD, 0xec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00}, 0x0c},
+ {PRO_DMOD, 0xec12, {0x00, 0x00, 0x00, 0x00}, 0x04},
+ {PRO_DMOD, 0xec17, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00}, 0x09},
+ {PRO_DMOD, 0xec22, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00}, 0x0a},
+ {PRO_DMOD, 0xec20, {0x00}, 0x01},
+ {PRO_DMOD, 0xec3f, {0x01}, 0x01},
+ {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+};
+
+static struct it913xset set_it9135_template[] = {
+ {PRO_DMOD, 0xee06, {0x00}, 0x01},
+ {PRO_DMOD, 0xec56, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4c, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4d, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4e, {0x00}, 0x01},
+ {PRO_DMOD, 0x011e, {0x00}, 0x01}, /* Older Devices */
+ {PRO_DMOD, 0x011f, {0x00}, 0x01},
+ {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+};
+
+static struct it913xset set_it9137_template[] = {
+ {PRO_DMOD, 0xee06, {0x00}, 0x01},
+ {PRO_DMOD, 0xec56, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4c, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4d, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4e, {0x00}, 0x01},
+ {PRO_DMOD, 0xec4f, {0x00}, 0x01},
+ {PRO_DMOD, 0xec50, {0x00}, 0x01},
+ {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+};
+
+#endif
diff --git a/drivers/media/tuners/tuner_it913x.c b/drivers/media/tuners/tuner_it913x.c
deleted file mode 100644
index b92d599..0000000
--- a/drivers/media/tuners/tuner_it913x.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * ITE Tech IT9137 silicon tuner driver
- *
- * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
- * IT9137 Copyright (C) ITE Tech Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
- */
-
-#include "tuner_it913x_priv.h"
-
-struct it913x_state {
- struct i2c_adapter *i2c_adap;
- u8 i2c_addr;
- u8 chip_ver;
- u8 tuner_type;
- u8 firmware_ver;
- u16 tun_xtal;
- u8 tun_fdiv;
- u8 tun_clk_mode;
- u32 tun_fn_min;
-};
-
-/* read multiple registers */
-static int it913x_rd_regs(struct it913x_state *state,
- u32 reg, u8 *data, u8 count)
-{
- int ret;
- u8 b[3];
- struct i2c_msg msg[2] = {
- { .addr = state->i2c_addr, .flags = 0,
- .buf = b, .len = sizeof(b) },
- { .addr = state->i2c_addr, .flags = I2C_M_RD,
- .buf = data, .len = count }
- };
-
- b[0] = (u8)(reg >> 16) & 0xff;
- b[1] = (u8)(reg >> 8) & 0xff;
- b[2] = (u8) reg & 0xff;
- b[0] |= 0x80; /* All reads from demodulator */
-
- ret = i2c_transfer(state->i2c_adap, msg, 2);
-
- return ret;
-}
-
-/* read single register */
-static int it913x_rd_reg(struct it913x_state *state, u32 reg)
-{
- int ret;
- u8 b[1];
-
- ret = it913x_rd_regs(state, reg, &b[0], sizeof(b));
- return (ret < 0) ? -ENODEV : b[0];
-}
-
-/* write multiple registers */
-static int it913x_wr_regs(struct it913x_state *state,
- u8 pro, u32 reg, u8 buf[], u8 count)
-{
- u8 b[256];
- struct i2c_msg msg[1] = {
- { .addr = state->i2c_addr, .flags = 0,
- .buf = b, .len = 3 + count }
- };
- int ret;
-
- b[0] = (u8)(reg >> 16) & 0xff;
- b[1] = (u8)(reg >> 8) & 0xff;
- b[2] = (u8) reg & 0xff;
- memcpy(&b[3], buf, count);
-
- if (pro == PRO_DMOD)
- b[0] |= 0x80;
-
- ret = i2c_transfer(state->i2c_adap, msg, 1);
-
- if (ret < 0)
- return -EIO;
-
- return 0;
-}
-
-/* write single register */
-static int it913x_wr_reg(struct it913x_state *state,
- u8 pro, u32 reg, u32 data)
-{
- int ret;
- u8 b[4];
- u8 s;
-
- b[0] = data >> 24;
- b[1] = (data >> 16) & 0xff;
- b[2] = (data >> 8) & 0xff;
- b[3] = data & 0xff;
- /* expand write as needed */
- if (data < 0x100)
- s = 3;
- else if (data < 0x1000)
- s = 2;
- else if (data < 0x100000)
- s = 1;
- else
- s = 0;
-
- ret = it913x_wr_regs(state, pro, reg, &b[s], sizeof(b) - s);
-
- return ret;
-}
-
-static int it913x_script_loader(struct it913x_state *state,
- struct it913xset *loadscript)
-{
- int ret, i;
-
- if (loadscript == NULL)
- return -EINVAL;
-
- for (i = 0; i < 1000; ++i) {
- if (loadscript[i].pro == 0xff)
- break;
- ret = it913x_wr_regs(state, loadscript[i].pro,
- loadscript[i].address,
- loadscript[i].reg, loadscript[i].count);
- if (ret < 0)
- return -ENODEV;
- }
- return 0;
-}
-
-static int it913x_init(struct dvb_frontend *fe)
-{
- struct it913x_state *state = fe->tuner_priv;
- int ret, i, reg;
- u8 val, nv_val;
- u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
- u8 b[2];
-
- reg = it913x_rd_reg(state, 0xec86);
- switch (reg) {
- case 0:
- state->tun_clk_mode = reg;
- state->tun_xtal = 2000;
- state->tun_fdiv = 3;
- val = 16;
- break;
- case -ENODEV:
- /* FIXME: these are just avoid divide by 0 */
- state->tun_xtal = 2000;
- state->tun_fdiv = 3;
- return -ENODEV;
- case 1:
- default:
- state->tun_clk_mode = reg;
- state->tun_xtal = 640;
- state->tun_fdiv = 1;
- val = 6;
- break;
- }
-
- reg = it913x_rd_reg(state, 0xed03);
-
- if (reg < 0)
- return -ENODEV;
- else if (reg < ARRAY_SIZE(nv))
- nv_val = nv[reg];
- else
- nv_val = 2;
-
- for (i = 0; i < 50; i++) {
- ret = it913x_rd_regs(state, 0xed23, &b[0], sizeof(b));
- reg = (b[1] << 8) + b[0];
- if (reg > 0)
- break;
- if (ret < 0)
- return -ENODEV;
- udelay(2000);
- }
- state->tun_fn_min = state->tun_xtal * reg;
- state->tun_fn_min /= (state->tun_fdiv * nv_val);
- dev_dbg(&state->i2c_adap->dev, "%s: Tuner fn_min %d\n", __func__,
- state->tun_fn_min);
-
- if (state->chip_ver > 1)
- msleep(50);
- else {
- for (i = 0; i < 50; i++) {
- reg = it913x_rd_reg(state, 0xec82);
- if (reg > 0)
- break;
- if (reg < 0)
- return -ENODEV;
- udelay(2000);
- }
- }
-
- /* Power Up Tuner - common all versions */
- ret = it913x_wr_reg(state, PRO_DMOD, 0xec40, 0x1);
- ret |= it913x_wr_reg(state, PRO_DMOD, 0xec57, 0x0);
- ret |= it913x_wr_reg(state, PRO_DMOD, 0xec58, 0x0);
-
- return it913x_wr_reg(state, PRO_DMOD, 0xed81, val);
-}
-
-static int it9137_set_params(struct dvb_frontend *fe)
-{
- struct it913x_state *state = fe->tuner_priv;
- struct it913xset *set_tuner = set_it9137_template;
- struct dtv_frontend_properties *p = &fe->dtv_property_cache;
- u32 bandwidth = p->bandwidth_hz;
- u32 frequency_m = p->frequency;
- int ret, reg;
- u32 frequency = frequency_m / 1000;
- u32 freq, temp_f, tmp;
- u16 iqik_m_cal;
- u16 n_div;
- u8 n;
- u8 l_band;
- u8 lna_band;
- u8 bw;
-
- if (state->firmware_ver == 1)
- set_tuner = set_it9135_template;
- else
- set_tuner = set_it9137_template;
-
- dev_dbg(&state->i2c_adap->dev, "%s: Tuner Frequency %d Bandwidth %d\n",
- __func__, frequency, bandwidth);
-
- if (frequency >= 51000 && frequency <= 440000) {
- l_band = 0;
- lna_band = 0;
- } else if (frequency > 440000 && frequency <= 484000) {
- l_band = 1;
- lna_band = 1;
- } else if (frequency > 484000 && frequency <= 533000) {
- l_band = 1;
- lna_band = 2;
- } else if (frequency > 533000 && frequency <= 587000) {
- l_band = 1;
- lna_band = 3;
- } else if (frequency > 587000 && frequency <= 645000) {
- l_band = 1;
- lna_band = 4;
- } else if (frequency > 645000 && frequency <= 710000) {
- l_band = 1;
- lna_band = 5;
- } else if (frequency > 710000 && frequency <= 782000) {
- l_band = 1;
- lna_band = 6;
- } else if (frequency > 782000 && frequency <= 860000) {
- l_band = 1;
- lna_band = 7;
- } else if (frequency > 1450000 && frequency <= 1492000) {
- l_band = 1;
- lna_band = 0;
- } else if (frequency > 1660000 && frequency <= 1685000) {
- l_band = 1;
- lna_band = 1;
- } else
- return -EINVAL;
- set_tuner[0].reg[0] = lna_band;
-
- switch (bandwidth) {
- case 5000000:
- bw = 0;
- break;
- case 6000000:
- bw = 2;
- break;
- case 7000000:
- bw = 4;
- break;
- default:
- case 8000000:
- bw = 6;
- break;
- }
-
- set_tuner[1].reg[0] = bw;
- set_tuner[2].reg[0] = 0xa0 | (l_band << 3);
-
- if (frequency > 53000 && frequency <= 74000) {
- n_div = 48;
- n = 0;
- } else if (frequency > 74000 && frequency <= 111000) {
- n_div = 32;
- n = 1;
- } else if (frequency > 111000 && frequency <= 148000) {
- n_div = 24;
- n = 2;
- } else if (frequency > 148000 && frequency <= 222000) {
- n_div = 16;
- n = 3;
- } else if (frequency > 222000 && frequency <= 296000) {
- n_div = 12;
- n = 4;
- } else if (frequency > 296000 && frequency <= 445000) {
- n_div = 8;
- n = 5;
- } else if (frequency > 445000 && frequency <= state->tun_fn_min) {
- n_div = 6;
- n = 6;
- } else if (frequency > state->tun_fn_min && frequency <= 950000) {
- n_div = 4;
- n = 7;
- } else if (frequency > 1450000 && frequency <= 1680000) {
- n_div = 2;
- n = 0;
- } else
- return -EINVAL;
-
- reg = it913x_rd_reg(state, 0xed81);
- iqik_m_cal = (u16)reg * n_div;
-
- if (reg < 0x20) {
- if (state->tun_clk_mode == 0)
- iqik_m_cal = (iqik_m_cal * 9) >> 5;
- else
- iqik_m_cal >>= 1;
- } else {
- iqik_m_cal = 0x40 - iqik_m_cal;
- if (state->tun_clk_mode == 0)
- iqik_m_cal = ~((iqik_m_cal * 9) >> 5);
- else
- iqik_m_cal = ~(iqik_m_cal >> 1);
- }
-
- temp_f = frequency * (u32)n_div * (u32)state->tun_fdiv;
- freq = temp_f / state->tun_xtal;
- tmp = freq * state->tun_xtal;
-
- if ((temp_f - tmp) >= (state->tun_xtal >> 1))
- freq++;
-
- freq += (u32) n << 13;
- /* Frequency OMEGA_IQIK_M_CAL_MID*/
- temp_f = freq + (u32)iqik_m_cal;
-
- set_tuner[3].reg[0] = temp_f & 0xff;
- set_tuner[4].reg[0] = (temp_f >> 8) & 0xff;
-
- dev_dbg(&state->i2c_adap->dev, "%s: High Frequency = %04x\n",
- __func__, temp_f);
-
- /* Lower frequency */
- set_tuner[5].reg[0] = freq & 0xff;
- set_tuner[6].reg[0] = (freq >> 8) & 0xff;
-
- dev_dbg(&state->i2c_adap->dev, "%s: low Frequency = %04x\n",
- __func__, freq);
-
- ret = it913x_script_loader(state, set_tuner);
-
- return (ret < 0) ? -ENODEV : 0;
-}
-
-/* Power sequence */
-/* Power Up Tuner on -> Frontend suspend off -> Tuner clk on */
-/* Power Down Frontend suspend on -> Tuner clk off -> Tuner off */
-
-static int it913x_sleep(struct dvb_frontend *fe)
-{
- struct it913x_state *state = fe->tuner_priv;
-
- if (state->chip_ver == 0x01)
- return it913x_script_loader(state, it9135ax_tuner_off);
- else
- return it913x_script_loader(state, it9137_tuner_off);
-}
-
-static int it913x_release(struct dvb_frontend *fe)
-{
- kfree(fe->tuner_priv);
- return 0;
-}
-
-static const struct dvb_tuner_ops it913x_tuner_ops = {
- .info = {
- .name = "ITE Tech IT913X",
- .frequency_min = 174000000,
- .frequency_max = 862000000,
- },
-
- .release = it913x_release,
-
- .init = it913x_init,
- .sleep = it913x_sleep,
- .set_params = it9137_set_params,
-};
-
-struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
- struct i2c_adapter *i2c_adap, u8 i2c_addr, u8 config)
-{
- struct it913x_state *state = NULL;
- int ret;
-
- /* allocate memory for the internal state */
- state = kzalloc(sizeof(struct it913x_state), GFP_KERNEL);
- if (state == NULL)
- return NULL;
-
- state->i2c_adap = i2c_adap;
- state->i2c_addr = i2c_addr;
-
- switch (config) {
- case AF9033_TUNER_IT9135_38:
- case AF9033_TUNER_IT9135_51:
- case AF9033_TUNER_IT9135_52:
- state->chip_ver = 0x01;
- break;
- case AF9033_TUNER_IT9135_60:
- case AF9033_TUNER_IT9135_61:
- case AF9033_TUNER_IT9135_62:
- state->chip_ver = 0x02;
- break;
- default:
- dev_dbg(&i2c_adap->dev,
- "%s: invalid config=%02x\n", __func__, config);
- goto error;
- }
-
- state->tuner_type = config;
- state->firmware_ver = 1;
-
- /* tuner RF initial */
- ret = it913x_wr_reg(state, PRO_DMOD, 0xec4c, 0x68);
- if (ret < 0)
- goto error;
-
- fe->tuner_priv = state;
- memcpy(&fe->ops.tuner_ops, &it913x_tuner_ops,
- sizeof(struct dvb_tuner_ops));
-
- dev_info(&i2c_adap->dev,
- "%s: ITE Tech IT913X successfully attached\n",
- KBUILD_MODNAME);
- dev_dbg(&i2c_adap->dev, "%s: config=%02x chip_ver=%02x\n",
- __func__, config, state->chip_ver);
-
- return fe;
-error:
- kfree(state);
- return NULL;
-}
-EXPORT_SYMBOL(it913x_attach);
-
-MODULE_DESCRIPTION("ITE Tech IT913X silicon tuner driver");
-MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/tuners/tuner_it913x.h b/drivers/media/tuners/tuner_it913x.h
deleted file mode 100644
index 12dd36b..0000000
--- a/drivers/media/tuners/tuner_it913x.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * ITE Tech IT9137 silicon tuner driver
- *
- * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
- * IT9137 Copyright (C) ITE Tech Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
- */
-
-#ifndef IT913X_H
-#define IT913X_H
-
-#include "dvb_frontend.h"
-
-#if defined(CONFIG_MEDIA_TUNER_IT913X) || \
- (defined(CONFIG_MEDIA_TUNER_IT913X_MODULE) && defined(MODULE))
-extern struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
- struct i2c_adapter *i2c_adap,
- u8 i2c_addr,
- u8 config);
-#else
-static inline struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
- struct i2c_adapter *i2c_adap,
- u8 i2c_addr,
- u8 config)
-{
- pr_warn("%s: driver disabled by Kconfig\n", __func__);
- return NULL;
-}
-#endif
-
-#endif
diff --git a/drivers/media/tuners/tuner_it913x_priv.h b/drivers/media/tuners/tuner_it913x_priv.h
deleted file mode 100644
index cc6f4b1..0000000
--- a/drivers/media/tuners/tuner_it913x_priv.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * ITE Tech IT9137 silicon tuner driver
- *
- * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
- * IT9137 Copyright (C) ITE Tech Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
- */
-
-#ifndef IT913X_PRIV_H
-#define IT913X_PRIV_H
-
-#include "tuner_it913x.h"
-#include "af9033.h"
-
-#define PRO_LINK 0x0
-#define PRO_DMOD 0x1
-#define TRIGGER_OFSM 0x0000
-
-struct it913xset { u32 pro;
- u32 address;
- u8 reg[15];
- u8 count;
-};
-
-/* Tuner setting scripts for IT9135 AX */
-static struct it913xset it9135ax_tuner_off[] = {
- {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
- {PRO_DMOD, 0xec02, {0x3f}, 0x01},
- {PRO_DMOD, 0xec03, {0x1f}, 0x01},
- {PRO_DMOD, 0xec04, {0x3f}, 0x01},
- {PRO_DMOD, 0xec05, {0x3f}, 0x01},
- {PRO_DMOD, 0xec3f, {0x01}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
-/* Tuner setting scripts (still keeping it9137) */
-static struct it913xset it9137_tuner_off[] = {
- {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
- {PRO_DMOD, 0xec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},
- {PRO_DMOD, 0xec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00}, 0x0c},
- {PRO_DMOD, 0xec12, {0x00, 0x00, 0x00, 0x00}, 0x04},
- {PRO_DMOD, 0xec17, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00}, 0x09},
- {PRO_DMOD, 0xec22, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00}, 0x0a},
- {PRO_DMOD, 0xec20, {0x00}, 0x01},
- {PRO_DMOD, 0xec3f, {0x01}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
-static struct it913xset set_it9135_template[] = {
- {PRO_DMOD, 0xee06, {0x00}, 0x01},
- {PRO_DMOD, 0xec56, {0x00}, 0x01},
- {PRO_DMOD, 0xec4c, {0x00}, 0x01},
- {PRO_DMOD, 0xec4d, {0x00}, 0x01},
- {PRO_DMOD, 0xec4e, {0x00}, 0x01},
- {PRO_DMOD, 0x011e, {0x00}, 0x01}, /* Older Devices */
- {PRO_DMOD, 0x011f, {0x00}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
-static struct it913xset set_it9137_template[] = {
- {PRO_DMOD, 0xee06, {0x00}, 0x01},
- {PRO_DMOD, 0xec56, {0x00}, 0x01},
- {PRO_DMOD, 0xec4c, {0x00}, 0x01},
- {PRO_DMOD, 0xec4d, {0x00}, 0x01},
- {PRO_DMOD, 0xec4e, {0x00}, 0x01},
- {PRO_DMOD, 0xec4f, {0x00}, 0x01},
- {PRO_DMOD, 0xec50, {0x00}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
-#endif
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h
index c21902f..70ec9c9 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.h
+++ b/drivers/media/usb/dvb-usb-v2/af9035.h
@@ -30,7 +30,7 @@
#include "mxl5007t.h"
#include "tda18218.h"
#include "fc2580.h"
-#include "tuner_it913x.h"
+#include "it913x.h"
struct reg_val {
u32 reg;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 11/37] af9035: do not attach IT9135 tuner
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (8 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 10/37] it913x: rename tuner_it913x => it913x Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 12/37] it913x: convert to I2C driver Antti Palosaari
` (25 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Remove IT9135 tuner attach for a while as we will convert IT9135
driver to Kernel I2C model.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index f37cf7d..0ec8919 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1235,9 +1235,12 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
case AF9033_TUNER_IT9135_61:
case AF9033_TUNER_IT9135_62:
/* attach tuner */
+ /*
fe = dvb_attach(it913x_attach, adap->fe[0], &d->i2c_adap,
state->af9033_config[adap->id].i2c_addr,
state->af9033_config[0].tuner);
+ */
+ fe = NULL;
break;
default:
fe = NULL;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 12/37] it913x: convert to I2C driver
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (9 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 11/37] af9035: do not attach IT9135 tuner Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 13/37] af9035: use I2C it913x tuner driver Antti Palosaari
` (24 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Convert driver from DVB proprietary model to kernel I2C model.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 133 ++++++++++++++++++++-----------------
drivers/media/tuners/it913x.h | 33 ++++-----
drivers/media/tuners/it913x_priv.h | 1 -
3 files changed, 90 insertions(+), 77 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 4627925..72fefb7 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -23,10 +23,9 @@
#include "it913x_priv.h"
struct it913x_state {
- struct i2c_adapter *i2c_adap;
- u8 i2c_addr;
+ struct i2c_client *client;
+ struct dvb_frontend *fe;
u8 chip_ver;
- u8 tuner_type;
u8 firmware_ver;
u16 tun_xtal;
u8 tun_fdiv;
@@ -41,9 +40,9 @@ static int it913x_rd_regs(struct it913x_state *state,
int ret;
u8 b[3];
struct i2c_msg msg[2] = {
- { .addr = state->i2c_addr, .flags = 0,
+ { .addr = state->client->addr, .flags = 0,
.buf = b, .len = sizeof(b) },
- { .addr = state->i2c_addr, .flags = I2C_M_RD,
+ { .addr = state->client->addr, .flags = I2C_M_RD,
.buf = data, .len = count }
};
@@ -52,7 +51,7 @@ static int it913x_rd_regs(struct it913x_state *state,
b[2] = (u8) reg & 0xff;
b[0] |= 0x80; /* All reads from demodulator */
- ret = i2c_transfer(state->i2c_adap, msg, 2);
+ ret = i2c_transfer(state->client->adapter, msg, 2);
return ret;
}
@@ -73,7 +72,7 @@ static int it913x_wr_regs(struct it913x_state *state,
{
u8 b[256];
struct i2c_msg msg[1] = {
- { .addr = state->i2c_addr, .flags = 0,
+ { .addr = state->client->addr, .flags = 0,
.buf = b, .len = 3 + count }
};
int ret;
@@ -86,7 +85,7 @@ static int it913x_wr_regs(struct it913x_state *state,
if (pro == PRO_DMOD)
b[0] |= 0x80;
- ret = i2c_transfer(state->i2c_adap, msg, 1);
+ ret = i2c_transfer(state->client->adapter, msg, 1);
if (ret < 0)
return -EIO;
@@ -191,8 +190,7 @@ static int it913x_init(struct dvb_frontend *fe)
}
state->tun_fn_min = state->tun_xtal * reg;
state->tun_fn_min /= (state->tun_fdiv * nv_val);
- dev_dbg(&state->i2c_adap->dev, "%s: Tuner fn_min %d\n", __func__,
- state->tun_fn_min);
+ dev_dbg(&state->client->dev, "Tuner fn_min %d\n", state->tun_fn_min);
if (state->chip_ver > 1)
msleep(50);
@@ -237,8 +235,8 @@ static int it9137_set_params(struct dvb_frontend *fe)
else
set_tuner = set_it9137_template;
- dev_dbg(&state->i2c_adap->dev, "%s: Tuner Frequency %d Bandwidth %d\n",
- __func__, frequency, bandwidth);
+ dev_dbg(&state->client->dev, "Tuner Frequency %d Bandwidth %d\n",
+ frequency, bandwidth);
if (frequency >= 51000 && frequency <= 440000) {
l_band = 0;
@@ -353,15 +351,13 @@ static int it9137_set_params(struct dvb_frontend *fe)
set_tuner[3].reg[0] = temp_f & 0xff;
set_tuner[4].reg[0] = (temp_f >> 8) & 0xff;
- dev_dbg(&state->i2c_adap->dev, "%s: High Frequency = %04x\n",
- __func__, temp_f);
+ dev_dbg(&state->client->dev, "High Frequency = %04x\n", temp_f);
/* Lower frequency */
set_tuner[5].reg[0] = freq & 0xff;
set_tuner[6].reg[0] = (freq >> 8) & 0xff;
- dev_dbg(&state->i2c_adap->dev, "%s: low Frequency = %04x\n",
- __func__, freq);
+ dev_dbg(&state->client->dev, "low Frequency = %04x\n", freq);
ret = it913x_script_loader(state, set_tuner);
@@ -382,12 +378,6 @@ static int it913x_sleep(struct dvb_frontend *fe)
return it913x_script_loader(state, it9137_tuner_off);
}
-static int it913x_release(struct dvb_frontend *fe)
-{
- kfree(fe->tuner_priv);
- return 0;
-}
-
static const struct dvb_tuner_ops it913x_tuner_ops = {
.info = {
.name = "ITE Tech IT913X",
@@ -395,68 +385,91 @@ static const struct dvb_tuner_ops it913x_tuner_ops = {
.frequency_max = 862000000,
},
- .release = it913x_release,
-
.init = it913x_init,
.sleep = it913x_sleep,
.set_params = it9137_set_params,
};
-struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
- struct i2c_adapter *i2c_adap, u8 i2c_addr, u8 config)
+static int it913x_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
{
- struct it913x_state *state = NULL;
+ struct it913x_config *cfg = client->dev.platform_data;
+ struct dvb_frontend *fe = cfg->fe;
+ struct it913x_state *state;
int ret;
+ char *chip_ver_str;
- /* allocate memory for the internal state */
state = kzalloc(sizeof(struct it913x_state), GFP_KERNEL);
- if (state == NULL)
- return NULL;
-
- state->i2c_adap = i2c_adap;
- state->i2c_addr = i2c_addr;
-
- switch (config) {
- case AF9033_TUNER_IT9135_38:
- case AF9033_TUNER_IT9135_51:
- case AF9033_TUNER_IT9135_52:
- state->chip_ver = 0x01;
- break;
- case AF9033_TUNER_IT9135_60:
- case AF9033_TUNER_IT9135_61:
- case AF9033_TUNER_IT9135_62:
- state->chip_ver = 0x02;
- break;
- default:
- dev_dbg(&i2c_adap->dev,
- "%s: invalid config=%02x\n", __func__, config);
- goto error;
+ if (state == NULL) {
+ ret = -ENOMEM;
+ dev_err(&client->dev, "kzalloc() failed\n");
+ goto err;
}
- state->tuner_type = config;
+ state->client = client;
+ state->fe = cfg->fe;
+ state->chip_ver = cfg->chip_ver;
state->firmware_ver = 1;
/* tuner RF initial */
ret = it913x_wr_reg(state, PRO_DMOD, 0xec4c, 0x68);
if (ret < 0)
- goto error;
+ goto err;
fe->tuner_priv = state;
memcpy(&fe->ops.tuner_ops, &it913x_tuner_ops,
sizeof(struct dvb_tuner_ops));
+ i2c_set_clientdata(client, state);
+
+ if (state->chip_ver == 1)
+ chip_ver_str = "AX";
+ else if (state->chip_ver == 2)
+ chip_ver_str = "BX";
+ else
+ chip_ver_str = "??";
+
+ dev_info(&state->client->dev, "ITE IT913X %s successfully attached\n",
+ chip_ver_str);
+ dev_dbg(&state->client->dev, "chip_ver=%02x\n", state->chip_ver);
+ return 0;
+err:
+ dev_dbg(&client->dev, "failed %d\n", ret);
+ kfree(state);
- dev_info(&i2c_adap->dev,
- "%s: ITE Tech IT913X successfully attached\n",
- KBUILD_MODNAME);
- dev_dbg(&i2c_adap->dev, "%s: config=%02x chip_ver=%02x\n",
- __func__, config, state->chip_ver);
+ return ret;
+}
- return fe;
-error:
+static int it913x_remove(struct i2c_client *client)
+{
+ struct it913x_state *state = i2c_get_clientdata(client);
+ struct dvb_frontend *fe = state->fe;
+
+ dev_dbg(&client->dev, "\n");
+
+ memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
+ fe->tuner_priv = NULL;
kfree(state);
- return NULL;
+
+ return 0;
}
-EXPORT_SYMBOL(it913x_attach);
+
+static const struct i2c_device_id it913x_id_table[] = {
+ {"it913x", 0},
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, it913x_id_table);
+
+static struct i2c_driver it913x_driver = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "it913x",
+ },
+ .probe = it913x_probe,
+ .remove = it913x_remove,
+ .id_table = it913x_id_table,
+};
+
+module_i2c_driver(it913x_driver);
MODULE_DESCRIPTION("ITE Tech IT913X silicon tuner driver");
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
diff --git a/drivers/media/tuners/it913x.h b/drivers/media/tuners/it913x.h
index 12dd36b..9789c4d 100644
--- a/drivers/media/tuners/it913x.h
+++ b/drivers/media/tuners/it913x.h
@@ -25,21 +25,22 @@
#include "dvb_frontend.h"
-#if defined(CONFIG_MEDIA_TUNER_IT913X) || \
- (defined(CONFIG_MEDIA_TUNER_IT913X_MODULE) && defined(MODULE))
-extern struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
- struct i2c_adapter *i2c_adap,
- u8 i2c_addr,
- u8 config);
-#else
-static inline struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
- struct i2c_adapter *i2c_adap,
- u8 i2c_addr,
- u8 config)
-{
- pr_warn("%s: driver disabled by Kconfig\n", __func__);
- return NULL;
-}
-#endif
+/*
+ * I2C address
+ * 0x38, 0x3a, 0x3c, 0x3e
+ */
+struct it913x_config {
+ /*
+ * pointer to DVB frontend
+ */
+ struct dvb_frontend *fe;
+
+ /*
+ * chip version
+ * 1 = IT9135 AX
+ * 2 = IT9135 BX
+ */
+ u8 chip_ver:2;
+};
#endif
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index 781c98e..d624efd 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -24,7 +24,6 @@
#define IT913X_PRIV_H
#include "it913x.h"
-#include "af9033.h"
#define PRO_LINK 0x0
#define PRO_DMOD 0x1
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 13/37] af9035: use I2C it913x tuner driver
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (10 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 12/37] it913x: convert to I2C driver Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 14/37] it913x: change reg read/write routines more common Antti Palosaari
` (23 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Use I2C it913x tuner driver.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 135 ++++++++++++++++++++++++++++++++--
drivers/media/usb/dvb-usb-v2/af9035.h | 3 +-
2 files changed, 131 insertions(+), 7 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 0ec8919..1a5b600 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -193,6 +193,93 @@ static int af9035_wr_reg_mask(struct dvb_usb_device *d, u32 reg, u8 val,
return af9035_wr_regs(d, reg, &val, 1);
}
+static int af9035_add_i2c_dev(struct dvb_usb_device *d, char *type, u8 addr,
+ void *platform_data)
+{
+ int ret, num;
+ struct state *state = d_to_priv(d);
+ struct i2c_client *client;
+ struct i2c_adapter *adapter = &d->i2c_adap;
+ struct i2c_board_info board_info = {
+ .addr = addr,
+ .platform_data = platform_data,
+ };
+
+ strlcpy(board_info.type, type, I2C_NAME_SIZE);
+
+ /* find first free client */
+ for (num = 0; num < AF9035_I2C_CLIENT_MAX; num++) {
+ if (state->i2c_client[num] == NULL)
+ break;
+ }
+
+ dev_dbg(&d->udev->dev, "%s: num=%d\n", __func__, num);
+
+ if (num == AF9035_I2C_CLIENT_MAX) {
+ dev_err(&d->udev->dev, "%s: I2C client out of index\n",
+ KBUILD_MODNAME);
+ ret = -ENODEV;
+ goto err;
+ }
+
+ request_module(board_info.type);
+
+ /* register I2C device */
+ client = i2c_new_device(adapter, &board_info);
+ if (client == NULL || client->dev.driver == NULL) {
+ ret = -ENODEV;
+ goto err;
+ }
+
+ /* increase I2C driver usage count */
+ if (!try_module_get(client->dev.driver->owner)) {
+ i2c_unregister_device(client);
+ ret = -ENODEV;
+ goto err;
+ }
+
+ state->i2c_client[num] = client;
+ return 0;
+err:
+ dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+ return ret;
+}
+
+static void af9035_del_i2c_dev(struct dvb_usb_device *d)
+{
+ int num;
+ struct state *state = d_to_priv(d);
+ struct i2c_client *client;
+
+ /* find last used client */
+ num = AF9035_I2C_CLIENT_MAX;
+ while (num--) {
+ if (state->i2c_client[num] != NULL)
+ break;
+ }
+
+ dev_dbg(&d->udev->dev, "%s: num=%d\n", __func__, num);
+
+ if (num == -1) {
+ dev_err(&d->udev->dev, "%s: I2C client out of index\n",
+ KBUILD_MODNAME);
+ goto err;
+ }
+
+ client = state->i2c_client[num];
+
+ /* decrease I2C driver usage count */
+ module_put(client->dev.driver->owner);
+
+ /* unregister I2C device */
+ i2c_unregister_device(client);
+
+ state->i2c_client[num] = NULL;
+ return;
+err:
+ dev_dbg(&d->udev->dev, "%s: failed\n", __func__);
+}
+
static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
struct i2c_msg msg[], int num)
{
@@ -1231,17 +1318,39 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
case AF9033_TUNER_IT9135_52:
+ {
+ struct it913x_config it913x_config = {
+ .fe = adap->fe[0],
+ .chip_ver = 1,
+ };
+
+ ret = af9035_add_i2c_dev(d, "it913x",
+ state->af9033_config[adap->id].i2c_addr,
+ &it913x_config);
+ if (ret)
+ goto err;
+
+ fe = adap->fe[0];
+ break;
+ }
case AF9033_TUNER_IT9135_60:
case AF9033_TUNER_IT9135_61:
case AF9033_TUNER_IT9135_62:
- /* attach tuner */
- /*
- fe = dvb_attach(it913x_attach, adap->fe[0], &d->i2c_adap,
+ {
+ struct it913x_config it913x_config = {
+ .fe = adap->fe[0],
+ .chip_ver = 2,
+ };
+
+ ret = af9035_add_i2c_dev(d, "it913x",
state->af9033_config[adap->id].i2c_addr,
- state->af9033_config[0].tuner);
- */
- fe = NULL;
+ &it913x_config);
+ if (ret)
+ goto err;
+
+ fe = adap->fe[0];
break;
+ }
default:
fe = NULL;
}
@@ -1306,6 +1415,19 @@ err:
return ret;
}
+static void af9035_exit(struct dvb_usb_device *d)
+{
+ struct state *state = d_to_priv(d);
+
+ dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+ if (state->i2c_client[1])
+ af9035_del_i2c_dev(d);
+
+ if (state->i2c_client[0])
+ af9035_del_i2c_dev(d);
+}
+
#if IS_ENABLED(CONFIG_RC_CORE)
static int af9035_rc_query(struct dvb_usb_device *d)
{
@@ -1482,6 +1604,7 @@ static const struct dvb_usb_device_properties af9035_props = {
.init = af9035_init,
.get_rc_config = af9035_get_rc_config,
.get_stream_config = af9035_get_stream_config,
+ .exit = af9035_exit,
.get_adapter_count = af9035_get_adapter_count,
.adapter = {
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h
index 70ec9c9..0911c4fc 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.h
+++ b/drivers/media/usb/dvb-usb-v2/af9035.h
@@ -62,8 +62,9 @@ struct state {
u8 dual_mode:1;
u16 eeprom_addr;
struct af9033_config af9033_config[2];
-
struct af9033_ops ops;
+ #define AF9035_I2C_CLIENT_MAX 2
+ struct i2c_client *i2c_client[AF9035_I2C_CLIENT_MAX];
};
static const u32 clock_lut_af9035[] = {
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 14/37] it913x: change reg read/write routines more common
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (11 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 13/37] af9035: use I2C it913x tuner driver Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 15/37] it913x: rename 'state' to 'dev' Antti Palosaari
` (22 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Change register write and read routines to similar which are
typically used. We have to add processor core as a part of register
address in order to simplify register access. Chip has two cores,
called link and ofdm. As for now, use address bit 24 to address used
core. Bits 15:0 are register address in given core.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 58 +++++++++++++++-----------------
drivers/media/tuners/it913x_priv.h | 69 ++++++++++++++++++--------------------
2 files changed, 60 insertions(+), 67 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 72fefb7..7664878 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -49,7 +49,6 @@ static int it913x_rd_regs(struct it913x_state *state,
b[0] = (u8)(reg >> 16) & 0xff;
b[1] = (u8)(reg >> 8) & 0xff;
b[2] = (u8) reg & 0xff;
- b[0] |= 0x80; /* All reads from demodulator */
ret = i2c_transfer(state->client->adapter, msg, 2);
@@ -57,18 +56,21 @@ static int it913x_rd_regs(struct it913x_state *state,
}
/* read single register */
-static int it913x_rd_reg(struct it913x_state *state, u32 reg)
+static int it913x_rd_reg(struct it913x_state *state, u32 reg, u8 *val)
{
int ret;
u8 b[1];
ret = it913x_rd_regs(state, reg, &b[0], sizeof(b));
- return (ret < 0) ? -ENODEV : b[0];
+ if (ret < 0)
+ return -ENODEV;
+ *val = b[0];
+ return 0;
}
/* write multiple registers */
static int it913x_wr_regs(struct it913x_state *state,
- u8 pro, u32 reg, u8 buf[], u8 count)
+ u32 reg, u8 buf[], u8 count)
{
u8 b[256];
struct i2c_msg msg[1] = {
@@ -82,9 +84,6 @@ static int it913x_wr_regs(struct it913x_state *state,
b[2] = (u8) reg & 0xff;
memcpy(&b[3], buf, count);
- if (pro == PRO_DMOD)
- b[0] |= 0x80;
-
ret = i2c_transfer(state->client->adapter, msg, 1);
if (ret < 0)
@@ -95,7 +94,7 @@ static int it913x_wr_regs(struct it913x_state *state,
/* write single register */
static int it913x_wr_reg(struct it913x_state *state,
- u8 pro, u32 reg, u32 data)
+ u32 reg, u32 data)
{
int ret;
u8 b[4];
@@ -115,7 +114,7 @@ static int it913x_wr_reg(struct it913x_state *state,
else
s = 0;
- ret = it913x_wr_regs(state, pro, reg, &b[s], sizeof(b) - s);
+ ret = it913x_wr_regs(state, reg, &b[s], sizeof(b) - s);
return ret;
}
@@ -129,9 +128,9 @@ static int it913x_script_loader(struct it913x_state *state,
return -EINVAL;
for (i = 0; i < 1000; ++i) {
- if (loadscript[i].pro == 0xff)
+ if (loadscript[i].address == 0x000000)
break;
- ret = it913x_wr_regs(state, loadscript[i].pro,
+ ret = it913x_wr_regs(state,
loadscript[i].address,
loadscript[i].reg, loadscript[i].count);
if (ret < 0)
@@ -143,12 +142,13 @@ static int it913x_script_loader(struct it913x_state *state,
static int it913x_init(struct dvb_frontend *fe)
{
struct it913x_state *state = fe->tuner_priv;
- int ret, i, reg;
+ int ret, i;
+ u8 reg = 0;
u8 val, nv_val;
u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
u8 b[2];
- reg = it913x_rd_reg(state, 0xec86);
+ ret = it913x_rd_reg(state, 0x80ec86, ®);
switch (reg) {
case 0:
state->tun_clk_mode = reg;
@@ -156,13 +156,8 @@ static int it913x_init(struct dvb_frontend *fe)
state->tun_fdiv = 3;
val = 16;
break;
- case -ENODEV:
- /* FIXME: these are just avoid divide by 0 */
- state->tun_xtal = 2000;
- state->tun_fdiv = 3;
- return -ENODEV;
case 1:
- default:
+ default: /* I/O error too */
state->tun_clk_mode = reg;
state->tun_xtal = 640;
state->tun_fdiv = 1;
@@ -170,7 +165,7 @@ static int it913x_init(struct dvb_frontend *fe)
break;
}
- reg = it913x_rd_reg(state, 0xed03);
+ ret = it913x_rd_reg(state, 0x80ed03, ®);
if (reg < 0)
return -ENODEV;
@@ -180,7 +175,7 @@ static int it913x_init(struct dvb_frontend *fe)
nv_val = 2;
for (i = 0; i < 50; i++) {
- ret = it913x_rd_regs(state, 0xed23, &b[0], sizeof(b));
+ ret = it913x_rd_regs(state, 0x80ed23, &b[0], sizeof(b));
reg = (b[1] << 8) + b[0];
if (reg > 0)
break;
@@ -196,21 +191,21 @@ static int it913x_init(struct dvb_frontend *fe)
msleep(50);
else {
for (i = 0; i < 50; i++) {
- reg = it913x_rd_reg(state, 0xec82);
+ ret = it913x_rd_reg(state, 0x80ec82, ®);
+ if (ret < 0)
+ return -ENODEV;
if (reg > 0)
break;
- if (reg < 0)
- return -ENODEV;
udelay(2000);
}
}
/* Power Up Tuner - common all versions */
- ret = it913x_wr_reg(state, PRO_DMOD, 0xec40, 0x1);
- ret |= it913x_wr_reg(state, PRO_DMOD, 0xec57, 0x0);
- ret |= it913x_wr_reg(state, PRO_DMOD, 0xec58, 0x0);
+ ret = it913x_wr_reg(state, 0x80ec40, 0x1);
+ ret |= it913x_wr_reg(state, 0x80ec57, 0x0);
+ ret |= it913x_wr_reg(state, 0x80ec58, 0x0);
- return it913x_wr_reg(state, PRO_DMOD, 0xed81, val);
+ return it913x_wr_reg(state, 0x80ed81, val);
}
static int it9137_set_params(struct dvb_frontend *fe)
@@ -220,7 +215,8 @@ static int it9137_set_params(struct dvb_frontend *fe)
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
u32 bandwidth = p->bandwidth_hz;
u32 frequency_m = p->frequency;
- int ret, reg;
+ int ret;
+ u8 reg = 0;
u32 frequency = frequency_m / 1000;
u32 freq, temp_f, tmp;
u16 iqik_m_cal;
@@ -321,7 +317,7 @@ static int it9137_set_params(struct dvb_frontend *fe)
} else
return -EINVAL;
- reg = it913x_rd_reg(state, 0xed81);
+ ret = it913x_rd_reg(state, 0x80ed81, ®);
iqik_m_cal = (u16)reg * n_div;
if (reg < 0x20) {
@@ -412,7 +408,7 @@ static int it913x_probe(struct i2c_client *client,
state->firmware_ver = 1;
/* tuner RF initial */
- ret = it913x_wr_reg(state, PRO_DMOD, 0xec4c, 0x68);
+ ret = it913x_wr_reg(state, 0x80ec4c, 0x68);
if (ret < 0)
goto err;
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index d624efd..32af24c 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -25,63 +25,60 @@
#include "it913x.h"
-#define PRO_LINK 0x0
-#define PRO_DMOD 0x1
#define TRIGGER_OFSM 0x0000
-struct it913xset { u32 pro;
- u32 address;
+struct it913xset { u32 address;
u8 reg[15];
u8 count;
};
/* Tuner setting scripts for IT9135 AX */
static struct it913xset it9135ax_tuner_off[] = {
- {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
- {PRO_DMOD, 0xec02, {0x3f}, 0x01},
- {PRO_DMOD, 0xec03, {0x1f}, 0x01},
- {PRO_DMOD, 0xec04, {0x3f}, 0x01},
- {PRO_DMOD, 0xec05, {0x3f}, 0x01},
- {PRO_DMOD, 0xec3f, {0x01}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+ {0x80ec40, {0x00}, 0x01}, /* Power Down Tuner */
+ {0x80ec02, {0x3f}, 0x01},
+ {0x80ec03, {0x1f}, 0x01},
+ {0x80ec04, {0x3f}, 0x01},
+ {0x80ec05, {0x3f}, 0x01},
+ {0x80ec3f, {0x01}, 0x01},
+ {0x000000, {0x00}, 0x00}, /* Terminating Entry */
};
/* Tuner setting scripts (still keeping it9137) */
static struct it913xset it9137_tuner_off[] = {
- {PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */
- {PRO_DMOD, 0xec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},
- {PRO_DMOD, 0xec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ {0x80ec40, {0x00}, 0x01}, /* Power Down Tuner */
+ {0x80ec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},
+ {0x80ec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00}, 0x0c},
- {PRO_DMOD, 0xec12, {0x00, 0x00, 0x00, 0x00}, 0x04},
- {PRO_DMOD, 0xec17, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ {0x80ec12, {0x00, 0x00, 0x00, 0x00}, 0x04},
+ {0x80ec17, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00}, 0x09},
- {PRO_DMOD, 0xec22, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ {0x80ec22, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00}, 0x0a},
- {PRO_DMOD, 0xec20, {0x00}, 0x01},
- {PRO_DMOD, 0xec3f, {0x01}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+ {0x80ec20, {0x00}, 0x01},
+ {0x80ec3f, {0x01}, 0x01},
+ {0x000000, {0x00}, 0x00}, /* Terminating Entry */
};
static struct it913xset set_it9135_template[] = {
- {PRO_DMOD, 0xee06, {0x00}, 0x01},
- {PRO_DMOD, 0xec56, {0x00}, 0x01},
- {PRO_DMOD, 0xec4c, {0x00}, 0x01},
- {PRO_DMOD, 0xec4d, {0x00}, 0x01},
- {PRO_DMOD, 0xec4e, {0x00}, 0x01},
- {PRO_DMOD, 0x011e, {0x00}, 0x01}, /* Older Devices */
- {PRO_DMOD, 0x011f, {0x00}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+ {0x80ee06, {0x00}, 0x01},
+ {0x80ec56, {0x00}, 0x01},
+ {0x80ec4c, {0x00}, 0x01},
+ {0x80ec4d, {0x00}, 0x01},
+ {0x80ec4e, {0x00}, 0x01},
+ {0x80011e, {0x00}, 0x01}, /* Older Devices */
+ {0x80011f, {0x00}, 0x01},
+ {0x000000, {0x00}, 0x00}, /* Terminating Entry */
};
static struct it913xset set_it9137_template[] = {
- {PRO_DMOD, 0xee06, {0x00}, 0x01},
- {PRO_DMOD, 0xec56, {0x00}, 0x01},
- {PRO_DMOD, 0xec4c, {0x00}, 0x01},
- {PRO_DMOD, 0xec4d, {0x00}, 0x01},
- {PRO_DMOD, 0xec4e, {0x00}, 0x01},
- {PRO_DMOD, 0xec4f, {0x00}, 0x01},
- {PRO_DMOD, 0xec50, {0x00}, 0x01},
- {0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */
+ {0x80ee06, {0x00}, 0x01},
+ {0x80ec56, {0x00}, 0x01},
+ {0x80ec4c, {0x00}, 0x01},
+ {0x80ec4d, {0x00}, 0x01},
+ {0x80ec4e, {0x00}, 0x01},
+ {0x80ec4f, {0x00}, 0x01},
+ {0x80ec50, {0x00}, 0x01},
+ {0x000000, {0x00}, 0x00}, /* Terminating Entry */
};
#endif
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 15/37] it913x: rename 'state' to 'dev'
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (12 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 14/37] it913x: change reg read/write routines more common Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 16/37] it913x: convert to RegMap API Antti Palosaari
` (21 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
foo_dev seems to be most correct term for the structure holding data
of each device instance. It is most used term in Kernel and also
examples from book Linux Device Drivers, Third Edition, uses it.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 150 +++++++++++++++++++++---------------------
1 file changed, 75 insertions(+), 75 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 7664878..cc959c1 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -22,7 +22,7 @@
#include "it913x_priv.h"
-struct it913x_state {
+struct it913x_dev {
struct i2c_client *client;
struct dvb_frontend *fe;
u8 chip_ver;
@@ -34,15 +34,15 @@ struct it913x_state {
};
/* read multiple registers */
-static int it913x_rd_regs(struct it913x_state *state,
+static int it913x_rd_regs(struct it913x_dev *dev,
u32 reg, u8 *data, u8 count)
{
int ret;
u8 b[3];
struct i2c_msg msg[2] = {
- { .addr = state->client->addr, .flags = 0,
+ { .addr = dev->client->addr, .flags = 0,
.buf = b, .len = sizeof(b) },
- { .addr = state->client->addr, .flags = I2C_M_RD,
+ { .addr = dev->client->addr, .flags = I2C_M_RD,
.buf = data, .len = count }
};
@@ -50,18 +50,18 @@ static int it913x_rd_regs(struct it913x_state *state,
b[1] = (u8)(reg >> 8) & 0xff;
b[2] = (u8) reg & 0xff;
- ret = i2c_transfer(state->client->adapter, msg, 2);
+ ret = i2c_transfer(dev->client->adapter, msg, 2);
return ret;
}
/* read single register */
-static int it913x_rd_reg(struct it913x_state *state, u32 reg, u8 *val)
+static int it913x_rd_reg(struct it913x_dev *dev, u32 reg, u8 *val)
{
int ret;
u8 b[1];
- ret = it913x_rd_regs(state, reg, &b[0], sizeof(b));
+ ret = it913x_rd_regs(dev, reg, &b[0], sizeof(b));
if (ret < 0)
return -ENODEV;
*val = b[0];
@@ -69,12 +69,12 @@ static int it913x_rd_reg(struct it913x_state *state, u32 reg, u8 *val)
}
/* write multiple registers */
-static int it913x_wr_regs(struct it913x_state *state,
+static int it913x_wr_regs(struct it913x_dev *dev,
u32 reg, u8 buf[], u8 count)
{
u8 b[256];
struct i2c_msg msg[1] = {
- { .addr = state->client->addr, .flags = 0,
+ { .addr = dev->client->addr, .flags = 0,
.buf = b, .len = 3 + count }
};
int ret;
@@ -84,7 +84,7 @@ static int it913x_wr_regs(struct it913x_state *state,
b[2] = (u8) reg & 0xff;
memcpy(&b[3], buf, count);
- ret = i2c_transfer(state->client->adapter, msg, 1);
+ ret = i2c_transfer(dev->client->adapter, msg, 1);
if (ret < 0)
return -EIO;
@@ -93,12 +93,12 @@ static int it913x_wr_regs(struct it913x_state *state,
}
/* write single register */
-static int it913x_wr_reg(struct it913x_state *state,
+static int it913x_wr_reg(struct it913x_dev *dev,
u32 reg, u32 data)
{
int ret;
u8 b[4];
- u8 s;
+ u8 len;
b[0] = data >> 24;
b[1] = (data >> 16) & 0xff;
@@ -106,20 +106,20 @@ static int it913x_wr_reg(struct it913x_state *state,
b[3] = data & 0xff;
/* expand write as needed */
if (data < 0x100)
- s = 3;
+ len = 3;
else if (data < 0x1000)
- s = 2;
+ len = 2;
else if (data < 0x100000)
- s = 1;
+ len = 1;
else
- s = 0;
+ len = 0;
- ret = it913x_wr_regs(state, reg, &b[s], sizeof(b) - s);
+ ret = it913x_wr_regs(dev, reg, &b[len], sizeof(b) - len);
return ret;
}
-static int it913x_script_loader(struct it913x_state *state,
+static int it913x_script_loader(struct it913x_dev *dev,
struct it913xset *loadscript)
{
int ret, i;
@@ -130,7 +130,7 @@ static int it913x_script_loader(struct it913x_state *state,
for (i = 0; i < 1000; ++i) {
if (loadscript[i].address == 0x000000)
break;
- ret = it913x_wr_regs(state,
+ ret = it913x_wr_regs(dev,
loadscript[i].address,
loadscript[i].reg, loadscript[i].count);
if (ret < 0)
@@ -141,31 +141,31 @@ static int it913x_script_loader(struct it913x_state *state,
static int it913x_init(struct dvb_frontend *fe)
{
- struct it913x_state *state = fe->tuner_priv;
+ struct it913x_dev *dev = fe->tuner_priv;
int ret, i;
u8 reg = 0;
u8 val, nv_val;
u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
u8 b[2];
- ret = it913x_rd_reg(state, 0x80ec86, ®);
+ ret = it913x_rd_reg(dev, 0x80ec86, ®);
switch (reg) {
case 0:
- state->tun_clk_mode = reg;
- state->tun_xtal = 2000;
- state->tun_fdiv = 3;
+ dev->tun_clk_mode = reg;
+ dev->tun_xtal = 2000;
+ dev->tun_fdiv = 3;
val = 16;
break;
case 1:
default: /* I/O error too */
- state->tun_clk_mode = reg;
- state->tun_xtal = 640;
- state->tun_fdiv = 1;
+ dev->tun_clk_mode = reg;
+ dev->tun_xtal = 640;
+ dev->tun_fdiv = 1;
val = 6;
break;
}
- ret = it913x_rd_reg(state, 0x80ed03, ®);
+ ret = it913x_rd_reg(dev, 0x80ed03, ®);
if (reg < 0)
return -ENODEV;
@@ -175,7 +175,7 @@ static int it913x_init(struct dvb_frontend *fe)
nv_val = 2;
for (i = 0; i < 50; i++) {
- ret = it913x_rd_regs(state, 0x80ed23, &b[0], sizeof(b));
+ ret = it913x_rd_regs(dev, 0x80ed23, &b[0], sizeof(b));
reg = (b[1] << 8) + b[0];
if (reg > 0)
break;
@@ -183,15 +183,15 @@ static int it913x_init(struct dvb_frontend *fe)
return -ENODEV;
udelay(2000);
}
- state->tun_fn_min = state->tun_xtal * reg;
- state->tun_fn_min /= (state->tun_fdiv * nv_val);
- dev_dbg(&state->client->dev, "Tuner fn_min %d\n", state->tun_fn_min);
+ dev->tun_fn_min = dev->tun_xtal * reg;
+ dev->tun_fn_min /= (dev->tun_fdiv * nv_val);
+ dev_dbg(&dev->client->dev, "Tuner fn_min %d\n", dev->tun_fn_min);
- if (state->chip_ver > 1)
+ if (dev->chip_ver > 1)
msleep(50);
else {
for (i = 0; i < 50; i++) {
- ret = it913x_rd_reg(state, 0x80ec82, ®);
+ ret = it913x_rd_reg(dev, 0x80ec82, ®);
if (ret < 0)
return -ENODEV;
if (reg > 0)
@@ -201,16 +201,16 @@ static int it913x_init(struct dvb_frontend *fe)
}
/* Power Up Tuner - common all versions */
- ret = it913x_wr_reg(state, 0x80ec40, 0x1);
- ret |= it913x_wr_reg(state, 0x80ec57, 0x0);
- ret |= it913x_wr_reg(state, 0x80ec58, 0x0);
+ ret = it913x_wr_reg(dev, 0x80ec40, 0x1);
+ ret |= it913x_wr_reg(dev, 0x80ec57, 0x0);
+ ret |= it913x_wr_reg(dev, 0x80ec58, 0x0);
- return it913x_wr_reg(state, 0x80ed81, val);
+ return it913x_wr_reg(dev, 0x80ed81, val);
}
static int it9137_set_params(struct dvb_frontend *fe)
{
- struct it913x_state *state = fe->tuner_priv;
+ struct it913x_dev *dev = fe->tuner_priv;
struct it913xset *set_tuner = set_it9137_template;
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
u32 bandwidth = p->bandwidth_hz;
@@ -226,12 +226,12 @@ static int it9137_set_params(struct dvb_frontend *fe)
u8 lna_band;
u8 bw;
- if (state->firmware_ver == 1)
+ if (dev->firmware_ver == 1)
set_tuner = set_it9135_template;
else
set_tuner = set_it9137_template;
- dev_dbg(&state->client->dev, "Tuner Frequency %d Bandwidth %d\n",
+ dev_dbg(&dev->client->dev, "Tuner Frequency %d Bandwidth %d\n",
frequency, bandwidth);
if (frequency >= 51000 && frequency <= 440000) {
@@ -305,10 +305,10 @@ static int it9137_set_params(struct dvb_frontend *fe)
} else if (frequency > 296000 && frequency <= 445000) {
n_div = 8;
n = 5;
- } else if (frequency > 445000 && frequency <= state->tun_fn_min) {
+ } else if (frequency > 445000 && frequency <= dev->tun_fn_min) {
n_div = 6;
n = 6;
- } else if (frequency > state->tun_fn_min && frequency <= 950000) {
+ } else if (frequency > dev->tun_fn_min && frequency <= 950000) {
n_div = 4;
n = 7;
} else if (frequency > 1450000 && frequency <= 1680000) {
@@ -317,27 +317,27 @@ static int it9137_set_params(struct dvb_frontend *fe)
} else
return -EINVAL;
- ret = it913x_rd_reg(state, 0x80ed81, ®);
+ ret = it913x_rd_reg(dev, 0x80ed81, ®);
iqik_m_cal = (u16)reg * n_div;
if (reg < 0x20) {
- if (state->tun_clk_mode == 0)
+ if (dev->tun_clk_mode == 0)
iqik_m_cal = (iqik_m_cal * 9) >> 5;
else
iqik_m_cal >>= 1;
} else {
iqik_m_cal = 0x40 - iqik_m_cal;
- if (state->tun_clk_mode == 0)
+ if (dev->tun_clk_mode == 0)
iqik_m_cal = ~((iqik_m_cal * 9) >> 5);
else
iqik_m_cal = ~(iqik_m_cal >> 1);
}
- temp_f = frequency * (u32)n_div * (u32)state->tun_fdiv;
- freq = temp_f / state->tun_xtal;
- tmp = freq * state->tun_xtal;
+ temp_f = frequency * (u32)n_div * (u32)dev->tun_fdiv;
+ freq = temp_f / dev->tun_xtal;
+ tmp = freq * dev->tun_xtal;
- if ((temp_f - tmp) >= (state->tun_xtal >> 1))
+ if ((temp_f - tmp) >= (dev->tun_xtal >> 1))
freq++;
freq += (u32) n << 13;
@@ -347,15 +347,15 @@ static int it9137_set_params(struct dvb_frontend *fe)
set_tuner[3].reg[0] = temp_f & 0xff;
set_tuner[4].reg[0] = (temp_f >> 8) & 0xff;
- dev_dbg(&state->client->dev, "High Frequency = %04x\n", temp_f);
+ dev_dbg(&dev->client->dev, "High Frequency = %04x\n", temp_f);
/* Lower frequency */
set_tuner[5].reg[0] = freq & 0xff;
set_tuner[6].reg[0] = (freq >> 8) & 0xff;
- dev_dbg(&state->client->dev, "low Frequency = %04x\n", freq);
+ dev_dbg(&dev->client->dev, "low Frequency = %04x\n", freq);
- ret = it913x_script_loader(state, set_tuner);
+ ret = it913x_script_loader(dev, set_tuner);
return (ret < 0) ? -ENODEV : 0;
}
@@ -366,12 +366,12 @@ static int it9137_set_params(struct dvb_frontend *fe)
static int it913x_sleep(struct dvb_frontend *fe)
{
- struct it913x_state *state = fe->tuner_priv;
+ struct it913x_dev *dev = fe->tuner_priv;
- if (state->chip_ver == 0x01)
- return it913x_script_loader(state, it9135ax_tuner_off);
+ if (dev->chip_ver == 0x01)
+ return it913x_script_loader(dev, it9135ax_tuner_off);
else
- return it913x_script_loader(state, it9137_tuner_off);
+ return it913x_script_loader(dev, it9137_tuner_off);
}
static const struct dvb_tuner_ops it913x_tuner_ops = {
@@ -391,60 +391,60 @@ static int it913x_probe(struct i2c_client *client,
{
struct it913x_config *cfg = client->dev.platform_data;
struct dvb_frontend *fe = cfg->fe;
- struct it913x_state *state;
+ struct it913x_dev *dev;
int ret;
char *chip_ver_str;
- state = kzalloc(sizeof(struct it913x_state), GFP_KERNEL);
- if (state == NULL) {
+ dev = kzalloc(sizeof(struct it913x_dev), GFP_KERNEL);
+ if (dev == NULL) {
ret = -ENOMEM;
dev_err(&client->dev, "kzalloc() failed\n");
goto err;
}
- state->client = client;
- state->fe = cfg->fe;
- state->chip_ver = cfg->chip_ver;
- state->firmware_ver = 1;
+ dev->client = client;
+ dev->fe = cfg->fe;
+ dev->chip_ver = cfg->chip_ver;
+ dev->firmware_ver = 1;
/* tuner RF initial */
- ret = it913x_wr_reg(state, 0x80ec4c, 0x68);
+ ret = it913x_wr_reg(dev, 0x80ec4c, 0x68);
if (ret < 0)
goto err;
- fe->tuner_priv = state;
+ fe->tuner_priv = dev;
memcpy(&fe->ops.tuner_ops, &it913x_tuner_ops,
sizeof(struct dvb_tuner_ops));
- i2c_set_clientdata(client, state);
+ i2c_set_clientdata(client, dev);
- if (state->chip_ver == 1)
+ if (dev->chip_ver == 1)
chip_ver_str = "AX";
- else if (state->chip_ver == 2)
+ else if (dev->chip_ver == 2)
chip_ver_str = "BX";
else
chip_ver_str = "??";
- dev_info(&state->client->dev, "ITE IT913X %s successfully attached\n",
+ dev_info(&dev->client->dev, "ITE IT913X %s successfully attached\n",
chip_ver_str);
- dev_dbg(&state->client->dev, "chip_ver=%02x\n", state->chip_ver);
+ dev_dbg(&dev->client->dev, "chip_ver=%02x\n", dev->chip_ver);
return 0;
err:
dev_dbg(&client->dev, "failed %d\n", ret);
- kfree(state);
+ kfree(dev);
return ret;
}
static int it913x_remove(struct i2c_client *client)
{
- struct it913x_state *state = i2c_get_clientdata(client);
- struct dvb_frontend *fe = state->fe;
+ struct it913x_dev *dev = i2c_get_clientdata(client);
+ struct dvb_frontend *fe = dev->fe;
dev_dbg(&client->dev, "\n");
memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
fe->tuner_priv = NULL;
- kfree(state);
+ kfree(dev);
return 0;
}
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 16/37] it913x: convert to RegMap API
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (13 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 15/37] it913x: rename 'state' to 'dev' Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 17/37] it913x: re-implement sleep Antti Palosaari
` (20 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Use RegMap API to cover I2C register access routines.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/Kconfig | 1 +
drivers/media/tuners/it913x.c | 137 +++++++++----------------------------
drivers/media/tuners/it913x_priv.h | 1 +
3 files changed, 34 insertions(+), 105 deletions(-)
diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig
index d79fd1c..ca42da8 100644
--- a/drivers/media/tuners/Kconfig
+++ b/drivers/media/tuners/Kconfig
@@ -247,6 +247,7 @@ config MEDIA_TUNER_SI2157
config MEDIA_TUNER_IT913X
tristate "ITE Tech IT913x silicon tuner"
depends on MEDIA_SUPPORT && I2C
+ select REGMAP_I2C
default m if !MEDIA_SUBDRV_AUTOSELECT
help
ITE Tech IT913x silicon tuner driver.
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index cc959c1..f3e212c 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -24,6 +24,7 @@
struct it913x_dev {
struct i2c_client *client;
+ struct regmap *regmap;
struct dvb_frontend *fe;
u8 chip_ver;
u8 firmware_ver;
@@ -33,92 +34,6 @@ struct it913x_dev {
u32 tun_fn_min;
};
-/* read multiple registers */
-static int it913x_rd_regs(struct it913x_dev *dev,
- u32 reg, u8 *data, u8 count)
-{
- int ret;
- u8 b[3];
- struct i2c_msg msg[2] = {
- { .addr = dev->client->addr, .flags = 0,
- .buf = b, .len = sizeof(b) },
- { .addr = dev->client->addr, .flags = I2C_M_RD,
- .buf = data, .len = count }
- };
-
- b[0] = (u8)(reg >> 16) & 0xff;
- b[1] = (u8)(reg >> 8) & 0xff;
- b[2] = (u8) reg & 0xff;
-
- ret = i2c_transfer(dev->client->adapter, msg, 2);
-
- return ret;
-}
-
-/* read single register */
-static int it913x_rd_reg(struct it913x_dev *dev, u32 reg, u8 *val)
-{
- int ret;
- u8 b[1];
-
- ret = it913x_rd_regs(dev, reg, &b[0], sizeof(b));
- if (ret < 0)
- return -ENODEV;
- *val = b[0];
- return 0;
-}
-
-/* write multiple registers */
-static int it913x_wr_regs(struct it913x_dev *dev,
- u32 reg, u8 buf[], u8 count)
-{
- u8 b[256];
- struct i2c_msg msg[1] = {
- { .addr = dev->client->addr, .flags = 0,
- .buf = b, .len = 3 + count }
- };
- int ret;
-
- b[0] = (u8)(reg >> 16) & 0xff;
- b[1] = (u8)(reg >> 8) & 0xff;
- b[2] = (u8) reg & 0xff;
- memcpy(&b[3], buf, count);
-
- ret = i2c_transfer(dev->client->adapter, msg, 1);
-
- if (ret < 0)
- return -EIO;
-
- return 0;
-}
-
-/* write single register */
-static int it913x_wr_reg(struct it913x_dev *dev,
- u32 reg, u32 data)
-{
- int ret;
- u8 b[4];
- u8 len;
-
- b[0] = data >> 24;
- b[1] = (data >> 16) & 0xff;
- b[2] = (data >> 8) & 0xff;
- b[3] = data & 0xff;
- /* expand write as needed */
- if (data < 0x100)
- len = 3;
- else if (data < 0x1000)
- len = 2;
- else if (data < 0x100000)
- len = 1;
- else
- len = 0;
-
- ret = it913x_wr_regs(dev, reg, &b[len], sizeof(b) - len);
-
- return ret;
-}
-
static int it913x_script_loader(struct it913x_dev *dev,
struct it913xset *loadscript)
{
@@ -130,8 +45,7 @@ static int it913x_script_loader(struct it913x_dev *dev,
for (i = 0; i < 1000; ++i) {
if (loadscript[i].address == 0x000000)
break;
- ret = it913x_wr_regs(dev,
- loadscript[i].address,
+ ret = regmap_bulk_write(dev->regmap, loadscript[i].address,
loadscript[i].reg, loadscript[i].count);
if (ret < 0)
return -ENODEV;
@@ -143,12 +57,12 @@ static int it913x_init(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
int ret, i;
- u8 reg = 0;
+ unsigned int reg;
u8 val, nv_val;
u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
u8 b[2];
- ret = it913x_rd_reg(dev, 0x80ec86, ®);
+ ret = regmap_read(dev->regmap, 0x80ec86, ®);
switch (reg) {
case 0:
dev->tun_clk_mode = reg;
@@ -165,7 +79,7 @@ static int it913x_init(struct dvb_frontend *fe)
break;
}
- ret = it913x_rd_reg(dev, 0x80ed03, ®);
+ ret = regmap_read(dev->regmap, 0x80ed03, ®);
if (reg < 0)
return -ENODEV;
@@ -175,11 +89,11 @@ static int it913x_init(struct dvb_frontend *fe)
nv_val = 2;
for (i = 0; i < 50; i++) {
- ret = it913x_rd_regs(dev, 0x80ed23, &b[0], sizeof(b));
+ ret = regmap_bulk_read(dev->regmap, 0x80ed23, &b[0], sizeof(b));
reg = (b[1] << 8) + b[0];
if (reg > 0)
break;
- if (ret < 0)
+ if (ret)
return -ENODEV;
udelay(2000);
}
@@ -191,7 +105,7 @@ static int it913x_init(struct dvb_frontend *fe)
msleep(50);
else {
for (i = 0; i < 50; i++) {
- ret = it913x_rd_reg(dev, 0x80ec82, ®);
+ ret = regmap_read(dev->regmap, 0x80ec82, ®);
if (ret < 0)
return -ENODEV;
if (reg > 0)
@@ -201,11 +115,11 @@ static int it913x_init(struct dvb_frontend *fe)
}
/* Power Up Tuner - common all versions */
- ret = it913x_wr_reg(dev, 0x80ec40, 0x1);
- ret |= it913x_wr_reg(dev, 0x80ec57, 0x0);
- ret |= it913x_wr_reg(dev, 0x80ec58, 0x0);
+ ret = regmap_write(dev->regmap, 0x80ec40, 0x1);
+ ret |= regmap_write(dev->regmap, 0x80ec57, 0x0);
+ ret |= regmap_write(dev->regmap, 0x80ec58, 0x0);
- return it913x_wr_reg(dev, 0x80ed81, val);
+ return regmap_write(dev->regmap, 0x80ed81, val);
}
static int it9137_set_params(struct dvb_frontend *fe)
@@ -216,7 +130,7 @@ static int it9137_set_params(struct dvb_frontend *fe)
u32 bandwidth = p->bandwidth_hz;
u32 frequency_m = p->frequency;
int ret;
- u8 reg = 0;
+ unsigned int reg;
u32 frequency = frequency_m / 1000;
u32 freq, temp_f, tmp;
u16 iqik_m_cal;
@@ -317,7 +231,7 @@ static int it9137_set_params(struct dvb_frontend *fe)
} else
return -EINVAL;
- ret = it913x_rd_reg(dev, 0x80ed81, ®);
+ ret = regmap_read(dev->regmap, 0x80ed81, ®);
iqik_m_cal = (u16)reg * n_div;
if (reg < 0x20) {
@@ -394,6 +308,10 @@ static int it913x_probe(struct i2c_client *client,
struct it913x_dev *dev;
int ret;
char *chip_ver_str;
+ static const struct regmap_config regmap_config = {
+ .reg_bits = 24,
+ .val_bits = 8,
+ };
dev = kzalloc(sizeof(struct it913x_dev), GFP_KERNEL);
if (dev == NULL) {
@@ -406,11 +324,16 @@ static int it913x_probe(struct i2c_client *client,
dev->fe = cfg->fe;
dev->chip_ver = cfg->chip_ver;
dev->firmware_ver = 1;
+ dev->regmap = regmap_init_i2c(client, ®map_config);
+ if (IS_ERR(dev->regmap)) {
+ ret = PTR_ERR(dev->regmap);
+ goto err_kfree;
+ }
/* tuner RF initial */
- ret = it913x_wr_reg(dev, 0x80ec4c, 0x68);
- if (ret < 0)
- goto err;
+ ret = regmap_write(dev->regmap, 0x80ec4c, 0x68);
+ if (ret)
+ goto err_regmap_exit;
fe->tuner_priv = dev;
memcpy(&fe->ops.tuner_ops, &it913x_tuner_ops,
@@ -428,10 +351,13 @@ static int it913x_probe(struct i2c_client *client,
chip_ver_str);
dev_dbg(&dev->client->dev, "chip_ver=%02x\n", dev->chip_ver);
return 0;
+
+err_regmap_exit:
+ regmap_exit(dev->regmap);
+err_kfree:
+ kfree(dev);
err:
dev_dbg(&client->dev, "failed %d\n", ret);
- kfree(dev);
-
return ret;
}
@@ -444,6 +370,7 @@ static int it913x_remove(struct i2c_client *client)
memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
fe->tuner_priv = NULL;
+ regmap_exit(dev->regmap);
kfree(dev);
return 0;
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index 32af24c..3ed2d3c 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -24,6 +24,7 @@
#define IT913X_PRIV_H
#include "it913x.h"
+#include <linux/regmap.h>
#define TRIGGER_OFSM 0x0000
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 17/37] it913x: re-implement sleep
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (14 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 16/37] it913x: convert to RegMap API Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 18/37] it913x: remove dead code Antti Palosaari
` (19 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Re-implement sleep. Based USB sniffs taken from the latest Hauppauge
windows driver version 07/10/2014, 14.6.23.32191.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 76 +++++++++++++++++++++++++++--------
drivers/media/tuners/it913x.h | 10 ++++-
drivers/media/tuners/it913x_priv.h | 27 -------------
drivers/media/usb/dvb-usb-v2/af9035.c | 14 +++++++
4 files changed, 83 insertions(+), 44 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index f3e212c..11d391a 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -26,7 +26,8 @@ struct it913x_dev {
struct i2c_client *client;
struct regmap *regmap;
struct dvb_frontend *fe;
- u8 chip_ver;
+ u8 chip_ver:2;
+ u8 role:2;
u8 firmware_ver;
u16 tun_xtal;
u8 tun_fdiv;
@@ -122,6 +123,62 @@ static int it913x_init(struct dvb_frontend *fe)
return regmap_write(dev->regmap, 0x80ed81, val);
}
+static int it913x_sleep(struct dvb_frontend *fe)
+{
+ struct it913x_dev *dev = fe->tuner_priv;
+ int ret, len;
+
+ dev_dbg(&dev->client->dev, "role=%u\n", dev->role);
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec40, "\x00", 1);
+ if (ret)
+ goto err;
+
+ /*
+ * Writing '0x00' to master tuner register '0x80ec08' causes slave tuner
+ * communication lost. Due to that, we cannot put master full sleep.
+ */
+ if (dev->role == IT913X_ROLE_DUAL_MASTER)
+ len = 4;
+ else
+ len = 15;
+
+ dev_dbg(&dev->client->dev, "role=%u len=%d\n", dev->role, len);
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec02,
+ "\x3f\x1f\x3f\x3e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+ len);
+ if (ret)
+ goto err;
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec12, "\x00\x00\x00\x00", 4);
+ if (ret)
+ goto err;
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec17,
+ "\x00\x00\x00\x00\x00\x00\x00\x00\x00", 9);
+ if (ret)
+ goto err;
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec22,
+ "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 10);
+ if (ret)
+ goto err;
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec20, "\x00", 1);
+ if (ret)
+ goto err;
+
+ ret = regmap_bulk_write(dev->regmap, 0x80ec3f, "\x01", 1);
+ if (ret)
+ goto err;
+
+ return 0;
+err:
+ dev_dbg(&dev->client->dev, "failed %d\n", ret);
+ return ret;
+}
+
static int it9137_set_params(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
@@ -274,20 +331,6 @@ static int it9137_set_params(struct dvb_frontend *fe)
return (ret < 0) ? -ENODEV : 0;
}
-/* Power sequence */
-/* Power Up Tuner on -> Frontend suspend off -> Tuner clk on */
-/* Power Down Frontend suspend on -> Tuner clk off -> Tuner off */
-
-static int it913x_sleep(struct dvb_frontend *fe)
-{
- struct it913x_dev *dev = fe->tuner_priv;
-
- if (dev->chip_ver == 0x01)
- return it913x_script_loader(dev, it9135ax_tuner_off);
- else
- return it913x_script_loader(dev, it9137_tuner_off);
-}
-
static const struct dvb_tuner_ops it913x_tuner_ops = {
.info = {
.name = "ITE Tech IT913X",
@@ -323,6 +366,7 @@ static int it913x_probe(struct i2c_client *client,
dev->client = client;
dev->fe = cfg->fe;
dev->chip_ver = cfg->chip_ver;
+ dev->role = cfg->role;
dev->firmware_ver = 1;
dev->regmap = regmap_init_i2c(client, ®map_config);
if (IS_ERR(dev->regmap)) {
@@ -349,7 +393,7 @@ static int it913x_probe(struct i2c_client *client,
dev_info(&dev->client->dev, "ITE IT913X %s successfully attached\n",
chip_ver_str);
- dev_dbg(&dev->client->dev, "chip_ver=%02x\n", dev->chip_ver);
+ dev_dbg(&dev->client->dev, "chip_ver=%u role=%u\n", dev->chip_ver, dev->role);
return 0;
err_regmap_exit:
diff --git a/drivers/media/tuners/it913x.h b/drivers/media/tuners/it913x.h
index 9789c4d..33de53d 100644
--- a/drivers/media/tuners/it913x.h
+++ b/drivers/media/tuners/it913x.h
@@ -40,7 +40,15 @@ struct it913x_config {
* 1 = IT9135 AX
* 2 = IT9135 BX
*/
- u8 chip_ver:2;
+ unsigned int chip_ver:2;
+
+ /*
+ * tuner role
+ */
+#define IT913X_ROLE_SINGLE 0
+#define IT913X_ROLE_DUAL_MASTER 1
+#define IT913X_ROLE_DUAL_SLAVE 2
+ unsigned int role:2;
};
#endif
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index 3ed2d3c..41f9b2a 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -33,33 +33,6 @@ struct it913xset { u32 address;
u8 count;
};
-/* Tuner setting scripts for IT9135 AX */
-static struct it913xset it9135ax_tuner_off[] = {
- {0x80ec40, {0x00}, 0x01}, /* Power Down Tuner */
- {0x80ec02, {0x3f}, 0x01},
- {0x80ec03, {0x1f}, 0x01},
- {0x80ec04, {0x3f}, 0x01},
- {0x80ec05, {0x3f}, 0x01},
- {0x80ec3f, {0x01}, 0x01},
- {0x000000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
-/* Tuner setting scripts (still keeping it9137) */
-static struct it913xset it9137_tuner_off[] = {
- {0x80ec40, {0x00}, 0x01}, /* Power Down Tuner */
- {0x80ec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},
- {0x80ec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00}, 0x0c},
- {0x80ec12, {0x00, 0x00, 0x00, 0x00}, 0x04},
- {0x80ec17, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00}, 0x09},
- {0x80ec22, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00}, 0x0a},
- {0x80ec20, {0x00}, 0x01},
- {0x80ec3f, {0x01}, 0x01},
- {0x000000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
static struct it913xset set_it9135_template[] = {
{0x80ee06, {0x00}, 0x01},
{0x80ec56, {0x00}, 0x01},
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 1a5b600..533c96e 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1324,6 +1324,13 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
.chip_ver = 1,
};
+ if (state->dual_mode) {
+ if (adap->id == 0)
+ it913x_config.role = IT913X_ROLE_DUAL_MASTER;
+ else
+ it913x_config.role = IT913X_ROLE_DUAL_SLAVE;
+ }
+
ret = af9035_add_i2c_dev(d, "it913x",
state->af9033_config[adap->id].i2c_addr,
&it913x_config);
@@ -1342,6 +1349,13 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
.chip_ver = 2,
};
+ if (state->dual_mode) {
+ if (adap->id == 0)
+ it913x_config.role = IT913X_ROLE_DUAL_MASTER;
+ else
+ it913x_config.role = IT913X_ROLE_DUAL_SLAVE;
+ }
+
ret = af9035_add_i2c_dev(d, "it913x",
state->af9033_config[adap->id].i2c_addr,
&it913x_config);
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 18/37] it913x: remove dead code
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (15 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 17/37] it913x: re-implement sleep Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 19/37] it913x: get rid of script loader and and private header file Antti Palosaari
` (18 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Remove unused tuner set template.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 9 +--------
drivers/media/tuners/it913x_priv.h | 11 -----------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 11d391a..ab386bf 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -28,7 +28,6 @@ struct it913x_dev {
struct dvb_frontend *fe;
u8 chip_ver:2;
u8 role:2;
- u8 firmware_ver;
u16 tun_xtal;
u8 tun_fdiv;
u8 tun_clk_mode;
@@ -182,7 +181,7 @@ err:
static int it9137_set_params(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
- struct it913xset *set_tuner = set_it9137_template;
+ struct it913xset *set_tuner = set_it9135_template;
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
u32 bandwidth = p->bandwidth_hz;
u32 frequency_m = p->frequency;
@@ -197,11 +196,6 @@ static int it9137_set_params(struct dvb_frontend *fe)
u8 lna_band;
u8 bw;
- if (dev->firmware_ver == 1)
- set_tuner = set_it9135_template;
- else
- set_tuner = set_it9137_template;
-
dev_dbg(&dev->client->dev, "Tuner Frequency %d Bandwidth %d\n",
frequency, bandwidth);
@@ -367,7 +361,6 @@ static int it913x_probe(struct i2c_client *client,
dev->fe = cfg->fe;
dev->chip_ver = cfg->chip_ver;
dev->role = cfg->role;
- dev->firmware_ver = 1;
dev->regmap = regmap_init_i2c(client, ®map_config);
if (IS_ERR(dev->regmap)) {
ret = PTR_ERR(dev->regmap);
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index 41f9b2a..a6ddd02 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -44,15 +44,4 @@ static struct it913xset set_it9135_template[] = {
{0x000000, {0x00}, 0x00}, /* Terminating Entry */
};
-static struct it913xset set_it9137_template[] = {
- {0x80ee06, {0x00}, 0x01},
- {0x80ec56, {0x00}, 0x01},
- {0x80ec4c, {0x00}, 0x01},
- {0x80ec4d, {0x00}, 0x01},
- {0x80ec4e, {0x00}, 0x01},
- {0x80ec4f, {0x00}, 0x01},
- {0x80ec50, {0x00}, 0x01},
- {0x000000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
#endif
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 19/37] it913x: get rid of script loader and and private header file
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (16 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 18/37] it913x: remove dead code Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 20/37] it913x: refactor code largely Antti Palosaari
` (17 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Used script loader is quite useless and hides register numbers
making code hard to understand. Get rid of it and use standard
RegMap register write functions directly.
it913x_priv.h file leaves empty after that change and is also
removed.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 63 +++++++++++++++++++-------------------
drivers/media/tuners/it913x_priv.h | 47 ----------------------------
2 files changed, 31 insertions(+), 79 deletions(-)
delete mode 100644 drivers/media/tuners/it913x_priv.h
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index ab386bf..924f18d 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -20,7 +20,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
*/
-#include "it913x_priv.h"
+#include "it913x.h"
+#include <linux/regmap.h>
struct it913x_dev {
struct i2c_client *client;
@@ -34,25 +35,6 @@ struct it913x_dev {
u32 tun_fn_min;
};
-static int it913x_script_loader(struct it913x_dev *dev,
- struct it913xset *loadscript)
-{
- int ret, i;
-
- if (loadscript == NULL)
- return -EINVAL;
-
- for (i = 0; i < 1000; ++i) {
- if (loadscript[i].address == 0x000000)
- break;
- ret = regmap_bulk_write(dev->regmap, loadscript[i].address,
- loadscript[i].reg, loadscript[i].count);
- if (ret < 0)
- return -ENODEV;
- }
- return 0;
-}
-
static int it913x_init(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
@@ -181,7 +163,6 @@ err:
static int it9137_set_params(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
- struct it913xset *set_tuner = set_it9135_template;
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
u32 bandwidth = p->bandwidth_hz;
u32 frequency_m = p->frequency;
@@ -231,7 +212,10 @@ static int it9137_set_params(struct dvb_frontend *fe)
lna_band = 1;
} else
return -EINVAL;
- set_tuner[0].reg[0] = lna_band;
+
+ ret = regmap_write(dev->regmap, 0x80ee06, lna_band);
+ if (ret)
+ goto err;
switch (bandwidth) {
case 5000000:
@@ -249,8 +233,13 @@ static int it9137_set_params(struct dvb_frontend *fe)
break;
}
- set_tuner[1].reg[0] = bw;
- set_tuner[2].reg[0] = 0xa0 | (l_band << 3);
+ ret = regmap_write(dev->regmap, 0x80ec56, bw);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(dev->regmap, 0x80ec4c, 0xa0 | (l_band << 3));
+ if (ret)
+ goto err;
if (frequency > 53000 && frequency <= 74000) {
n_div = 48;
@@ -309,20 +298,30 @@ static int it9137_set_params(struct dvb_frontend *fe)
/* Frequency OMEGA_IQIK_M_CAL_MID*/
temp_f = freq + (u32)iqik_m_cal;
- set_tuner[3].reg[0] = temp_f & 0xff;
- set_tuner[4].reg[0] = (temp_f >> 8) & 0xff;
+ ret = regmap_write(dev->regmap, 0x80ec4d, temp_f & 0xff);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(dev->regmap, 0x80ec4e, (temp_f >> 8) & 0xff);
+ if (ret)
+ goto err;
dev_dbg(&dev->client->dev, "High Frequency = %04x\n", temp_f);
/* Lower frequency */
- set_tuner[5].reg[0] = freq & 0xff;
- set_tuner[6].reg[0] = (freq >> 8) & 0xff;
-
- dev_dbg(&dev->client->dev, "low Frequency = %04x\n", freq);
+ ret = regmap_write(dev->regmap, 0x80011e, freq & 0xff);
+ if (ret)
+ goto err;
- ret = it913x_script_loader(dev, set_tuner);
+ ret = regmap_write(dev->regmap, 0x80011f, (freq >> 8) & 0xff);
+ if (ret)
+ goto err;
- return (ret < 0) ? -ENODEV : 0;
+ dev_dbg(&dev->client->dev, "low Frequency = %04x\n", freq);
+ return 0;
+err:
+ dev_dbg(&dev->client->dev, "failed %d\n", ret);
+ return ret;
}
static const struct dvb_tuner_ops it913x_tuner_ops = {
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
deleted file mode 100644
index a6ddd02..0000000
--- a/drivers/media/tuners/it913x_priv.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ITE Tech IT9137 silicon tuner driver
- *
- * Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
- * IT9137 Copyright (C) ITE Tech Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
- */
-
-#ifndef IT913X_PRIV_H
-#define IT913X_PRIV_H
-
-#include "it913x.h"
-#include <linux/regmap.h>
-
-#define TRIGGER_OFSM 0x0000
-
-struct it913xset { u32 address;
- u8 reg[15];
- u8 count;
-};
-
-static struct it913xset set_it9135_template[] = {
- {0x80ee06, {0x00}, 0x01},
- {0x80ec56, {0x00}, 0x01},
- {0x80ec4c, {0x00}, 0x01},
- {0x80ec4d, {0x00}, 0x01},
- {0x80ec4e, {0x00}, 0x01},
- {0x80011e, {0x00}, 0x01}, /* Older Devices */
- {0x80011f, {0x00}, 0x01},
- {0x000000, {0x00}, 0x00}, /* Terminating Entry */
-};
-
-#endif
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 20/37] it913x: refactor code largely
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (17 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 19/37] it913x: get rid of script loader and and private header file Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 21/37] it913x: replace udelay polling with jiffies Antti Palosaari
` (16 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Refactor code largely in order to satisfy me. Try to keep order of
register read/write same as windows driver does as it makes
comparing sniffs easier.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 356 +++++++++++++++++++++++-------------------
1 file changed, 194 insertions(+), 162 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 924f18d..098e9d5 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -1,5 +1,5 @@
/*
- * ITE Tech IT9137 silicon tuner driver
+ * ITE IT913X silicon tuner driver
*
* Copyright (C) 2011 Malcolm Priestley (tvboxspy@gmail.com)
* IT9137 Copyright (C) ITE Tech Inc.
@@ -29,79 +29,120 @@ struct it913x_dev {
struct dvb_frontend *fe;
u8 chip_ver:2;
u8 role:2;
- u16 tun_xtal;
- u8 tun_fdiv;
- u8 tun_clk_mode;
- u32 tun_fn_min;
+ u16 xtal;
+ u8 fdiv;
+ u8 clk_mode;
+ u32 fn_min;
+ bool active;
};
static int it913x_init(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
int ret, i;
- unsigned int reg;
- u8 val, nv_val;
- u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
- u8 b[2];
+ unsigned int utmp;
+ u8 iqik_m_cal, nv_val, buf[2];
+ static const u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
- ret = regmap_read(dev->regmap, 0x80ec86, ®);
- switch (reg) {
+ dev_dbg(&dev->client->dev, "role %u\n", dev->role);
+
+ ret = regmap_write(dev->regmap, 0x80ec4c, 0x68);
+ if (ret)
+ goto err;
+
+ usleep_range(10000, 100000);
+
+ ret = regmap_read(dev->regmap, 0x80ec86, &utmp);
+ if (ret)
+ goto err;
+
+ switch (utmp) {
case 0:
- dev->tun_clk_mode = reg;
- dev->tun_xtal = 2000;
- dev->tun_fdiv = 3;
- val = 16;
+ /* 12.000 MHz */
+ dev->clk_mode = utmp;
+ dev->xtal = 2000;
+ dev->fdiv = 3;
+ iqik_m_cal = 16;
break;
case 1:
- default: /* I/O error too */
- dev->tun_clk_mode = reg;
- dev->tun_xtal = 640;
- dev->tun_fdiv = 1;
- val = 6;
+ /* 20.480 MHz */
+ dev->clk_mode = utmp;
+ dev->xtal = 640;
+ dev->fdiv = 1;
+ iqik_m_cal = 6;
break;
+ default:
+ dev_err(&dev->client->dev, "unknown clock identifier %d\n", utmp);
+ goto err;
}
- ret = regmap_read(dev->regmap, 0x80ed03, ®);
+ ret = regmap_read(dev->regmap, 0x80ed03, &utmp);
+ if (ret)
+ goto err;
- if (reg < 0)
- return -ENODEV;
- else if (reg < ARRAY_SIZE(nv))
- nv_val = nv[reg];
+ else if (utmp < ARRAY_SIZE(nv))
+ nv_val = nv[utmp];
else
nv_val = 2;
for (i = 0; i < 50; i++) {
- ret = regmap_bulk_read(dev->regmap, 0x80ed23, &b[0], sizeof(b));
- reg = (b[1] << 8) + b[0];
- if (reg > 0)
- break;
+ ret = regmap_bulk_read(dev->regmap, 0x80ed23, buf, 2);
if (ret)
- return -ENODEV;
+ goto err;
+
+ utmp = (buf[1] << 8) | (buf[0] << 0);
+ if (utmp)
+ break;
+
udelay(2000);
}
- dev->tun_fn_min = dev->tun_xtal * reg;
- dev->tun_fn_min /= (dev->tun_fdiv * nv_val);
- dev_dbg(&dev->client->dev, "Tuner fn_min %d\n", dev->tun_fn_min);
- if (dev->chip_ver > 1)
- msleep(50);
- else {
+ dev_dbg(&dev->client->dev, "loop count %d, utmp %d\n", i, utmp);
+
+ dev->fn_min = dev->xtal * utmp;
+ dev->fn_min /= (dev->fdiv * nv_val);
+ dev->fn_min *= 1000;
+ dev_dbg(&dev->client->dev, "fn_min %u\n", dev->fn_min);
+
+ if (dev->chip_ver == 1) {
for (i = 0; i < 50; i++) {
- ret = regmap_read(dev->regmap, 0x80ec82, ®);
- if (ret < 0)
- return -ENODEV;
- if (reg > 0)
+ ret = regmap_read(dev->regmap, 0x80ec82, &utmp);
+ if (ret)
+ goto err;
+
+ if (utmp)
break;
+
udelay(2000);
}
+
+ dev_dbg(&dev->client->dev, "loop count %d\n", i);
+ } else {
+ msleep(50);
}
- /* Power Up Tuner - common all versions */
- ret = regmap_write(dev->regmap, 0x80ec40, 0x1);
- ret |= regmap_write(dev->regmap, 0x80ec57, 0x0);
- ret |= regmap_write(dev->regmap, 0x80ec58, 0x0);
+ ret = regmap_write(dev->regmap, 0x80ed81, iqik_m_cal);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(dev->regmap, 0x80ec57, 0x00);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(dev->regmap, 0x80ec58, 0x00);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(dev->regmap, 0x80ec40, 0x01);
+ if (ret)
+ goto err;
+
+ dev->active = true;
- return regmap_write(dev->regmap, 0x80ed81, val);
+ return 0;
+err:
+ dev_dbg(&dev->client->dev, "failed %d\n", ret);
+ return ret;
}
static int it913x_sleep(struct dvb_frontend *fe)
@@ -109,7 +150,9 @@ static int it913x_sleep(struct dvb_frontend *fe)
struct it913x_dev *dev = fe->tuner_priv;
int ret, len;
- dev_dbg(&dev->client->dev, "role=%u\n", dev->role);
+ dev_dbg(&dev->client->dev, "role %u\n", dev->role);
+
+ dev->active = false;
ret = regmap_bulk_write(dev->regmap, 0x80ec40, "\x00", 1);
if (ret)
@@ -124,7 +167,7 @@ static int it913x_sleep(struct dvb_frontend *fe)
else
len = 15;
- dev_dbg(&dev->client->dev, "role=%u len=%d\n", dev->role, len);
+ dev_dbg(&dev->client->dev, "role %u, len %d\n", dev->role, len);
ret = regmap_bulk_write(dev->regmap, 0x80ec02,
"\x3f\x1f\x3f\x3e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
@@ -160,164 +203,159 @@ err:
return ret;
}
-static int it9137_set_params(struct dvb_frontend *fe)
+static int it913x_set_params(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
- struct dtv_frontend_properties *p = &fe->dtv_property_cache;
- u32 bandwidth = p->bandwidth_hz;
- u32 frequency_m = p->frequency;
+ struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret;
- unsigned int reg;
- u32 frequency = frequency_m / 1000;
- u32 freq, temp_f, tmp;
- u16 iqik_m_cal;
- u16 n_div;
- u8 n;
- u8 l_band;
- u8 lna_band;
- u8 bw;
-
- dev_dbg(&dev->client->dev, "Tuner Frequency %d Bandwidth %d\n",
- frequency, bandwidth);
-
- if (frequency >= 51000 && frequency <= 440000) {
- l_band = 0;
- lna_band = 0;
- } else if (frequency > 440000 && frequency <= 484000) {
- l_band = 1;
- lna_band = 1;
- } else if (frequency > 484000 && frequency <= 533000) {
- l_band = 1;
- lna_band = 2;
- } else if (frequency > 533000 && frequency <= 587000) {
- l_band = 1;
- lna_band = 3;
- } else if (frequency > 587000 && frequency <= 645000) {
- l_band = 1;
- lna_band = 4;
- } else if (frequency > 645000 && frequency <= 710000) {
- l_band = 1;
- lna_band = 5;
- } else if (frequency > 710000 && frequency <= 782000) {
- l_band = 1;
- lna_band = 6;
- } else if (frequency > 782000 && frequency <= 860000) {
- l_band = 1;
- lna_band = 7;
- } else if (frequency > 1450000 && frequency <= 1492000) {
- l_band = 1;
- lna_band = 0;
- } else if (frequency > 1660000 && frequency <= 1685000) {
- l_band = 1;
- lna_band = 1;
- } else
- return -EINVAL;
+ unsigned int utmp;
+ u32 pre_lo_freq, t_cal_freq;
+ u16 iqik_m_cal, n_div;
+ u8 u8tmp, n, l_band, lna_band;
- ret = regmap_write(dev->regmap, 0x80ee06, lna_band);
- if (ret)
- goto err;
-
- switch (bandwidth) {
- case 5000000:
- bw = 0;
- break;
- case 6000000:
- bw = 2;
- break;
- case 7000000:
- bw = 4;
- break;
- default:
- case 8000000:
- bw = 6;
- break;
- }
-
- ret = regmap_write(dev->regmap, 0x80ec56, bw);
- if (ret)
- goto err;
+ dev_dbg(&dev->client->dev, "role=%u, frequency %u, bandwidth_hz %u\n",
+ dev->role, c->frequency, c->bandwidth_hz);
- ret = regmap_write(dev->regmap, 0x80ec4c, 0xa0 | (l_band << 3));
- if (ret)
+ if (!dev->active) {
+ ret = -EINVAL;
goto err;
+ }
- if (frequency > 53000 && frequency <= 74000) {
+ if (c->frequency <= 74000000) {
n_div = 48;
n = 0;
- } else if (frequency > 74000 && frequency <= 111000) {
+ } else if (c->frequency <= 111000000) {
n_div = 32;
n = 1;
- } else if (frequency > 111000 && frequency <= 148000) {
+ } else if (c->frequency <= 148000000) {
n_div = 24;
n = 2;
- } else if (frequency > 148000 && frequency <= 222000) {
+ } else if (c->frequency <= 222000000) {
n_div = 16;
n = 3;
- } else if (frequency > 222000 && frequency <= 296000) {
+ } else if (c->frequency <= 296000000) {
n_div = 12;
n = 4;
- } else if (frequency > 296000 && frequency <= 445000) {
+ } else if (c->frequency <= 445000000) {
n_div = 8;
n = 5;
- } else if (frequency > 445000 && frequency <= dev->tun_fn_min) {
+ } else if (c->frequency <= dev->fn_min) {
n_div = 6;
n = 6;
- } else if (frequency > dev->tun_fn_min && frequency <= 950000) {
+ } else if (c->frequency <= 950000000) {
n_div = 4;
n = 7;
- } else if (frequency > 1450000 && frequency <= 1680000) {
+ } else {
n_div = 2;
n = 0;
- } else
- return -EINVAL;
+ }
+
+ ret = regmap_read(dev->regmap, 0x80ed81, &utmp);
+ if (ret)
+ goto err;
- ret = regmap_read(dev->regmap, 0x80ed81, ®);
- iqik_m_cal = (u16)reg * n_div;
+ iqik_m_cal = utmp * n_div;
- if (reg < 0x20) {
- if (dev->tun_clk_mode == 0)
+ if (utmp < 0x20) {
+ if (dev->clk_mode == 0)
iqik_m_cal = (iqik_m_cal * 9) >> 5;
else
iqik_m_cal >>= 1;
} else {
iqik_m_cal = 0x40 - iqik_m_cal;
- if (dev->tun_clk_mode == 0)
+ if (dev->clk_mode == 0)
iqik_m_cal = ~((iqik_m_cal * 9) >> 5);
else
iqik_m_cal = ~(iqik_m_cal >> 1);
}
- temp_f = frequency * (u32)n_div * (u32)dev->tun_fdiv;
- freq = temp_f / dev->tun_xtal;
- tmp = freq * dev->tun_xtal;
+ t_cal_freq = (c->frequency / 1000) * n_div * dev->fdiv;
+ pre_lo_freq = t_cal_freq / dev->xtal;
+ utmp = pre_lo_freq * dev->xtal;
- if ((temp_f - tmp) >= (dev->tun_xtal >> 1))
- freq++;
+ if ((t_cal_freq - utmp) >= (dev->xtal >> 1))
+ pre_lo_freq++;
- freq += (u32) n << 13;
+ pre_lo_freq += (u32) n << 13;
/* Frequency OMEGA_IQIK_M_CAL_MID*/
- temp_f = freq + (u32)iqik_m_cal;
+ t_cal_freq = pre_lo_freq + (u32)iqik_m_cal;
+ dev_dbg(&dev->client->dev, "t_cal_freq %u, pre_lo_freq %u\n",
+ t_cal_freq, pre_lo_freq);
- ret = regmap_write(dev->regmap, 0x80ec4d, temp_f & 0xff);
+ if (c->frequency <= 440000000) {
+ l_band = 0;
+ lna_band = 0;
+ } else if (c->frequency <= 484000000) {
+ l_band = 1;
+ lna_band = 1;
+ } else if (c->frequency <= 533000000) {
+ l_band = 1;
+ lna_band = 2;
+ } else if (c->frequency <= 587000000) {
+ l_band = 1;
+ lna_band = 3;
+ } else if (c->frequency <= 645000000) {
+ l_band = 1;
+ lna_band = 4;
+ } else if (c->frequency <= 710000000) {
+ l_band = 1;
+ lna_band = 5;
+ } else if (c->frequency <= 782000000) {
+ l_band = 1;
+ lna_band = 6;
+ } else if (c->frequency <= 860000000) {
+ l_band = 1;
+ lna_band = 7;
+ } else if (c->frequency <= 1492000000) {
+ l_band = 1;
+ lna_band = 0;
+ } else if (c->frequency <= 1685000000) {
+ l_band = 1;
+ lna_band = 1;
+ } else {
+ ret = -EINVAL;
+ goto err;
+ }
+
+ /* XXX: latest windows driver does not set that at all */
+ ret = regmap_write(dev->regmap, 0x80ee06, lna_band);
if (ret)
goto err;
- ret = regmap_write(dev->regmap, 0x80ec4e, (temp_f >> 8) & 0xff);
+ if (c->bandwidth_hz <= 5000000)
+ u8tmp = 0;
+ else if (c->bandwidth_hz <= 6000000)
+ u8tmp = 2;
+ else if (c->bandwidth_hz <= 7000000)
+ u8tmp = 4;
+ else
+ u8tmp = 6; /* 8000000 */
+
+ ret = regmap_write(dev->regmap, 0x80ec56, u8tmp);
+ if (ret)
+ goto err;
+
+ /* XXX: latest windows driver sets different value (a8 != 68) */
+ ret = regmap_write(dev->regmap, 0x80ec4c, 0xa0 | (l_band << 3));
if (ret)
goto err;
- dev_dbg(&dev->client->dev, "High Frequency = %04x\n", temp_f);
+ ret = regmap_write(dev->regmap, 0x80ec4d, (t_cal_freq >> 0) & 0xff);
+ if (ret)
+ goto err;
- /* Lower frequency */
- ret = regmap_write(dev->regmap, 0x80011e, freq & 0xff);
+ ret = regmap_write(dev->regmap, 0x80ec4e, (t_cal_freq >> 8) & 0xff);
if (ret)
goto err;
- ret = regmap_write(dev->regmap, 0x80011f, (freq >> 8) & 0xff);
+ ret = regmap_write(dev->regmap, 0x80011e, (pre_lo_freq >> 0) & 0xff);
+ if (ret)
+ goto err;
+
+ ret = regmap_write(dev->regmap, 0x80011f, (pre_lo_freq >> 8) & 0xff);
if (ret)
goto err;
- dev_dbg(&dev->client->dev, "low Frequency = %04x\n", freq);
return 0;
err:
dev_dbg(&dev->client->dev, "failed %d\n", ret);
@@ -326,14 +364,14 @@ err:
static const struct dvb_tuner_ops it913x_tuner_ops = {
.info = {
- .name = "ITE Tech IT913X",
+ .name = "ITE IT913X",
.frequency_min = 174000000,
.frequency_max = 862000000,
},
.init = it913x_init,
.sleep = it913x_sleep,
- .set_params = it9137_set_params,
+ .set_params = it913x_set_params,
};
static int it913x_probe(struct i2c_client *client,
@@ -366,11 +404,6 @@ static int it913x_probe(struct i2c_client *client,
goto err_kfree;
}
- /* tuner RF initial */
- ret = regmap_write(dev->regmap, 0x80ec4c, 0x68);
- if (ret)
- goto err_regmap_exit;
-
fe->tuner_priv = dev;
memcpy(&fe->ops.tuner_ops, &it913x_tuner_ops,
sizeof(struct dvb_tuner_ops));
@@ -385,11 +418,10 @@ static int it913x_probe(struct i2c_client *client,
dev_info(&dev->client->dev, "ITE IT913X %s successfully attached\n",
chip_ver_str);
- dev_dbg(&dev->client->dev, "chip_ver=%u role=%u\n", dev->chip_ver, dev->role);
+ dev_dbg(&dev->client->dev, "chip_ver %u, role %u\n",
+ dev->chip_ver, dev->role);
return 0;
-err_regmap_exit:
- regmap_exit(dev->regmap);
err_kfree:
kfree(dev);
err:
@@ -430,6 +462,6 @@ static struct i2c_driver it913x_driver = {
module_i2c_driver(it913x_driver);
-MODULE_DESCRIPTION("ITE Tech IT913X silicon tuner driver");
+MODULE_DESCRIPTION("ITE IT913X silicon tuner driver");
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
MODULE_LICENSE("GPL");
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 21/37] it913x: replace udelay polling with jiffies
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (18 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 20/37] it913x: refactor code largely Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 22/37] af9033: fix firmware version logging Antti Palosaari
` (15 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
udelay based I/O polling loop is a bad idea, especially system
performance point of view. Kernel jiffies are preferred solution
for such situations. Use it instead.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/tuners/it913x.c | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 098e9d5..a076c87 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -39,10 +39,11 @@ struct it913x_dev {
static int it913x_init(struct dvb_frontend *fe)
{
struct it913x_dev *dev = fe->tuner_priv;
- int ret, i;
+ int ret;
unsigned int utmp;
u8 iqik_m_cal, nv_val, buf[2];
static const u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
+ unsigned long timeout;
dev_dbg(&dev->client->dev, "role %u\n", dev->role);
@@ -85,7 +86,9 @@ static int it913x_init(struct dvb_frontend *fe)
else
nv_val = 2;
- for (i = 0; i < 50; i++) {
+ #define TIMEOUT 50
+ timeout = jiffies + msecs_to_jiffies(TIMEOUT);
+ while (!time_after(jiffies, timeout)) {
ret = regmap_bulk_read(dev->regmap, 0x80ed23, buf, 2);
if (ret)
goto err;
@@ -93,30 +96,38 @@ static int it913x_init(struct dvb_frontend *fe)
utmp = (buf[1] << 8) | (buf[0] << 0);
if (utmp)
break;
-
- udelay(2000);
}
- dev_dbg(&dev->client->dev, "loop count %d, utmp %d\n", i, utmp);
+ dev_dbg(&dev->client->dev, "r_fbc_m_bdry took %u ms, val %u\n",
+ jiffies_to_msecs(jiffies) -
+ (jiffies_to_msecs(timeout) - TIMEOUT), utmp);
dev->fn_min = dev->xtal * utmp;
dev->fn_min /= (dev->fdiv * nv_val);
dev->fn_min *= 1000;
dev_dbg(&dev->client->dev, "fn_min %u\n", dev->fn_min);
+ /*
+ * Chip version BX never sets that flag so we just wait 50ms in that
+ * case. It is possible poll BX similarly than AX and then timeout in
+ * order to get 50ms delay, but that causes about 120 extra I2C
+ * messages. As for now, we just wait and reduce IO.
+ */
if (dev->chip_ver == 1) {
- for (i = 0; i < 50; i++) {
+ #define TIMEOUT 50
+ timeout = jiffies + msecs_to_jiffies(TIMEOUT);
+ while (!time_after(jiffies, timeout)) {
ret = regmap_read(dev->regmap, 0x80ec82, &utmp);
if (ret)
goto err;
if (utmp)
break;
-
- udelay(2000);
}
- dev_dbg(&dev->client->dev, "loop count %d\n", i);
+ dev_dbg(&dev->client->dev, "p_tsm_init_mode took %u ms, val %u\n",
+ jiffies_to_msecs(jiffies) -
+ (jiffies_to_msecs(timeout) - TIMEOUT), utmp);
} else {
msleep(50);
}
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 22/37] af9033: fix firmware version logging
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (19 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 21/37] it913x: replace udelay polling with jiffies Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 23/37] af9033: rename 'state' to 'dev' Antti Palosaari
` (14 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
AF9030 and IT9130 series has different memory location for firmware
version. Choose correct location according to chip type.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 7f22f01..7d637b9 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -1061,6 +1061,7 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
int ret;
struct af9033_state *state;
u8 buf[8];
+ u32 reg;
dev_dbg(&i2c->dev, "%s:\n", __func__);
@@ -1081,7 +1082,21 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
}
/* firmware version */
- ret = af9033_rd_regs(state, 0x0083e9, &buf[0], 4);
+ switch (state->cfg.tuner) {
+ case AF9033_TUNER_IT9135_38:
+ case AF9033_TUNER_IT9135_51:
+ case AF9033_TUNER_IT9135_52:
+ case AF9033_TUNER_IT9135_60:
+ case AF9033_TUNER_IT9135_61:
+ case AF9033_TUNER_IT9135_62:
+ reg = 0x004bfc;
+ break;
+ default:
+ reg = 0x0083e9;
+ break;
+ }
+
+ ret = af9033_rd_regs(state, reg, &buf[0], 4);
if (ret < 0)
goto err;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 23/37] af9033: rename 'state' to 'dev'
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (20 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 22/37] af9033: fix firmware version logging Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 24/37] af9033: convert to I2C client Antti Palosaari
` (13 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
foo_dev seems to be most correct term for the structure holding data
of each device instance. It is most used term in Kernel codebase and also
examples from book Linux Device Drivers, Third Edition, uses it.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 328 +++++++++++++++++------------------
1 file changed, 164 insertions(+), 164 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 7d637b9..43b7335 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -24,7 +24,7 @@
/* Max transfer size done by I2C transfer functions */
#define MAX_XFER_SIZE 64
-struct af9033_state {
+struct af9033_dev {
struct i2c_adapter *i2c;
struct dvb_frontend fe;
struct af9033_config cfg;
@@ -39,14 +39,14 @@ struct af9033_state {
};
/* write multiple registers */
-static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val,
+static int af9033_wr_regs(struct af9033_dev *dev, u32 reg, const u8 *val,
int len)
{
int ret;
u8 buf[MAX_XFER_SIZE];
struct i2c_msg msg[1] = {
{
- .addr = state->cfg.i2c_addr,
+ .addr = dev->cfg.i2c_addr,
.flags = 0,
.len = 3 + len,
.buf = buf,
@@ -54,7 +54,7 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val,
};
if (3 + len > sizeof(buf)) {
- dev_warn(&state->i2c->dev,
+ dev_warn(&dev->i2c->dev,
"%s: i2c wr reg=%04x: len=%d is too big!\n",
KBUILD_MODNAME, reg, len);
return -EINVAL;
@@ -65,11 +65,11 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val,
buf[2] = (reg >> 0) & 0xff;
memcpy(&buf[3], val, len);
- ret = i2c_transfer(state->i2c, msg, 1);
+ ret = i2c_transfer(dev->i2c, msg, 1);
if (ret == 1) {
ret = 0;
} else {
- dev_warn(&state->i2c->dev,
+ dev_warn(&dev->i2c->dev,
"%s: i2c wr failed=%d reg=%06x len=%d\n",
KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
@@ -79,30 +79,30 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val,
}
/* read multiple registers */
-static int af9033_rd_regs(struct af9033_state *state, u32 reg, u8 *val, int len)
+static int af9033_rd_regs(struct af9033_dev *dev, u32 reg, u8 *val, int len)
{
int ret;
u8 buf[3] = { (reg >> 16) & 0xff, (reg >> 8) & 0xff,
(reg >> 0) & 0xff };
struct i2c_msg msg[2] = {
{
- .addr = state->cfg.i2c_addr,
+ .addr = dev->cfg.i2c_addr,
.flags = 0,
.len = sizeof(buf),
.buf = buf
}, {
- .addr = state->cfg.i2c_addr,
+ .addr = dev->cfg.i2c_addr,
.flags = I2C_M_RD,
.len = len,
.buf = val
}
};
- ret = i2c_transfer(state->i2c, msg, 2);
+ ret = i2c_transfer(dev->i2c, msg, 2);
if (ret == 2) {
ret = 0;
} else {
- dev_warn(&state->i2c->dev,
+ dev_warn(&dev->i2c->dev,
"%s: i2c rd failed=%d reg=%06x len=%d\n",
KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
@@ -113,19 +113,19 @@ static int af9033_rd_regs(struct af9033_state *state, u32 reg, u8 *val, int len)
/* write single register */
-static int af9033_wr_reg(struct af9033_state *state, u32 reg, u8 val)
+static int af9033_wr_reg(struct af9033_dev *dev, u32 reg, u8 val)
{
- return af9033_wr_regs(state, reg, &val, 1);
+ return af9033_wr_regs(dev, reg, &val, 1);
}
/* read single register */
-static int af9033_rd_reg(struct af9033_state *state, u32 reg, u8 *val)
+static int af9033_rd_reg(struct af9033_dev *dev, u32 reg, u8 *val)
{
- return af9033_rd_regs(state, reg, val, 1);
+ return af9033_rd_regs(dev, reg, val, 1);
}
/* write single register with mask */
-static int af9033_wr_reg_mask(struct af9033_state *state, u32 reg, u8 val,
+static int af9033_wr_reg_mask(struct af9033_dev *dev, u32 reg, u8 val,
u8 mask)
{
int ret;
@@ -133,7 +133,7 @@ static int af9033_wr_reg_mask(struct af9033_state *state, u32 reg, u8 val,
/* no need for read if whole reg is written */
if (mask != 0xff) {
- ret = af9033_rd_regs(state, reg, &tmp, 1);
+ ret = af9033_rd_regs(dev, reg, &tmp, 1);
if (ret)
return ret;
@@ -142,17 +142,17 @@ static int af9033_wr_reg_mask(struct af9033_state *state, u32 reg, u8 val,
val |= tmp;
}
- return af9033_wr_regs(state, reg, &val, 1);
+ return af9033_wr_regs(dev, reg, &val, 1);
}
/* read single register with mask */
-static int af9033_rd_reg_mask(struct af9033_state *state, u32 reg, u8 *val,
+static int af9033_rd_reg_mask(struct af9033_dev *dev, u32 reg, u8 *val,
u8 mask)
{
int ret, i;
u8 tmp;
- ret = af9033_rd_regs(state, reg, &tmp, 1);
+ ret = af9033_rd_regs(dev, reg, &tmp, 1);
if (ret)
return ret;
@@ -169,17 +169,17 @@ static int af9033_rd_reg_mask(struct af9033_state *state, u32 reg, u8 *val,
}
/* write reg val table using reg addr auto increment */
-static int af9033_wr_reg_val_tab(struct af9033_state *state,
+static int af9033_wr_reg_val_tab(struct af9033_dev *dev,
const struct reg_val *tab, int tab_len)
{
#define MAX_TAB_LEN 212
int ret, i, j;
u8 buf[1 + MAX_TAB_LEN];
- dev_dbg(&state->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);
+ dev_dbg(&dev->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);
if (tab_len > sizeof(buf)) {
- dev_warn(&state->i2c->dev, "%s: tab len %d is too big\n",
+ dev_warn(&dev->i2c->dev, "%s: tab len %d is too big\n",
KBUILD_MODNAME, tab_len);
return -EINVAL;
}
@@ -188,7 +188,7 @@ static int af9033_wr_reg_val_tab(struct af9033_state *state,
buf[j] = tab[i].val;
if (i == tab_len - 1 || tab[i].reg != tab[i + 1].reg - 1) {
- ret = af9033_wr_regs(state, tab[i].reg - j, buf, j + 1);
+ ret = af9033_wr_regs(dev, tab[i].reg - j, buf, j + 1);
if (ret < 0)
goto err;
@@ -201,16 +201,16 @@ static int af9033_wr_reg_val_tab(struct af9033_state *state,
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
-static u32 af9033_div(struct af9033_state *state, u32 a, u32 b, u32 x)
+static u32 af9033_div(struct af9033_dev *dev, u32 a, u32 b, u32 x)
{
u32 r = 0, c = 0, i;
- dev_dbg(&state->i2c->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x);
+ dev_dbg(&dev->i2c->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x);
if (a > b) {
c = a / b;
@@ -227,7 +227,7 @@ static u32 af9033_div(struct af9033_state *state, u32 a, u32 b, u32 x)
}
r = (c << (u32)x) + r;
- dev_dbg(&state->i2c->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n",
+ dev_dbg(&dev->i2c->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n",
__func__, a, b, x, r, r);
return r;
@@ -235,14 +235,14 @@ static u32 af9033_div(struct af9033_state *state, u32 a, u32 b, u32 x)
static void af9033_release(struct dvb_frontend *fe)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
- kfree(state);
+ kfree(dev);
}
static int af9033_init(struct dvb_frontend *fe)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret, i, len;
const struct reg_val *init;
u8 buf[4];
@@ -250,7 +250,7 @@ static int af9033_init(struct dvb_frontend *fe)
struct reg_val_mask tab[] = {
{ 0x80fb24, 0x00, 0x08 },
{ 0x80004c, 0x00, 0xff },
- { 0x00f641, state->cfg.tuner, 0xff },
+ { 0x00f641, dev->cfg.tuner, 0xff },
{ 0x80f5ca, 0x01, 0x01 },
{ 0x80f715, 0x01, 0x01 },
{ 0x00f41f, 0x04, 0x04 },
@@ -269,82 +269,82 @@ static int af9033_init(struct dvb_frontend *fe)
{ 0x00d830, 0x01, 0xff },
{ 0x00d831, 0x00, 0xff },
{ 0x00d832, 0x00, 0xff },
- { 0x80f985, state->ts_mode_serial, 0x01 },
- { 0x80f986, state->ts_mode_parallel, 0x01 },
+ { 0x80f985, dev->ts_mode_serial, 0x01 },
+ { 0x80f986, dev->ts_mode_parallel, 0x01 },
{ 0x00d827, 0x00, 0xff },
{ 0x00d829, 0x00, 0xff },
- { 0x800045, state->cfg.adc_multiplier, 0xff },
+ { 0x800045, dev->cfg.adc_multiplier, 0xff },
};
/* program clock control */
- clock_cw = af9033_div(state, state->cfg.clock, 1000000ul, 19ul);
+ clock_cw = af9033_div(dev, dev->cfg.clock, 1000000ul, 19ul);
buf[0] = (clock_cw >> 0) & 0xff;
buf[1] = (clock_cw >> 8) & 0xff;
buf[2] = (clock_cw >> 16) & 0xff;
buf[3] = (clock_cw >> 24) & 0xff;
- dev_dbg(&state->i2c->dev, "%s: clock=%d clock_cw=%08x\n",
- __func__, state->cfg.clock, clock_cw);
+ dev_dbg(&dev->i2c->dev, "%s: clock=%d clock_cw=%08x\n",
+ __func__, dev->cfg.clock, clock_cw);
- ret = af9033_wr_regs(state, 0x800025, buf, 4);
+ ret = af9033_wr_regs(dev, 0x800025, buf, 4);
if (ret < 0)
goto err;
/* program ADC control */
for (i = 0; i < ARRAY_SIZE(clock_adc_lut); i++) {
- if (clock_adc_lut[i].clock == state->cfg.clock)
+ if (clock_adc_lut[i].clock == dev->cfg.clock)
break;
}
- adc_cw = af9033_div(state, clock_adc_lut[i].adc, 1000000ul, 19ul);
+ adc_cw = af9033_div(dev, clock_adc_lut[i].adc, 1000000ul, 19ul);
buf[0] = (adc_cw >> 0) & 0xff;
buf[1] = (adc_cw >> 8) & 0xff;
buf[2] = (adc_cw >> 16) & 0xff;
- dev_dbg(&state->i2c->dev, "%s: adc=%d adc_cw=%06x\n",
+ dev_dbg(&dev->i2c->dev, "%s: adc=%d adc_cw=%06x\n",
__func__, clock_adc_lut[i].adc, adc_cw);
- ret = af9033_wr_regs(state, 0x80f1cd, buf, 3);
+ ret = af9033_wr_regs(dev, 0x80f1cd, buf, 3);
if (ret < 0)
goto err;
/* program register table */
for (i = 0; i < ARRAY_SIZE(tab); i++) {
- ret = af9033_wr_reg_mask(state, tab[i].reg, tab[i].val,
+ ret = af9033_wr_reg_mask(dev, tab[i].reg, tab[i].val,
tab[i].mask);
if (ret < 0)
goto err;
}
/* clock output */
- if (state->cfg.dyn0_clk) {
- ret = af9033_wr_reg(state, 0x80fba8, 0x00);
+ if (dev->cfg.dyn0_clk) {
+ ret = af9033_wr_reg(dev, 0x80fba8, 0x00);
if (ret < 0)
goto err;
}
/* settings for TS interface */
- if (state->cfg.ts_mode == AF9033_TS_MODE_USB) {
- ret = af9033_wr_reg_mask(state, 0x80f9a5, 0x00, 0x01);
+ if (dev->cfg.ts_mode == AF9033_TS_MODE_USB) {
+ ret = af9033_wr_reg_mask(dev, 0x80f9a5, 0x00, 0x01);
if (ret < 0)
goto err;
- ret = af9033_wr_reg_mask(state, 0x80f9b5, 0x01, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x80f9b5, 0x01, 0x01);
if (ret < 0)
goto err;
} else {
- ret = af9033_wr_reg_mask(state, 0x80f990, 0x00, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x80f990, 0x00, 0x01);
if (ret < 0)
goto err;
- ret = af9033_wr_reg_mask(state, 0x80f9b5, 0x00, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x80f9b5, 0x00, 0x01);
if (ret < 0)
goto err;
}
/* load OFSM settings */
- dev_dbg(&state->i2c->dev, "%s: load ofsm settings\n", __func__);
- switch (state->cfg.tuner) {
+ dev_dbg(&dev->i2c->dev, "%s: load ofsm settings\n", __func__);
+ switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
case AF9033_TUNER_IT9135_52:
@@ -363,14 +363,14 @@ static int af9033_init(struct dvb_frontend *fe)
break;
}
- ret = af9033_wr_reg_val_tab(state, init, len);
+ ret = af9033_wr_reg_val_tab(dev, init, len);
if (ret < 0)
goto err;
/* load tuner specific settings */
- dev_dbg(&state->i2c->dev, "%s: load tuner specific settings\n",
+ dev_dbg(&dev->i2c->dev, "%s: load tuner specific settings\n",
__func__);
- switch (state->cfg.tuner) {
+ switch (dev->cfg.tuner) {
case AF9033_TUNER_TUA9001:
len = ARRAY_SIZE(tuner_init_tua9001);
init = tuner_init_tua9001;
@@ -420,90 +420,90 @@ static int af9033_init(struct dvb_frontend *fe)
init = tuner_init_it9135_62;
break;
default:
- dev_dbg(&state->i2c->dev, "%s: unsupported tuner ID=%d\n",
- __func__, state->cfg.tuner);
+ dev_dbg(&dev->i2c->dev, "%s: unsupported tuner ID=%d\n",
+ __func__, dev->cfg.tuner);
ret = -ENODEV;
goto err;
}
- ret = af9033_wr_reg_val_tab(state, init, len);
+ ret = af9033_wr_reg_val_tab(dev, init, len);
if (ret < 0)
goto err;
- if (state->cfg.ts_mode == AF9033_TS_MODE_SERIAL) {
- ret = af9033_wr_reg_mask(state, 0x00d91c, 0x01, 0x01);
+ if (dev->cfg.ts_mode == AF9033_TS_MODE_SERIAL) {
+ ret = af9033_wr_reg_mask(dev, 0x00d91c, 0x01, 0x01);
if (ret < 0)
goto err;
- ret = af9033_wr_reg_mask(state, 0x00d917, 0x00, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x00d917, 0x00, 0x01);
if (ret < 0)
goto err;
- ret = af9033_wr_reg_mask(state, 0x00d916, 0x00, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x00d916, 0x00, 0x01);
if (ret < 0)
goto err;
}
- switch (state->cfg.tuner) {
+ switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_60:
case AF9033_TUNER_IT9135_61:
case AF9033_TUNER_IT9135_62:
- ret = af9033_wr_reg(state, 0x800000, 0x01);
+ ret = af9033_wr_reg(dev, 0x800000, 0x01);
if (ret < 0)
goto err;
}
- state->bandwidth_hz = 0; /* force to program all parameters */
+ dev->bandwidth_hz = 0; /* force to program all parameters */
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_sleep(struct dvb_frontend *fe)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret, i;
u8 tmp;
- ret = af9033_wr_reg(state, 0x80004c, 1);
+ ret = af9033_wr_reg(dev, 0x80004c, 1);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x800000, 0);
+ ret = af9033_wr_reg(dev, 0x800000, 0);
if (ret < 0)
goto err;
for (i = 100, tmp = 1; i && tmp; i--) {
- ret = af9033_rd_reg(state, 0x80004c, &tmp);
+ ret = af9033_rd_reg(dev, 0x80004c, &tmp);
if (ret < 0)
goto err;
usleep_range(200, 10000);
}
- dev_dbg(&state->i2c->dev, "%s: loop=%d\n", __func__, i);
+ dev_dbg(&dev->i2c->dev, "%s: loop=%d\n", __func__, i);
if (i == 0) {
ret = -ETIMEDOUT;
goto err;
}
- ret = af9033_wr_reg_mask(state, 0x80fb24, 0x08, 0x08);
+ ret = af9033_wr_reg_mask(dev, 0x80fb24, 0x08, 0x08);
if (ret < 0)
goto err;
/* prevent current leak (?) */
- if (state->cfg.ts_mode == AF9033_TS_MODE_SERIAL) {
+ if (dev->cfg.ts_mode == AF9033_TS_MODE_SERIAL) {
/* enable parallel TS */
- ret = af9033_wr_reg_mask(state, 0x00d917, 0x00, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x00d917, 0x00, 0x01);
if (ret < 0)
goto err;
- ret = af9033_wr_reg_mask(state, 0x00d916, 0x01, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x00d916, 0x01, 0x01);
if (ret < 0)
goto err;
}
@@ -511,7 +511,7 @@ static int af9033_sleep(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -529,13 +529,13 @@ static int af9033_get_tune_settings(struct dvb_frontend *fe,
static int af9033_set_frontend(struct dvb_frontend *fe)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i, spec_inv, sampling_freq;
u8 tmp, buf[3], bandwidth_reg_val;
u32 if_frequency, freq_cw, adc_freq;
- dev_dbg(&state->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n",
+ dev_dbg(&dev->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n",
__func__, c->frequency, c->bandwidth_hz);
/* check bandwidth */
@@ -550,7 +550,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
bandwidth_reg_val = 0x02;
break;
default:
- dev_dbg(&state->i2c->dev, "%s: invalid bandwidth_hz\n",
+ dev_dbg(&dev->i2c->dev, "%s: invalid bandwidth_hz\n",
__func__);
ret = -EINVAL;
goto err;
@@ -561,23 +561,23 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
fe->ops.tuner_ops.set_params(fe);
/* program CFOE coefficients */
- if (c->bandwidth_hz != state->bandwidth_hz) {
+ if (c->bandwidth_hz != dev->bandwidth_hz) {
for (i = 0; i < ARRAY_SIZE(coeff_lut); i++) {
- if (coeff_lut[i].clock == state->cfg.clock &&
+ if (coeff_lut[i].clock == dev->cfg.clock &&
coeff_lut[i].bandwidth_hz == c->bandwidth_hz) {
break;
}
}
- ret = af9033_wr_regs(state, 0x800001,
+ ret = af9033_wr_regs(dev, 0x800001,
coeff_lut[i].val, sizeof(coeff_lut[i].val));
}
/* program frequency control */
- if (c->bandwidth_hz != state->bandwidth_hz) {
- spec_inv = state->cfg.spec_inv ? -1 : 1;
+ if (c->bandwidth_hz != dev->bandwidth_hz) {
+ spec_inv = dev->cfg.spec_inv ? -1 : 1;
for (i = 0; i < ARRAY_SIZE(clock_adc_lut); i++) {
- if (clock_adc_lut[i].clock == state->cfg.clock)
+ if (clock_adc_lut[i].clock == dev->cfg.clock)
break;
}
adc_freq = clock_adc_lut[i].adc;
@@ -598,12 +598,12 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
else
sampling_freq *= -1;
- freq_cw = af9033_div(state, sampling_freq, adc_freq, 23ul);
+ freq_cw = af9033_div(dev, sampling_freq, adc_freq, 23ul);
if (spec_inv == -1)
freq_cw = 0x800000 - freq_cw;
- if (state->cfg.adc_multiplier == AF9033_ADC_MULTIPLIER_2X)
+ if (dev->cfg.adc_multiplier == AF9033_ADC_MULTIPLIER_2X)
freq_cw /= 2;
buf[0] = (freq_cw >> 0) & 0xff;
@@ -614,26 +614,26 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
if (if_frequency == 0)
buf[2] = 0;
- ret = af9033_wr_regs(state, 0x800029, buf, 3);
+ ret = af9033_wr_regs(dev, 0x800029, buf, 3);
if (ret < 0)
goto err;
- state->bandwidth_hz = c->bandwidth_hz;
+ dev->bandwidth_hz = c->bandwidth_hz;
}
- ret = af9033_wr_reg_mask(state, 0x80f904, bandwidth_reg_val, 0x03);
+ ret = af9033_wr_reg_mask(dev, 0x80f904, bandwidth_reg_val, 0x03);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x800040, 0x00);
+ ret = af9033_wr_reg(dev, 0x800040, 0x00);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x800047, 0x00);
+ ret = af9033_wr_reg(dev, 0x800047, 0x00);
if (ret < 0)
goto err;
- ret = af9033_wr_reg_mask(state, 0x80f999, 0x00, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x80f999, 0x00, 0x01);
if (ret < 0)
goto err;
@@ -642,33 +642,33 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
else
tmp = 0x01; /* UHF */
- ret = af9033_wr_reg(state, 0x80004b, tmp);
+ ret = af9033_wr_reg(dev, 0x80004b, tmp);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x800000, 0x00);
+ ret = af9033_wr_reg(dev, 0x800000, 0x00);
if (ret < 0)
goto err;
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_get_frontend(struct dvb_frontend *fe)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret;
u8 buf[8];
- dev_dbg(&state->i2c->dev, "%s:\n", __func__);
+ dev_dbg(&dev->i2c->dev, "%s:\n", __func__);
/* read all needed registers */
- ret = af9033_rd_regs(state, 0x80f900, buf, sizeof(buf));
+ ret = af9033_rd_regs(dev, 0x80f900, buf, sizeof(buf));
if (ret < 0)
goto err;
@@ -780,21 +780,21 @@ static int af9033_get_frontend(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
u8 tmp;
*status = 0;
/* radio channel status, 0=no result, 1=has signal, 2=no signal */
- ret = af9033_rd_reg(state, 0x800047, &tmp);
+ ret = af9033_rd_reg(dev, 0x800047, &tmp);
if (ret < 0)
goto err;
@@ -804,7 +804,7 @@ static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
if (tmp != 0x02) {
/* TPS lock */
- ret = af9033_rd_reg_mask(state, 0x80f5a9, &tmp, 0x01);
+ ret = af9033_rd_reg_mask(dev, 0x80f5a9, &tmp, 0x01);
if (ret < 0)
goto err;
@@ -813,7 +813,7 @@ static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
FE_HAS_VITERBI;
/* full lock */
- ret = af9033_rd_reg_mask(state, 0x80f999, &tmp, 0x01);
+ ret = af9033_rd_reg_mask(dev, 0x80f999, &tmp, 0x01);
if (ret < 0)
goto err;
@@ -826,28 +826,28 @@ static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret, i, len;
u8 buf[3], tmp;
u32 snr_val;
const struct val_snr *snr_lut;
/* read value */
- ret = af9033_rd_regs(state, 0x80002c, buf, 3);
+ ret = af9033_rd_regs(dev, 0x80002c, buf, 3);
if (ret < 0)
goto err;
snr_val = (buf[2] << 16) | (buf[1] << 8) | buf[0];
/* read current modulation */
- ret = af9033_rd_reg(state, 0x80f903, &tmp);
+ ret = af9033_rd_reg(dev, 0x80f903, &tmp);
if (ret < 0)
goto err;
@@ -880,19 +880,19 @@ static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
u8 strength2;
/* read signal strength of 0-100 scale */
- ret = af9033_rd_reg(state, 0x800048, &strength2);
+ ret = af9033_rd_reg(dev, 0x800048, &strength2);
if (ret < 0)
goto err;
@@ -902,12 +902,12 @@ static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
-static int af9033_update_ch_stat(struct af9033_state *state)
+static int af9033_update_ch_stat(struct af9033_dev *dev)
{
int ret = 0;
u32 err_cnt, bit_cnt;
@@ -915,8 +915,8 @@ static int af9033_update_ch_stat(struct af9033_state *state)
u8 buf[7];
/* only update data every half second */
- if (time_after(jiffies, state->last_stat_check + msecs_to_jiffies(500))) {
- ret = af9033_rd_regs(state, 0x800032, buf, sizeof(buf));
+ if (time_after(jiffies, dev->last_stat_check + msecs_to_jiffies(500))) {
+ ret = af9033_rd_regs(dev, 0x800032, buf, sizeof(buf));
if (ret < 0)
goto err;
/* in 8 byte packets? */
@@ -928,93 +928,93 @@ static int af9033_update_ch_stat(struct af9033_state *state)
if (bit_cnt < abort_cnt) {
abort_cnt = 1000;
- state->ber = 0xffffffff;
+ dev->ber = 0xffffffff;
} else {
/*
* 8 byte packets, that have not been rejected already
*/
bit_cnt -= (u32)abort_cnt;
if (bit_cnt == 0) {
- state->ber = 0xffffffff;
+ dev->ber = 0xffffffff;
} else {
err_cnt -= (u32)abort_cnt * 8 * 8;
bit_cnt *= 8 * 8;
- state->ber = err_cnt * (0xffffffff / bit_cnt);
+ dev->ber = err_cnt * (0xffffffff / bit_cnt);
}
}
- state->ucb += abort_cnt;
- state->last_stat_check = jiffies;
+ dev->ucb += abort_cnt;
+ dev->last_stat_check = jiffies;
}
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_read_ber(struct dvb_frontend *fe, u32 *ber)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- ret = af9033_update_ch_stat(state);
+ ret = af9033_update_ch_stat(dev);
if (ret < 0)
return ret;
- *ber = state->ber;
+ *ber = dev->ber;
return 0;
}
static int af9033_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- ret = af9033_update_ch_stat(state);
+ ret = af9033_update_ch_stat(dev);
if (ret < 0)
return ret;
- *ucblocks = state->ucb;
+ *ucblocks = dev->ucb;
return 0;
}
static int af9033_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&state->i2c->dev, "%s: enable=%d\n", __func__, enable);
+ dev_dbg(&dev->i2c->dev, "%s: enable=%d\n", __func__, enable);
- ret = af9033_wr_reg_mask(state, 0x00fa04, enable, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x00fa04, enable, 0x01);
if (ret < 0)
goto err;
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
static int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&state->i2c->dev, "%s: onoff=%d\n", __func__, onoff);
+ dev_dbg(&dev->i2c->dev, "%s: onoff=%d\n", __func__, onoff);
- ret = af9033_wr_reg_mask(state, 0x80f993, onoff, 0x01);
+ ret = af9033_wr_reg_mask(dev, 0x80f993, onoff, 0x01);
if (ret < 0)
goto err;
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -1022,32 +1022,32 @@ err:
static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
int onoff)
{
- struct af9033_state *state = fe->demodulator_priv;
+ struct af9033_dev *dev = fe->demodulator_priv;
int ret;
u8 wbuf[2] = {(pid >> 0) & 0xff, (pid >> 8) & 0xff};
- dev_dbg(&state->i2c->dev, "%s: index=%d pid=%04x onoff=%d\n",
+ dev_dbg(&dev->i2c->dev, "%s: index=%d pid=%04x onoff=%d\n",
__func__, index, pid, onoff);
if (pid > 0x1fff)
return 0;
- ret = af9033_wr_regs(state, 0x80f996, wbuf, 2);
+ ret = af9033_wr_regs(dev, 0x80f996, wbuf, 2);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x80f994, onoff);
+ ret = af9033_wr_reg(dev, 0x80f994, onoff);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x80f995, index);
+ ret = af9033_wr_reg(dev, 0x80f995, index);
if (ret < 0)
goto err;
return 0;
err:
- dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -1059,30 +1059,30 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
struct af9033_ops *ops)
{
int ret;
- struct af9033_state *state;
+ struct af9033_dev *dev;
u8 buf[8];
u32 reg;
dev_dbg(&i2c->dev, "%s:\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc(sizeof(struct af9033_state), GFP_KERNEL);
- if (state == NULL)
+ dev = kzalloc(sizeof(struct af9033_dev), GFP_KERNEL);
+ if (dev == NULL)
goto err;
/* setup the state */
- state->i2c = i2c;
- memcpy(&state->cfg, config, sizeof(struct af9033_config));
+ dev->i2c = i2c;
+ memcpy(&dev->cfg, config, sizeof(struct af9033_config));
- if (state->cfg.clock != 12000000) {
- dev_err(&state->i2c->dev,
+ if (dev->cfg.clock != 12000000) {
+ dev_err(&dev->i2c->dev,
"%s: af9033: unsupported clock=%d, only 12000000 Hz is supported currently\n",
- KBUILD_MODNAME, state->cfg.clock);
+ KBUILD_MODNAME, dev->cfg.clock);
goto err;
}
/* firmware version */
- switch (state->cfg.tuner) {
+ switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
case AF9033_TUNER_IT9135_52:
@@ -1096,21 +1096,21 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
break;
}
- ret = af9033_rd_regs(state, reg, &buf[0], 4);
+ ret = af9033_rd_regs(dev, reg, &buf[0], 4);
if (ret < 0)
goto err;
- ret = af9033_rd_regs(state, 0x804191, &buf[4], 4);
+ ret = af9033_rd_regs(dev, 0x804191, &buf[4], 4);
if (ret < 0)
goto err;
- dev_info(&state->i2c->dev,
+ dev_info(&dev->i2c->dev,
"%s: firmware version: LINK=%d.%d.%d.%d OFDM=%d.%d.%d.%d\n",
KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3], buf[4],
buf[5], buf[6], buf[7]);
/* sleep */
- switch (state->cfg.tuner) {
+ switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
case AF9033_TUNER_IT9135_52:
@@ -1120,22 +1120,22 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
/* IT9135 did not like to sleep at that early */
break;
default:
- ret = af9033_wr_reg(state, 0x80004c, 1);
+ ret = af9033_wr_reg(dev, 0x80004c, 1);
if (ret < 0)
goto err;
- ret = af9033_wr_reg(state, 0x800000, 0);
+ ret = af9033_wr_reg(dev, 0x800000, 0);
if (ret < 0)
goto err;
}
/* configure internal TS mode */
- switch (state->cfg.ts_mode) {
+ switch (dev->cfg.ts_mode) {
case AF9033_TS_MODE_PARALLEL:
- state->ts_mode_parallel = true;
+ dev->ts_mode_parallel = true;
break;
case AF9033_TS_MODE_SERIAL:
- state->ts_mode_serial = true;
+ dev->ts_mode_serial = true;
break;
case AF9033_TS_MODE_USB:
/* usb mode for AF9035 */
@@ -1144,18 +1144,18 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
}
/* create dvb_frontend */
- memcpy(&state->fe.ops, &af9033_ops, sizeof(struct dvb_frontend_ops));
- state->fe.demodulator_priv = state;
+ memcpy(&dev->fe.ops, &af9033_ops, sizeof(struct dvb_frontend_ops));
+ dev->fe.demodulator_priv = dev;
if (ops) {
ops->pid_filter = af9033_pid_filter;
ops->pid_filter_ctrl = af9033_pid_filter_ctrl;
}
- return &state->fe;
+ return &dev->fe;
err:
- kfree(state);
+ kfree(dev);
return NULL;
}
EXPORT_SYMBOL(af9033_attach);
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 24/37] af9033: convert to I2C client
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (21 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 23/37] af9033: rename 'state' to 'dev' Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 25/37] af9033: clean up logging Antti Palosaari
` (12 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Convert driver to kernel I2C model.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 236 +++++++++++++++++++---------------
drivers/media/dvb-frontends/af9033.h | 44 ++-----
drivers/media/usb/dvb-usb-v2/af9035.c | 50 +++++--
drivers/media/usb/dvb-usb-v2/af9035.h | 2 +-
4 files changed, 183 insertions(+), 149 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 43b7335..c40ae49 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -25,7 +25,7 @@
#define MAX_XFER_SIZE 64
struct af9033_dev {
- struct i2c_adapter *i2c;
+ struct i2c_client *client;
struct dvb_frontend fe;
struct af9033_config cfg;
@@ -46,7 +46,7 @@ static int af9033_wr_regs(struct af9033_dev *dev, u32 reg, const u8 *val,
u8 buf[MAX_XFER_SIZE];
struct i2c_msg msg[1] = {
{
- .addr = dev->cfg.i2c_addr,
+ .addr = dev->client->addr,
.flags = 0,
.len = 3 + len,
.buf = buf,
@@ -54,7 +54,7 @@ static int af9033_wr_regs(struct af9033_dev *dev, u32 reg, const u8 *val,
};
if (3 + len > sizeof(buf)) {
- dev_warn(&dev->i2c->dev,
+ dev_warn(&dev->client->dev,
"%s: i2c wr reg=%04x: len=%d is too big!\n",
KBUILD_MODNAME, reg, len);
return -EINVAL;
@@ -65,11 +65,11 @@ static int af9033_wr_regs(struct af9033_dev *dev, u32 reg, const u8 *val,
buf[2] = (reg >> 0) & 0xff;
memcpy(&buf[3], val, len);
- ret = i2c_transfer(dev->i2c, msg, 1);
+ ret = i2c_transfer(dev->client->adapter, msg, 1);
if (ret == 1) {
ret = 0;
} else {
- dev_warn(&dev->i2c->dev,
+ dev_warn(&dev->client->dev,
"%s: i2c wr failed=%d reg=%06x len=%d\n",
KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
@@ -86,23 +86,23 @@ static int af9033_rd_regs(struct af9033_dev *dev, u32 reg, u8 *val, int len)
(reg >> 0) & 0xff };
struct i2c_msg msg[2] = {
{
- .addr = dev->cfg.i2c_addr,
+ .addr = dev->client->addr,
.flags = 0,
.len = sizeof(buf),
.buf = buf
}, {
- .addr = dev->cfg.i2c_addr,
+ .addr = dev->client->addr,
.flags = I2C_M_RD,
.len = len,
.buf = val
}
};
- ret = i2c_transfer(dev->i2c, msg, 2);
+ ret = i2c_transfer(dev->client->adapter, msg, 2);
if (ret == 2) {
ret = 0;
} else {
- dev_warn(&dev->i2c->dev,
+ dev_warn(&dev->client->dev,
"%s: i2c rd failed=%d reg=%06x len=%d\n",
KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
@@ -176,10 +176,10 @@ static int af9033_wr_reg_val_tab(struct af9033_dev *dev,
int ret, i, j;
u8 buf[1 + MAX_TAB_LEN];
- dev_dbg(&dev->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);
+ dev_dbg(&dev->client->dev, "%s: tab_len=%d\n", __func__, tab_len);
if (tab_len > sizeof(buf)) {
- dev_warn(&dev->i2c->dev, "%s: tab len %d is too big\n",
+ dev_warn(&dev->client->dev, "%s: tab len %d is too big\n",
KBUILD_MODNAME, tab_len);
return -EINVAL;
}
@@ -201,7 +201,7 @@ static int af9033_wr_reg_val_tab(struct af9033_dev *dev,
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -210,7 +210,7 @@ static u32 af9033_div(struct af9033_dev *dev, u32 a, u32 b, u32 x)
{
u32 r = 0, c = 0, i;
- dev_dbg(&dev->i2c->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x);
+ dev_dbg(&dev->client->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x);
if (a > b) {
c = a / b;
@@ -227,19 +227,12 @@ static u32 af9033_div(struct af9033_dev *dev, u32 a, u32 b, u32 x)
}
r = (c << (u32)x) + r;
- dev_dbg(&dev->i2c->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n",
+ dev_dbg(&dev->client->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n",
__func__, a, b, x, r, r);
return r;
}
-static void af9033_release(struct dvb_frontend *fe)
-{
- struct af9033_dev *dev = fe->demodulator_priv;
-
- kfree(dev);
-}
-
static int af9033_init(struct dvb_frontend *fe)
{
struct af9033_dev *dev = fe->demodulator_priv;
@@ -283,7 +276,7 @@ static int af9033_init(struct dvb_frontend *fe)
buf[2] = (clock_cw >> 16) & 0xff;
buf[3] = (clock_cw >> 24) & 0xff;
- dev_dbg(&dev->i2c->dev, "%s: clock=%d clock_cw=%08x\n",
+ dev_dbg(&dev->client->dev, "%s: clock=%d clock_cw=%08x\n",
__func__, dev->cfg.clock, clock_cw);
ret = af9033_wr_regs(dev, 0x800025, buf, 4);
@@ -301,7 +294,7 @@ static int af9033_init(struct dvb_frontend *fe)
buf[1] = (adc_cw >> 8) & 0xff;
buf[2] = (adc_cw >> 16) & 0xff;
- dev_dbg(&dev->i2c->dev, "%s: adc=%d adc_cw=%06x\n",
+ dev_dbg(&dev->client->dev, "%s: adc=%d adc_cw=%06x\n",
__func__, clock_adc_lut[i].adc, adc_cw);
ret = af9033_wr_regs(dev, 0x80f1cd, buf, 3);
@@ -343,7 +336,7 @@ static int af9033_init(struct dvb_frontend *fe)
}
/* load OFSM settings */
- dev_dbg(&dev->i2c->dev, "%s: load ofsm settings\n", __func__);
+ dev_dbg(&dev->client->dev, "%s: load ofsm settings\n", __func__);
switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
@@ -368,7 +361,7 @@ static int af9033_init(struct dvb_frontend *fe)
goto err;
/* load tuner specific settings */
- dev_dbg(&dev->i2c->dev, "%s: load tuner specific settings\n",
+ dev_dbg(&dev->client->dev, "%s: load tuner specific settings\n",
__func__);
switch (dev->cfg.tuner) {
case AF9033_TUNER_TUA9001:
@@ -420,7 +413,7 @@ static int af9033_init(struct dvb_frontend *fe)
init = tuner_init_it9135_62;
break;
default:
- dev_dbg(&dev->i2c->dev, "%s: unsupported tuner ID=%d\n",
+ dev_dbg(&dev->client->dev, "%s: unsupported tuner ID=%d\n",
__func__, dev->cfg.tuner);
ret = -ENODEV;
goto err;
@@ -458,7 +451,7 @@ static int af9033_init(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -485,7 +478,7 @@ static int af9033_sleep(struct dvb_frontend *fe)
usleep_range(200, 10000);
}
- dev_dbg(&dev->i2c->dev, "%s: loop=%d\n", __func__, i);
+ dev_dbg(&dev->client->dev, "%s: loop=%d\n", __func__, i);
if (i == 0) {
ret = -ETIMEDOUT;
@@ -511,7 +504,7 @@ static int af9033_sleep(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -535,7 +528,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
u8 tmp, buf[3], bandwidth_reg_val;
u32 if_frequency, freq_cw, adc_freq;
- dev_dbg(&dev->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n",
+ dev_dbg(&dev->client->dev, "%s: frequency=%d bandwidth_hz=%d\n",
__func__, c->frequency, c->bandwidth_hz);
/* check bandwidth */
@@ -550,7 +543,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
bandwidth_reg_val = 0x02;
break;
default:
- dev_dbg(&dev->i2c->dev, "%s: invalid bandwidth_hz\n",
+ dev_dbg(&dev->client->dev, "%s: invalid bandwidth_hz\n",
__func__);
ret = -EINVAL;
goto err;
@@ -653,7 +646,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -665,7 +658,7 @@ static int af9033_get_frontend(struct dvb_frontend *fe)
int ret;
u8 buf[8];
- dev_dbg(&dev->i2c->dev, "%s:\n", __func__);
+ dev_dbg(&dev->client->dev, "%s:\n", __func__);
/* read all needed registers */
ret = af9033_rd_regs(dev, 0x80f900, buf, sizeof(buf));
@@ -780,7 +773,7 @@ static int af9033_get_frontend(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -826,7 +819,7 @@ static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -880,7 +873,7 @@ static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -902,7 +895,7 @@ static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -948,7 +941,7 @@ static int af9033_update_ch_stat(struct af9033_dev *dev)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -986,7 +979,7 @@ static int af9033_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&dev->i2c->dev, "%s: enable=%d\n", __func__, enable);
+ dev_dbg(&dev->client->dev, "%s: enable=%d\n", __func__, enable);
ret = af9033_wr_reg_mask(dev, 0x00fa04, enable, 0x01);
if (ret < 0)
@@ -995,7 +988,7 @@ static int af9033_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -1005,7 +998,7 @@ static int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&dev->i2c->dev, "%s: onoff=%d\n", __func__, onoff);
+ dev_dbg(&dev->client->dev, "%s: onoff=%d\n", __func__, onoff);
ret = af9033_wr_reg_mask(dev, 0x80f993, onoff, 0x01);
if (ret < 0)
@@ -1014,7 +1007,7 @@ static int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
@@ -1026,7 +1019,7 @@ static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
int ret;
u8 wbuf[2] = {(pid >> 0) & 0xff, (pid >> 8) & 0xff};
- dev_dbg(&dev->i2c->dev, "%s: index=%d pid=%04x onoff=%d\n",
+ dev_dbg(&dev->client->dev, "%s: index=%d pid=%04x onoff=%d\n",
__func__, index, pid, onoff);
if (pid > 0x1fff)
@@ -1047,38 +1040,79 @@ static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
return 0;
err:
- dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}
-static struct dvb_frontend_ops af9033_ops;
+static struct dvb_frontend_ops af9033_ops = {
+ .delsys = { SYS_DVBT },
+ .info = {
+ .name = "Afatech AF9033 (DVB-T)",
+ .frequency_min = 174000000,
+ .frequency_max = 862000000,
+ .frequency_stepsize = 250000,
+ .frequency_tolerance = 0,
+ .caps = FE_CAN_FEC_1_2 |
+ FE_CAN_FEC_2_3 |
+ FE_CAN_FEC_3_4 |
+ FE_CAN_FEC_5_6 |
+ FE_CAN_FEC_7_8 |
+ FE_CAN_FEC_AUTO |
+ FE_CAN_QPSK |
+ FE_CAN_QAM_16 |
+ FE_CAN_QAM_64 |
+ FE_CAN_QAM_AUTO |
+ FE_CAN_TRANSMISSION_MODE_AUTO |
+ FE_CAN_GUARD_INTERVAL_AUTO |
+ FE_CAN_HIERARCHY_AUTO |
+ FE_CAN_RECOVER |
+ FE_CAN_MUTE_TS
+ },
+
+ .init = af9033_init,
+ .sleep = af9033_sleep,
+
+ .get_tune_settings = af9033_get_tune_settings,
+ .set_frontend = af9033_set_frontend,
+ .get_frontend = af9033_get_frontend,
+
+ .read_status = af9033_read_status,
+ .read_snr = af9033_read_snr,
+ .read_signal_strength = af9033_read_signal_strength,
+ .read_ber = af9033_read_ber,
+ .read_ucblocks = af9033_read_ucblocks,
+
+ .i2c_gate_ctrl = af9033_i2c_gate_ctrl,
+};
-struct dvb_frontend *af9033_attach(const struct af9033_config *config,
- struct i2c_adapter *i2c,
- struct af9033_ops *ops)
+static int af9033_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
{
- int ret;
+ struct af9033_config *cfg = client->dev.platform_data;
struct af9033_dev *dev;
+ int ret;
u8 buf[8];
u32 reg;
- dev_dbg(&i2c->dev, "%s:\n", __func__);
-
/* allocate memory for the internal state */
dev = kzalloc(sizeof(struct af9033_dev), GFP_KERNEL);
- if (dev == NULL)
+ if (dev == NULL) {
+ ret = -ENOMEM;
+ dev_err(&client->dev, "Could not allocate memory for state\n");
goto err;
+ }
/* setup the state */
- dev->i2c = i2c;
- memcpy(&dev->cfg, config, sizeof(struct af9033_config));
+ dev->client = client;
+ memcpy(&dev->cfg, cfg, sizeof(struct af9033_config));
if (dev->cfg.clock != 12000000) {
- dev_err(&dev->i2c->dev,
+ ret = -ENODEV;
+ dev_err(&dev->client->dev,
"%s: af9033: unsupported clock=%d, only 12000000 Hz is supported currently\n",
KBUILD_MODNAME, dev->cfg.clock);
- goto err;
+ goto err_kfree;
}
/* firmware version */
@@ -1098,13 +1132,13 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
ret = af9033_rd_regs(dev, reg, &buf[0], 4);
if (ret < 0)
- goto err;
+ goto err_kfree;
ret = af9033_rd_regs(dev, 0x804191, &buf[4], 4);
if (ret < 0)
- goto err;
+ goto err_kfree;
- dev_info(&dev->i2c->dev,
+ dev_info(&dev->client->dev,
"%s: firmware version: LINK=%d.%d.%d.%d OFDM=%d.%d.%d.%d\n",
KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3], buf[4],
buf[5], buf[6], buf[7]);
@@ -1122,11 +1156,11 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
default:
ret = af9033_wr_reg(dev, 0x80004c, 1);
if (ret < 0)
- goto err;
+ goto err_kfree;
ret = af9033_wr_reg(dev, 0x800000, 0);
if (ret < 0)
- goto err;
+ goto err_kfree;
}
/* configure internal TS mode */
@@ -1146,63 +1180,53 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config,
/* create dvb_frontend */
memcpy(&dev->fe.ops, &af9033_ops, sizeof(struct dvb_frontend_ops));
dev->fe.demodulator_priv = dev;
-
- if (ops) {
- ops->pid_filter = af9033_pid_filter;
- ops->pid_filter_ctrl = af9033_pid_filter_ctrl;
+ *cfg->fe = &dev->fe;
+ if (cfg->ops) {
+ cfg->ops->pid_filter = af9033_pid_filter;
+ cfg->ops->pid_filter_ctrl = af9033_pid_filter_ctrl;
}
+ i2c_set_clientdata(client, dev);
- return &dev->fe;
-
-err:
+ dev_info(&dev->client->dev, "Afatech AF9033 successfully attached\n");
+ return 0;
+err_kfree:
kfree(dev);
- return NULL;
+err:
+ dev_dbg(&client->dev, "failed %d\n", ret);
+ return ret;
}
-EXPORT_SYMBOL(af9033_attach);
-static struct dvb_frontend_ops af9033_ops = {
- .delsys = { SYS_DVBT },
- .info = {
- .name = "Afatech AF9033 (DVB-T)",
- .frequency_min = 174000000,
- .frequency_max = 862000000,
- .frequency_stepsize = 250000,
- .frequency_tolerance = 0,
- .caps = FE_CAN_FEC_1_2 |
- FE_CAN_FEC_2_3 |
- FE_CAN_FEC_3_4 |
- FE_CAN_FEC_5_6 |
- FE_CAN_FEC_7_8 |
- FE_CAN_FEC_AUTO |
- FE_CAN_QPSK |
- FE_CAN_QAM_16 |
- FE_CAN_QAM_64 |
- FE_CAN_QAM_AUTO |
- FE_CAN_TRANSMISSION_MODE_AUTO |
- FE_CAN_GUARD_INTERVAL_AUTO |
- FE_CAN_HIERARCHY_AUTO |
- FE_CAN_RECOVER |
- FE_CAN_MUTE_TS
- },
+static int af9033_remove(struct i2c_client *client)
+{
+ struct af9033_dev *dev = i2c_get_clientdata(client);
- .release = af9033_release,
+ dev_dbg(&client->dev, "%s\n", __func__);
- .init = af9033_init,
- .sleep = af9033_sleep,
+ dev->fe.ops.release = NULL;
+ dev->fe.demodulator_priv = NULL;
+ kfree(dev);
- .get_tune_settings = af9033_get_tune_settings,
- .set_frontend = af9033_set_frontend,
- .get_frontend = af9033_get_frontend,
+ return 0;
+}
- .read_status = af9033_read_status,
- .read_snr = af9033_read_snr,
- .read_signal_strength = af9033_read_signal_strength,
- .read_ber = af9033_read_ber,
- .read_ucblocks = af9033_read_ucblocks,
+static const struct i2c_device_id af9033_id_table[] = {
+ {"af9033", 0},
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, af9033_id_table);
- .i2c_gate_ctrl = af9033_i2c_gate_ctrl,
+static struct i2c_driver af9033_driver = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "af9033",
+ },
+ .probe = af9033_probe,
+ .remove = af9033_remove,
+ .id_table = af9033_id_table,
};
+module_i2c_driver(af9033_driver);
+
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
MODULE_DESCRIPTION("Afatech AF9033 DVB-T demodulator driver");
MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
index b95a6d4..1b968d0 100644
--- a/drivers/media/dvb-frontends/af9033.h
+++ b/drivers/media/dvb-frontends/af9033.h
@@ -80,8 +80,18 @@ struct af9033_config {
*
*/
bool dyn0_clk;
-};
+ /*
+ * PID filter ops
+ */
+ struct af9033_ops *ops;
+
+ /*
+ * frontend
+ * returned by that driver
+ */
+ struct dvb_frontend **fe;
+};
struct af9033_ops {
int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
@@ -89,36 +99,4 @@ struct af9033_ops {
int onoff);
};
-
-#if IS_ENABLED(CONFIG_DVB_AF9033)
-extern
-struct dvb_frontend *af9033_attach(const struct af9033_config *config,
- struct i2c_adapter *i2c,
- struct af9033_ops *ops);
-
-#else
-static inline
-struct dvb_frontend *af9033_attach(const struct af9033_config *config,
- struct i2c_adapter *i2c,
- struct af9033_ops *ops)
-{
- pr_warn("%s: driver disabled by Kconfig\n", __func__);
- return NULL;
-}
-
-static inline int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
-{
- pr_warn("%s: driver disabled by Kconfig\n", __func__);
- return -ENODEV;
-}
-
-static inline int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
- int onoff)
-{
- pr_warn("%s: driver disabled by Kconfig\n", __func__);
- return -ENODEV;
-}
-
-#endif
-
#endif /* AF9033_H */
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 533c96e..6534e44 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -305,6 +305,19 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
* NOTE: As a firmware knows tuner type there is very small possibility
* there could be some tuner I2C hacks done by firmware and this may
* lead problems if firmware expects those bytes are used.
+ *
+ * TODO: Here is few hacks. AF9035 chip integrates AF9033 demodulator.
+ * IT9135 chip integrates AF9033 demodulator and RF tuner. For dual
+ * tuner devices, there is also external AF9033 demodulator connected
+ * via external I2C bus. All AF9033 demod I2C traffic, both single and
+ * dual tuner configuration, is covered by firmware - actual USB IO
+ * looks just like a memory access.
+ * In case of IT913x chip, there is own tuner driver. It is implemented
+ * currently as a I2C driver, even tuner IP block is likely build
+ * directly into the demodulator memory space and there is no own I2C
+ * bus. I2C subsystem does not allow register multiple devices to same
+ * bus, having same slave address. Due to that we reuse demod address,
+ * shifted by one bit, on that case.
*/
if (num == 2 && !(msg[0].flags & I2C_M_RD) &&
(msg[1].flags & I2C_M_RD)) {
@@ -312,12 +325,14 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
} else if ((msg[0].addr == state->af9033_config[0].i2c_addr) ||
- (msg[0].addr == state->af9033_config[1].i2c_addr)) {
+ (msg[0].addr == state->af9033_config[1].i2c_addr) ||
+ (state->chip_type == 0x9135)) {
/* demod access via firmware interface */
u32 reg = msg[0].buf[0] << 16 | msg[0].buf[1] << 8 |
msg[0].buf[2];
- if (msg[0].addr == state->af9033_config[1].i2c_addr)
+ if (msg[0].addr == state->af9033_config[1].i2c_addr ||
+ msg[0].addr == (state->af9033_config[1].i2c_addr >> 1))
reg |= 0x100000;
ret = af9035_rd_regs(d, reg, &msg[1].buf[0],
@@ -349,12 +364,14 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
} else if ((msg[0].addr == state->af9033_config[0].i2c_addr) ||
- (msg[0].addr == state->af9033_config[1].i2c_addr)) {
+ (msg[0].addr == state->af9033_config[1].i2c_addr) ||
+ (state->chip_type == 0x9135)) {
/* demod access via firmware interface */
u32 reg = msg[0].buf[0] << 16 | msg[0].buf[1] << 8 |
msg[0].buf[2];
- if (msg[0].addr == state->af9033_config[1].i2c_addr)
+ if (msg[0].addr == state->af9033_config[1].i2c_addr ||
+ msg[0].addr == (state->af9033_config[1].i2c_addr >> 1))
reg |= 0x100000;
ret = af9035_wr_regs(d, reg, &msg[0].buf[3],
@@ -1066,6 +1083,8 @@ static int af9035_get_adapter_count(struct dvb_usb_device *d)
return state->dual_mode + 1;
}
+static void af9035_exit(struct dvb_usb_device *d);
+
static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
{
struct state *state = adap_to_priv(adap);
@@ -1080,9 +1099,14 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
goto err;
}
- /* attach demodulator */
- adap->fe[0] = dvb_attach(af9033_attach, &state->af9033_config[adap->id],
- &d->i2c_adap, &state->ops);
+ state->af9033_config[adap->id].fe = &adap->fe[0];
+ state->af9033_config[adap->id].ops = &state->ops;
+ ret = af9035_add_i2c_dev(d, "af9033",
+ state->af9033_config[adap->id].i2c_addr,
+ &state->af9033_config[adap->id]);
+ if (ret)
+ goto err;
+
if (adap->fe[0] == NULL) {
ret = -ENODEV;
goto err;
@@ -1095,6 +1119,7 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
return 0;
err:
+ af9035_exit(d); /* remove I2C clients */
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
return ret;
@@ -1332,7 +1357,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
}
ret = af9035_add_i2c_dev(d, "it913x",
- state->af9033_config[adap->id].i2c_addr,
+ state->af9033_config[adap->id].i2c_addr >> 1,
&it913x_config);
if (ret)
goto err;
@@ -1357,7 +1382,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
}
ret = af9035_add_i2c_dev(d, "it913x",
- state->af9033_config[adap->id].i2c_addr,
+ state->af9033_config[adap->id].i2c_addr >> 1,
&it913x_config);
if (ret)
goto err;
@@ -1377,6 +1402,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
return 0;
err:
+ af9035_exit(d); /* remove I2C clients */
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
return ret;
@@ -1435,6 +1461,12 @@ static void af9035_exit(struct dvb_usb_device *d)
dev_dbg(&d->udev->dev, "%s:\n", __func__);
+ if (state->i2c_client[3])
+ af9035_del_i2c_dev(d);
+
+ if (state->i2c_client[2])
+ af9035_del_i2c_dev(d);
+
if (state->i2c_client[1])
af9035_del_i2c_dev(d);
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h
index 0911c4fc..2196077 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.h
+++ b/drivers/media/usb/dvb-usb-v2/af9035.h
@@ -63,7 +63,7 @@ struct state {
u16 eeprom_addr;
struct af9033_config af9033_config[2];
struct af9033_ops ops;
- #define AF9035_I2C_CLIENT_MAX 2
+ #define AF9035_I2C_CLIENT_MAX 4
struct i2c_client *i2c_client[AF9035_I2C_CLIENT_MAX];
};
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 25/37] af9033: clean up logging
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (22 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 24/37] af9033: convert to I2C client Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 26/37] af9035: few small I2C master xfer changes Antti Palosaari
` (11 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
It uses I2C client so logging system prints module name
automatically. Function name is also added automatically, if it is
requested from dynamic debug by setting proper format.
Because of that, we could simplify logging in our driver.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 98 +++++++++++++++++-------------------
1 file changed, 46 insertions(+), 52 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index c40ae49..1bd5a9a 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -55,8 +55,8 @@ static int af9033_wr_regs(struct af9033_dev *dev, u32 reg, const u8 *val,
if (3 + len > sizeof(buf)) {
dev_warn(&dev->client->dev,
- "%s: i2c wr reg=%04x: len=%d is too big!\n",
- KBUILD_MODNAME, reg, len);
+ "i2c wr reg=%04x: len=%d is too big!\n",
+ reg, len);
return -EINVAL;
}
@@ -69,9 +69,8 @@ static int af9033_wr_regs(struct af9033_dev *dev, u32 reg, const u8 *val,
if (ret == 1) {
ret = 0;
} else {
- dev_warn(&dev->client->dev,
- "%s: i2c wr failed=%d reg=%06x len=%d\n",
- KBUILD_MODNAME, ret, reg, len);
+ dev_warn(&dev->client->dev, "i2c wr failed=%d reg=%06x len=%d\n",
+ ret, reg, len);
ret = -EREMOTEIO;
}
@@ -102,9 +101,8 @@ static int af9033_rd_regs(struct af9033_dev *dev, u32 reg, u8 *val, int len)
if (ret == 2) {
ret = 0;
} else {
- dev_warn(&dev->client->dev,
- "%s: i2c rd failed=%d reg=%06x len=%d\n",
- KBUILD_MODNAME, ret, reg, len);
+ dev_warn(&dev->client->dev, "i2c rd failed=%d reg=%06x len=%d\n",
+ ret, reg, len);
ret = -EREMOTEIO;
}
@@ -176,11 +174,10 @@ static int af9033_wr_reg_val_tab(struct af9033_dev *dev,
int ret, i, j;
u8 buf[1 + MAX_TAB_LEN];
- dev_dbg(&dev->client->dev, "%s: tab_len=%d\n", __func__, tab_len);
+ dev_dbg(&dev->client->dev, "tab_len=%d\n", tab_len);
if (tab_len > sizeof(buf)) {
- dev_warn(&dev->client->dev, "%s: tab len %d is too big\n",
- KBUILD_MODNAME, tab_len);
+ dev_warn(&dev->client->dev, "tab len %d is too big\n", tab_len);
return -EINVAL;
}
@@ -201,7 +198,7 @@ static int af9033_wr_reg_val_tab(struct af9033_dev *dev,
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -210,7 +207,7 @@ static u32 af9033_div(struct af9033_dev *dev, u32 a, u32 b, u32 x)
{
u32 r = 0, c = 0, i;
- dev_dbg(&dev->client->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x);
+ dev_dbg(&dev->client->dev, "a=%d b=%d x=%d\n", a, b, x);
if (a > b) {
c = a / b;
@@ -227,8 +224,7 @@ static u32 af9033_div(struct af9033_dev *dev, u32 a, u32 b, u32 x)
}
r = (c << (u32)x) + r;
- dev_dbg(&dev->client->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n",
- __func__, a, b, x, r, r);
+ dev_dbg(&dev->client->dev, "a=%d b=%d x=%d r=%d r=%x\n", a, b, x, r, r);
return r;
}
@@ -276,8 +272,8 @@ static int af9033_init(struct dvb_frontend *fe)
buf[2] = (clock_cw >> 16) & 0xff;
buf[3] = (clock_cw >> 24) & 0xff;
- dev_dbg(&dev->client->dev, "%s: clock=%d clock_cw=%08x\n",
- __func__, dev->cfg.clock, clock_cw);
+ dev_dbg(&dev->client->dev, "clock=%d clock_cw=%08x\n",
+ dev->cfg.clock, clock_cw);
ret = af9033_wr_regs(dev, 0x800025, buf, 4);
if (ret < 0)
@@ -294,8 +290,8 @@ static int af9033_init(struct dvb_frontend *fe)
buf[1] = (adc_cw >> 8) & 0xff;
buf[2] = (adc_cw >> 16) & 0xff;
- dev_dbg(&dev->client->dev, "%s: adc=%d adc_cw=%06x\n",
- __func__, clock_adc_lut[i].adc, adc_cw);
+ dev_dbg(&dev->client->dev, "adc=%d adc_cw=%06x\n",
+ clock_adc_lut[i].adc, adc_cw);
ret = af9033_wr_regs(dev, 0x80f1cd, buf, 3);
if (ret < 0)
@@ -336,7 +332,7 @@ static int af9033_init(struct dvb_frontend *fe)
}
/* load OFSM settings */
- dev_dbg(&dev->client->dev, "%s: load ofsm settings\n", __func__);
+ dev_dbg(&dev->client->dev, "load ofsm settings\n");
switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
@@ -361,8 +357,7 @@ static int af9033_init(struct dvb_frontend *fe)
goto err;
/* load tuner specific settings */
- dev_dbg(&dev->client->dev, "%s: load tuner specific settings\n",
- __func__);
+ dev_dbg(&dev->client->dev, "load tuner specific settings\n");
switch (dev->cfg.tuner) {
case AF9033_TUNER_TUA9001:
len = ARRAY_SIZE(tuner_init_tua9001);
@@ -413,8 +408,8 @@ static int af9033_init(struct dvb_frontend *fe)
init = tuner_init_it9135_62;
break;
default:
- dev_dbg(&dev->client->dev, "%s: unsupported tuner ID=%d\n",
- __func__, dev->cfg.tuner);
+ dev_dbg(&dev->client->dev, "unsupported tuner ID=%d\n",
+ dev->cfg.tuner);
ret = -ENODEV;
goto err;
}
@@ -451,7 +446,7 @@ static int af9033_init(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -478,7 +473,7 @@ static int af9033_sleep(struct dvb_frontend *fe)
usleep_range(200, 10000);
}
- dev_dbg(&dev->client->dev, "%s: loop=%d\n", __func__, i);
+ dev_dbg(&dev->client->dev, "loop=%d\n", i);
if (i == 0) {
ret = -ETIMEDOUT;
@@ -504,7 +499,7 @@ static int af9033_sleep(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -528,8 +523,8 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
u8 tmp, buf[3], bandwidth_reg_val;
u32 if_frequency, freq_cw, adc_freq;
- dev_dbg(&dev->client->dev, "%s: frequency=%d bandwidth_hz=%d\n",
- __func__, c->frequency, c->bandwidth_hz);
+ dev_dbg(&dev->client->dev, "frequency=%d bandwidth_hz=%d\n",
+ c->frequency, c->bandwidth_hz);
/* check bandwidth */
switch (c->bandwidth_hz) {
@@ -543,8 +538,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
bandwidth_reg_val = 0x02;
break;
default:
- dev_dbg(&dev->client->dev, "%s: invalid bandwidth_hz\n",
- __func__);
+ dev_dbg(&dev->client->dev, "invalid bandwidth_hz\n");
ret = -EINVAL;
goto err;
}
@@ -646,7 +640,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -658,7 +652,7 @@ static int af9033_get_frontend(struct dvb_frontend *fe)
int ret;
u8 buf[8];
- dev_dbg(&dev->client->dev, "%s:\n", __func__);
+ dev_dbg(&dev->client->dev, "\n");
/* read all needed registers */
ret = af9033_rd_regs(dev, 0x80f900, buf, sizeof(buf));
@@ -773,7 +767,7 @@ static int af9033_get_frontend(struct dvb_frontend *fe)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -819,7 +813,7 @@ static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -873,7 +867,7 @@ static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -895,7 +889,7 @@ static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -941,7 +935,7 @@ static int af9033_update_ch_stat(struct af9033_dev *dev)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -979,7 +973,7 @@ static int af9033_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&dev->client->dev, "%s: enable=%d\n", __func__, enable);
+ dev_dbg(&dev->client->dev, "enable=%d\n", enable);
ret = af9033_wr_reg_mask(dev, 0x00fa04, enable, 0x01);
if (ret < 0)
@@ -988,7 +982,7 @@ static int af9033_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -998,7 +992,7 @@ static int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&dev->client->dev, "%s: onoff=%d\n", __func__, onoff);
+ dev_dbg(&dev->client->dev, "onoff=%d\n", onoff);
ret = af9033_wr_reg_mask(dev, 0x80f993, onoff, 0x01);
if (ret < 0)
@@ -1007,7 +1001,7 @@ static int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -1019,8 +1013,8 @@ static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
int ret;
u8 wbuf[2] = {(pid >> 0) & 0xff, (pid >> 8) & 0xff};
- dev_dbg(&dev->client->dev, "%s: index=%d pid=%04x onoff=%d\n",
- __func__, index, pid, onoff);
+ dev_dbg(&dev->client->dev, "index=%d pid=%04x onoff=%d\n",
+ index, pid, onoff);
if (pid > 0x1fff)
return 0;
@@ -1040,7 +1034,7 @@ static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -1110,8 +1104,8 @@ static int af9033_probe(struct i2c_client *client,
if (dev->cfg.clock != 12000000) {
ret = -ENODEV;
dev_err(&dev->client->dev,
- "%s: af9033: unsupported clock=%d, only 12000000 Hz is supported currently\n",
- KBUILD_MODNAME, dev->cfg.clock);
+ "unsupported clock %d Hz, only 12000000 Hz is supported currently\n",
+ dev->cfg.clock);
goto err_kfree;
}
@@ -1139,9 +1133,9 @@ static int af9033_probe(struct i2c_client *client,
goto err_kfree;
dev_info(&dev->client->dev,
- "%s: firmware version: LINK=%d.%d.%d.%d OFDM=%d.%d.%d.%d\n",
- KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3], buf[4],
- buf[5], buf[6], buf[7]);
+ "firmware version: LINK %d.%d.%d.%d - OFDM %d.%d.%d.%d\n",
+ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6],
+ buf[7]);
/* sleep */
switch (dev->cfg.tuner) {
@@ -1192,7 +1186,7 @@ static int af9033_probe(struct i2c_client *client,
err_kfree:
kfree(dev);
err:
- dev_dbg(&client->dev, "failed %d\n", ret);
+ dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}
@@ -1200,7 +1194,7 @@ static int af9033_remove(struct i2c_client *client)
{
struct af9033_dev *dev = i2c_get_clientdata(client);
- dev_dbg(&client->dev, "%s\n", __func__);
+ dev_dbg(&dev->client->dev, "\n");
dev->fe.ops.release = NULL;
dev->fe.demodulator_priv = NULL;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 26/37] af9035: few small I2C master xfer changes
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (23 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 25/37] af9033: clean up logging Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 27/37] af9033: remove I2C addr from config Antti Palosaari
` (10 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Biggest problem of that function is complexity. Try reduce complexity:
* define macros to detect all 3 supported xfers
* remove duplicate message maximum size checks
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 37 +++++++++++++----------------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 6534e44..ec62133 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -319,8 +319,14 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
* bus, having same slave address. Due to that we reuse demod address,
* shifted by one bit, on that case.
*/
- if (num == 2 && !(msg[0].flags & I2C_M_RD) &&
- (msg[1].flags & I2C_M_RD)) {
+#define AF9035_IS_I2C_XFER_WRITE_READ(_msg, _num) \
+ (_num == 2 && !(_msg[0].flags & I2C_M_RD) && (_msg[1].flags & I2C_M_RD))
+#define AF9035_IS_I2C_XFER_WRITE(_msg, _num) \
+ (_num == 1 && !(_msg[0].flags & I2C_M_RD))
+#define AF9035_IS_I2C_XFER_READ(_msg, _num) \
+ (_num == 1 && (_msg[0].flags & I2C_M_RD))
+
+ if (AF9035_IS_I2C_XFER_WRITE_READ(msg, num)) {
if (msg[0].len > 40 || msg[1].len > 40) {
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
@@ -338,18 +344,11 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
ret = af9035_rd_regs(d, reg, &msg[1].buf[0],
msg[1].len);
} else {
- /* I2C */
+ /* I2C write + read */
u8 buf[MAX_XFER_SIZE];
struct usb_req req = { CMD_I2C_RD, 0, 5 + msg[0].len,
buf, msg[1].len, msg[1].buf };
- if (5 + msg[0].len > sizeof(buf)) {
- dev_warn(&d->udev->dev,
- "%s: i2c xfer: len=%d is too big!\n",
- KBUILD_MODNAME, msg[0].len);
- ret = -EOPNOTSUPP;
- goto unlock;
- }
req.mbox |= ((msg[0].addr & 0x80) >> 3);
buf[0] = msg[1].len;
buf[1] = msg[0].addr << 1;
@@ -359,7 +358,7 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
memcpy(&buf[5], msg[0].buf, msg[0].len);
ret = af9035_ctrl_msg(d, &req);
}
- } else if (num == 1 && !(msg[0].flags & I2C_M_RD)) {
+ } else if (AF9035_IS_I2C_XFER_WRITE(msg, num)) {
if (msg[0].len > 40) {
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
@@ -377,18 +376,11 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
ret = af9035_wr_regs(d, reg, &msg[0].buf[3],
msg[0].len - 3);
} else {
- /* I2C */
+ /* I2C write */
u8 buf[MAX_XFER_SIZE];
struct usb_req req = { CMD_I2C_WR, 0, 5 + msg[0].len,
buf, 0, NULL };
- if (5 + msg[0].len > sizeof(buf)) {
- dev_warn(&d->udev->dev,
- "%s: i2c xfer: len=%d is too big!\n",
- KBUILD_MODNAME, msg[0].len);
- ret = -EOPNOTSUPP;
- goto unlock;
- }
req.mbox |= ((msg[0].addr & 0x80) >> 3);
buf[0] = msg[0].len;
buf[1] = msg[0].addr << 1;
@@ -398,12 +390,12 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
memcpy(&buf[5], msg[0].buf, msg[0].len);
ret = af9035_ctrl_msg(d, &req);
}
- } else if (num == 1 && (msg[0].flags & I2C_M_RD)) {
+ } else if (AF9035_IS_I2C_XFER_READ(msg, num)) {
if (msg[0].len > 40) {
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
} else {
- /* I2C */
+ /* I2C read */
u8 buf[5];
struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf),
buf, msg[0].len, msg[0].buf };
@@ -418,14 +410,13 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
} else {
/*
* We support only three kind of I2C transactions:
- * 1) 1 x read + 1 x write (repeated start)
+ * 1) 1 x write + 1 x read (repeated start)
* 2) 1 x write
* 3) 1 x read
*/
ret = -EOPNOTSUPP;
}
-unlock:
mutex_unlock(&d->i2c_mutex);
if (ret < 0)
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 27/37] af9033: remove I2C addr from config
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (24 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 26/37] af9035: few small I2C master xfer changes Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 28/37] af9035: replace PCTV device model numbers with name Antti Palosaari
` (9 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
I2C driver address is passed as a i2c_new_device() parameter when
device is created. Thus no need to keep it in config struct.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.h | 9 ++++-----
drivers/media/usb/dvb-usb-v2/af9035.c | 29 ++++++++++++++---------------
drivers/media/usb/dvb-usb-v2/af9035.h | 1 +
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
index 1b968d0..6ad22b6 100644
--- a/drivers/media/dvb-frontends/af9033.h
+++ b/drivers/media/dvb-frontends/af9033.h
@@ -24,13 +24,12 @@
#include <linux/kconfig.h>
+/*
+ * I2C address (TODO: are these in 8-bit format?)
+ * 0x38, 0x3a, 0x3c, 0x3e
+ */
struct af9033_config {
/*
- * I2C address
- */
- u8 i2c_addr;
-
- /*
* clock Hz
* 12000000, 22000000, 24000000, 34000000, 32000000, 28000000, 26000000,
* 30000000, 36000000, 20480000, 16384000
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index ec62133..b491707 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -330,15 +330,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
if (msg[0].len > 40 || msg[1].len > 40) {
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
- } else if ((msg[0].addr == state->af9033_config[0].i2c_addr) ||
- (msg[0].addr == state->af9033_config[1].i2c_addr) ||
+ } else if ((msg[0].addr == state->af9033_i2c_addr[0]) ||
+ (msg[0].addr == state->af9033_i2c_addr[1]) ||
(state->chip_type == 0x9135)) {
/* demod access via firmware interface */
u32 reg = msg[0].buf[0] << 16 | msg[0].buf[1] << 8 |
msg[0].buf[2];
- if (msg[0].addr == state->af9033_config[1].i2c_addr ||
- msg[0].addr == (state->af9033_config[1].i2c_addr >> 1))
+ if (msg[0].addr == state->af9033_i2c_addr[1] ||
+ msg[0].addr == (state->af9033_i2c_addr[1] >> 1))
reg |= 0x100000;
ret = af9035_rd_regs(d, reg, &msg[1].buf[0],
@@ -362,15 +362,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
if (msg[0].len > 40) {
/* TODO: correct limits > 40 */
ret = -EOPNOTSUPP;
- } else if ((msg[0].addr == state->af9033_config[0].i2c_addr) ||
- (msg[0].addr == state->af9033_config[1].i2c_addr) ||
+ } else if ((msg[0].addr == state->af9033_i2c_addr[0]) ||
+ (msg[0].addr == state->af9033_i2c_addr[1]) ||
(state->chip_type == 0x9135)) {
/* demod access via firmware interface */
u32 reg = msg[0].buf[0] << 16 | msg[0].buf[1] << 8 |
msg[0].buf[2];
- if (msg[0].addr == state->af9033_config[1].i2c_addr ||
- msg[0].addr == (state->af9033_config[1].i2c_addr >> 1))
+ if (msg[0].addr == state->af9033_i2c_addr[1] ||
+ msg[0].addr == (state->af9033_i2c_addr[1] >> 1))
reg |= 0x100000;
ret = af9035_wr_regs(d, reg, &msg[0].buf[3],
@@ -736,8 +736,8 @@ static int af9035_read_config(struct dvb_usb_device *d)
u16 tmp16, addr;
/* demod I2C "address" */
- state->af9033_config[0].i2c_addr = 0x38;
- state->af9033_config[1].i2c_addr = 0x3a;
+ state->af9033_i2c_addr[0] = 0x38;
+ state->af9033_i2c_addr[1] = 0x3a;
state->af9033_config[0].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;
state->af9033_config[1].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;
state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
@@ -789,7 +789,7 @@ static int af9035_read_config(struct dvb_usb_device *d)
goto err;
if (tmp)
- state->af9033_config[1].i2c_addr = tmp;
+ state->af9033_i2c_addr[1] = tmp;
dev_dbg(&d->udev->dev, "%s: 2nd demod I2C addr=%02x\n",
__func__, tmp);
@@ -1092,8 +1092,7 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
state->af9033_config[adap->id].fe = &adap->fe[0];
state->af9033_config[adap->id].ops = &state->ops;
- ret = af9035_add_i2c_dev(d, "af9033",
- state->af9033_config[adap->id].i2c_addr,
+ ret = af9035_add_i2c_dev(d, "af9033", state->af9033_i2c_addr[adap->id],
&state->af9033_config[adap->id]);
if (ret)
goto err;
@@ -1348,7 +1347,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
}
ret = af9035_add_i2c_dev(d, "it913x",
- state->af9033_config[adap->id].i2c_addr >> 1,
+ state->af9033_i2c_addr[adap->id] >> 1,
&it913x_config);
if (ret)
goto err;
@@ -1373,7 +1372,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
}
ret = af9035_add_i2c_dev(d, "it913x",
- state->af9033_config[adap->id].i2c_addr >> 1,
+ state->af9033_i2c_addr[adap->id] >> 1,
&it913x_config);
if (ret)
goto err;
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h
index 2196077..edb3871 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.h
+++ b/drivers/media/usb/dvb-usb-v2/af9035.h
@@ -61,6 +61,7 @@ struct state {
u16 chip_type;
u8 dual_mode:1;
u16 eeprom_addr;
+ u8 af9033_i2c_addr[2];
struct af9033_config af9033_config[2];
struct af9033_ops ops;
#define AF9035_I2C_CLIENT_MAX 4
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 28/37] af9035: replace PCTV device model numbers with name
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (25 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 27/37] af9033: remove I2C addr from config Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 29/37] MAINTAINERS: IT913X driver filenames Antti Palosaari
` (8 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Use device names for recent PCTV Systems devices:
PCTV AndroiDTV (78e)
PCTV microStick (79e)
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index b491707..94563b2 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1728,9 +1728,9 @@ static const struct usb_device_id af9035_id_table[] = {
{ DVB_USB_DEVICE(USB_VID_HAUPPAUGE, 0xf900,
&af9035_props, "Hauppauge WinTV-MiniStick 2", NULL) },
{ DVB_USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_78E,
- &af9035_props, "PCTV 78e", RC_MAP_IT913X_V1) },
+ &af9035_props, "PCTV AndroiDTV (78e)", RC_MAP_IT913X_V1) },
{ DVB_USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_79E,
- &af9035_props, "PCTV 79e", RC_MAP_IT913X_V2) },
+ &af9035_props, "PCTV microStick (79e)", RC_MAP_IT913X_V2) },
{ }
};
MODULE_DEVICE_TABLE(usb, af9035_id_table);
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 29/37] MAINTAINERS: IT913X driver filenames
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (26 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 28/37] af9035: replace PCTV device model numbers with name Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 30/37] af9033: implement DVBv5 statistic for signal strength Antti Palosaari
` (7 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
I removed tuner_ prefix from the driver file names. Update
maintainers entry according to that.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index aefa948..182a4a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5033,7 +5033,7 @@ W: http://palosaari.fi/linux/
Q: http://patchwork.linuxtv.org/project/linux-media/list/
T: git git://linuxtv.org/anttip/media_tree.git
S: Maintained
-F: drivers/media/tuners/tuner_it913x*
+F: drivers/media/tuners/it913x*
IVTV VIDEO4LINUX DRIVER
M: Andy Walls <awalls@md.metrocast.net>
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 30/37] af9033: implement DVBv5 statistic for signal strength
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (27 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 29/37] MAINTAINERS: IT913X driver filenames Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 31/37] af9033: implement DVBv5 statistic for CNR Antti Palosaari
` (6 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Let the demod firmware estimate RF signal strength and return it
to the app as a dBm. To handle that, use thread which reads signal
strengths from firmware in 2 sec intervals when device is active.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 48 ++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 1bd5a9a..b9a0b00 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -28,13 +28,17 @@ struct af9033_dev {
struct i2c_client *client;
struct dvb_frontend fe;
struct af9033_config cfg;
+ bool is_af9035;
+ bool is_it9135;
u32 bandwidth_hz;
bool ts_mode_parallel;
bool ts_mode_serial;
+ fe_status_t fe_status;
u32 ber;
u32 ucb;
+ struct delayed_work stat_work;
unsigned long last_stat_check;
};
@@ -442,6 +446,8 @@ static int af9033_init(struct dvb_frontend *fe)
}
dev->bandwidth_hz = 0; /* force to program all parameters */
+ /* start statistics polling */
+ schedule_delayed_work(&dev->stat_work, msecs_to_jiffies(2000));
return 0;
@@ -457,6 +463,9 @@ static int af9033_sleep(struct dvb_frontend *fe)
int ret, i;
u8 tmp;
+ /* stop statistics polling */
+ cancel_delayed_work_sync(&dev->stat_work);
+
ret = af9033_wr_reg(dev, 0x80004c, 1);
if (ret < 0)
goto err;
@@ -810,6 +819,8 @@ static int af9033_read_status(struct dvb_frontend *fe, fe_status_t *status)
FE_HAS_LOCK;
}
+ dev->fe_status = *status;
+
return 0;
err:
@@ -1039,6 +1050,40 @@ err:
return ret;
}
+static void af9033_stat_work(struct work_struct *work)
+{
+ struct af9033_dev *dev = container_of(work, struct af9033_dev, stat_work.work);
+ struct dtv_frontend_properties *c = &dev->fe.dtv_property_cache;
+ int ret, tmp;
+ u8 u8tmp;
+
+ dev_dbg(&dev->client->dev, "\n");
+
+ if (dev->fe_status & FE_HAS_SIGNAL) {
+ if (dev->is_af9035) {
+ ret = af9033_rd_reg(dev, 0x80004a, &u8tmp);
+ tmp = -u8tmp * 1000;
+ } else {
+ ret = af9033_rd_reg(dev, 0x8000f7, &u8tmp);
+ tmp = (u8tmp - 100) * 1000;
+ }
+ if (ret)
+ goto err;
+
+ c->strength.len = 1;
+ c->strength.stat[0].scale = FE_SCALE_DECIBEL;
+ c->strength.stat[0].svalue = tmp;
+ } else {
+ c->strength.len = 1;
+ c->strength.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
+ }
+
+ schedule_delayed_work(&dev->stat_work, msecs_to_jiffies(2000));
+ return;
+err:
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+}
+
static struct dvb_frontend_ops af9033_ops = {
.delsys = { SYS_DVBT },
.info = {
@@ -1099,6 +1144,7 @@ static int af9033_probe(struct i2c_client *client,
/* setup the state */
dev->client = client;
+ INIT_DELAYED_WORK(&dev->stat_work, af9033_stat_work);
memcpy(&dev->cfg, cfg, sizeof(struct af9033_config));
if (dev->cfg.clock != 12000000) {
@@ -1117,9 +1163,11 @@ static int af9033_probe(struct i2c_client *client,
case AF9033_TUNER_IT9135_60:
case AF9033_TUNER_IT9135_61:
case AF9033_TUNER_IT9135_62:
+ dev->is_it9135 = true;
reg = 0x004bfc;
break;
default:
+ dev->is_af9035 = true;
reg = 0x0083e9;
break;
}
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 31/37] af9033: implement DVBv5 statistic for CNR
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (28 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 30/37] af9033: implement DVBv5 statistic for signal strength Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 32/37] af9033: wrap DVBv3 read SNR to DVBv5 CNR Antti Palosaari
` (5 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Return CNR via DVBv5 statistic API.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 54 ++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index b9a0b00..576e9b5 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -1054,11 +1054,12 @@ static void af9033_stat_work(struct work_struct *work)
{
struct af9033_dev *dev = container_of(work, struct af9033_dev, stat_work.work);
struct dtv_frontend_properties *c = &dev->fe.dtv_property_cache;
- int ret, tmp;
- u8 u8tmp;
+ int ret, tmp, i, len;
+ u8 u8tmp, buf[3];
dev_dbg(&dev->client->dev, "\n");
+ /* signal strength */
if (dev->fe_status & FE_HAS_SIGNAL) {
if (dev->is_af9035) {
ret = af9033_rd_reg(dev, 0x80004a, &u8tmp);
@@ -1078,6 +1079,55 @@ static void af9033_stat_work(struct work_struct *work)
c->strength.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
}
+ /* CNR */
+ if (dev->fe_status & FE_HAS_VITERBI) {
+ u32 snr_val;
+ const struct val_snr *snr_lut;
+
+ /* read value */
+ ret = af9033_rd_regs(dev, 0x80002c, buf, 3);
+ if (ret)
+ goto err;
+
+ snr_val = (buf[2] << 16) | (buf[1] << 8) | (buf[0] << 0);
+
+ /* read current modulation */
+ ret = af9033_rd_reg(dev, 0x80f903, &u8tmp);
+ if (ret)
+ goto err;
+
+ switch ((u8tmp >> 0) & 3) {
+ case 0:
+ len = ARRAY_SIZE(qpsk_snr_lut);
+ snr_lut = qpsk_snr_lut;
+ break;
+ case 1:
+ len = ARRAY_SIZE(qam16_snr_lut);
+ snr_lut = qam16_snr_lut;
+ break;
+ case 2:
+ len = ARRAY_SIZE(qam64_snr_lut);
+ snr_lut = qam64_snr_lut;
+ break;
+ default:
+ goto err_schedule_delayed_work;
+ }
+
+ for (i = 0; i < len; i++) {
+ tmp = snr_lut[i].snr * 1000;
+ if (snr_val < snr_lut[i].val)
+ break;
+ }
+
+ c->cnr.len = 1;
+ c->cnr.stat[0].scale = FE_SCALE_DECIBEL;
+ c->cnr.stat[0].svalue = tmp;
+ } else {
+ c->cnr.len = 1;
+ c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
+ }
+
+err_schedule_delayed_work:
schedule_delayed_work(&dev->stat_work, msecs_to_jiffies(2000));
return;
err:
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 32/37] af9033: wrap DVBv3 read SNR to DVBv5 CNR
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (29 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 31/37] af9033: implement DVBv5 statistic for CNR Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 33/37] af9033: implement DVBv5 stat block counters Antti Palosaari
` (4 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Remove 'duplicate' DVBv3 read SNR implementation and return value,
calculated already by DVBv5 CNR, from the cache.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 52 ++++---------------------------
drivers/media/dvb-frontends/af9033_priv.h | 1 +
2 files changed, 7 insertions(+), 46 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 576e9b5..4c20616 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -832,55 +832,15 @@ err:
static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
{
struct af9033_dev *dev = fe->demodulator_priv;
- int ret, i, len;
- u8 buf[3], tmp;
- u32 snr_val;
- const struct val_snr *snr_lut;
-
- /* read value */
- ret = af9033_rd_regs(dev, 0x80002c, buf, 3);
- if (ret < 0)
- goto err;
-
- snr_val = (buf[2] << 16) | (buf[1] << 8) | buf[0];
-
- /* read current modulation */
- ret = af9033_rd_reg(dev, 0x80f903, &tmp);
- if (ret < 0)
- goto err;
-
- switch ((tmp >> 0) & 3) {
- case 0:
- len = ARRAY_SIZE(qpsk_snr_lut);
- snr_lut = qpsk_snr_lut;
- break;
- case 1:
- len = ARRAY_SIZE(qam16_snr_lut);
- snr_lut = qam16_snr_lut;
- break;
- case 2:
- len = ARRAY_SIZE(qam64_snr_lut);
- snr_lut = qam64_snr_lut;
- break;
- default:
- goto err;
- }
-
- for (i = 0; i < len; i++) {
- tmp = snr_lut[i].snr;
-
- if (snr_val < snr_lut[i].val)
- break;
- }
+ struct dtv_frontend_properties *c = &dev->fe.dtv_property_cache;
- *snr = tmp * 10; /* dB/10 */
+ /* use DVBv5 CNR */
+ if (c->cnr.stat[0].scale == FE_SCALE_DECIBEL)
+ *snr = div_s64(c->cnr.stat[0].svalue, 100); /* 1000x => 10x */
+ else
+ *snr = 0;
return 0;
-
-err:
- dev_dbg(&dev->client->dev, "failed=%d\n", ret);
-
- return ret;
}
static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
diff --git a/drivers/media/dvb-frontends/af9033_priv.h b/drivers/media/dvb-frontends/af9033_priv.h
index ded7b67..c12c92c 100644
--- a/drivers/media/dvb-frontends/af9033_priv.h
+++ b/drivers/media/dvb-frontends/af9033_priv.h
@@ -24,6 +24,7 @@
#include "dvb_frontend.h"
#include "af9033.h"
+#include <linux/math64.h>
struct reg_val {
u32 reg;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 33/37] af9033: implement DVBv5 stat block counters
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (30 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 32/37] af9033: wrap DVBv3 read SNR to DVBv5 CNR Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 34/37] af9033: implement DVBv5 post-Viterbi BER Antti Palosaari
` (3 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Implement following API commands:
DTV_STAT_ERROR_BLOCK_COUNT
DTV_STAT_TOTAL_BLOCK_COUNT
These returns total and uncorrected error packets from outer FEC.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 4c20616..7b85346 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -38,6 +38,8 @@ struct af9033_dev {
fe_status_t fe_status;
u32 ber;
u32 ucb;
+ u64 error_block_count;
+ u64 total_block_count;
struct delayed_work stat_work;
unsigned long last_stat_check;
};
@@ -1015,7 +1017,7 @@ static void af9033_stat_work(struct work_struct *work)
struct af9033_dev *dev = container_of(work, struct af9033_dev, stat_work.work);
struct dtv_frontend_properties *c = &dev->fe.dtv_property_cache;
int ret, tmp, i, len;
- u8 u8tmp, buf[3];
+ u8 u8tmp, buf[7];
dev_dbg(&dev->client->dev, "\n");
@@ -1087,6 +1089,35 @@ static void af9033_stat_work(struct work_struct *work)
c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
}
+ /* UCB/PER/BER */
+ if (dev->fe_status & FE_HAS_LOCK) {
+ /* outer FEC, 204 byte packets */
+ u16 abort_packet_count, rsd_packet_count;
+
+ /*
+ * Packet count used for measurement is 10000
+ * (rsd_packet_count). Maybe it should be increased?
+ */
+
+ ret = af9033_rd_regs(dev, 0x800032, buf, 7);
+ if (ret)
+ goto err;
+
+ abort_packet_count = (buf[1] << 8) | (buf[0] << 0);
+ rsd_packet_count = (buf[6] << 8) | (buf[5] << 0);
+
+ dev->error_block_count += abort_packet_count;
+ dev->total_block_count += rsd_packet_count;
+
+ c->block_count.len = 1;
+ c->block_count.stat[0].scale = FE_SCALE_COUNTER;
+ c->block_count.stat[0].uvalue = dev->total_block_count;
+
+ c->block_error.len = 1;
+ c->block_error.stat[0].scale = FE_SCALE_COUNTER;
+ c->block_error.stat[0].uvalue = dev->error_block_count;
+ }
+
err_schedule_delayed_work:
schedule_delayed_work(&dev->stat_work, msecs_to_jiffies(2000));
return;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 34/37] af9033: implement DVBv5 post-Viterbi BER
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (31 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 33/37] af9033: implement DVBv5 stat block counters Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 35/37] af9033: wrap DVBv3 UCB to DVBv5 UCB stats Antti Palosaari
` (2 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Implement following DTV API commands:
DTV_STAT_POST_ERROR_BIT_COUNT
DTV_STAT_POST_TOTAL_BIT_COUNT
These will provide post-Viterbi bit error rate reporting.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 7b85346..b6b90e6 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -38,6 +38,8 @@ struct af9033_dev {
fe_status_t fe_status;
u32 ber;
u32 ucb;
+ u64 post_bit_error;
+ u64 post_bit_count;
u64 error_block_count;
u64 total_block_count;
struct delayed_work stat_work;
@@ -1093,6 +1095,8 @@ static void af9033_stat_work(struct work_struct *work)
if (dev->fe_status & FE_HAS_LOCK) {
/* outer FEC, 204 byte packets */
u16 abort_packet_count, rsd_packet_count;
+ /* inner FEC, bits */
+ u32 rsd_bit_err_count;
/*
* Packet count used for measurement is 10000
@@ -1104,10 +1108,13 @@ static void af9033_stat_work(struct work_struct *work)
goto err;
abort_packet_count = (buf[1] << 8) | (buf[0] << 0);
+ rsd_bit_err_count = (buf[4] << 16) | (buf[3] << 8) | buf[2];
rsd_packet_count = (buf[6] << 8) | (buf[5] << 0);
dev->error_block_count += abort_packet_count;
dev->total_block_count += rsd_packet_count;
+ dev->post_bit_error += rsd_bit_err_count;
+ dev->post_bit_count += rsd_packet_count * 204 * 8;
c->block_count.len = 1;
c->block_count.stat[0].scale = FE_SCALE_COUNTER;
@@ -1116,6 +1123,14 @@ static void af9033_stat_work(struct work_struct *work)
c->block_error.len = 1;
c->block_error.stat[0].scale = FE_SCALE_COUNTER;
c->block_error.stat[0].uvalue = dev->error_block_count;
+
+ c->post_bit_count.len = 1;
+ c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;
+ c->post_bit_count.stat[0].uvalue = dev->post_bit_count;
+
+ c->post_bit_error.len = 1;
+ c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
+ c->post_bit_error.stat[0].uvalue = dev->post_bit_error;
}
err_schedule_delayed_work:
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 35/37] af9033: wrap DVBv3 UCB to DVBv5 UCB stats
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (32 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 34/37] af9033: implement DVBv5 post-Viterbi BER Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 36/37] af9033: wrap DVBv3 BER to DVBv5 BER Antti Palosaari
2014-09-04 2:36 ` [PATCH 37/37] af9033: remove all DVBv3 stat calculation logic Antti Palosaari
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Remove 'duplicate' DVBv3 read UCB implementation and return value,
calculated already for DVBv5 statistics.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index b6b90e6..673d60e 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -932,14 +932,8 @@ static int af9033_read_ber(struct dvb_frontend *fe, u32 *ber)
static int af9033_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
struct af9033_dev *dev = fe->demodulator_priv;
- int ret;
-
- ret = af9033_update_ch_stat(dev);
- if (ret < 0)
- return ret;
-
- *ucblocks = dev->ucb;
+ *ucblocks = dev->error_block_count;
return 0;
}
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 36/37] af9033: wrap DVBv3 BER to DVBv5 BER
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (33 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 35/37] af9033: wrap DVBv3 UCB to DVBv5 UCB stats Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
2014-09-04 2:36 ` [PATCH 37/37] af9033: remove all DVBv3 stat calculation logic Antti Palosaari
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
DVBv5 BER is calculated anyway, so just return it for legacy
read_ber() API too.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 673d60e..f5267fd 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -38,6 +38,7 @@ struct af9033_dev {
fe_status_t fe_status;
u32 ber;
u32 ucb;
+ u64 post_bit_error_prev; /* for old read_ber we return (curr - prev) */
u64 post_bit_error;
u64 post_bit_count;
u64 error_block_count;
@@ -918,13 +919,9 @@ err:
static int af9033_read_ber(struct dvb_frontend *fe, u32 *ber)
{
struct af9033_dev *dev = fe->demodulator_priv;
- int ret;
-
- ret = af9033_update_ch_stat(dev);
- if (ret < 0)
- return ret;
- *ber = dev->ber;
+ *ber = (dev->post_bit_error - dev->post_bit_error_prev);
+ dev->post_bit_error_prev = dev->post_bit_error;
return 0;
}
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 37/37] af9033: remove all DVBv3 stat calculation logic
2014-09-04 2:36 [PATCH 01/37] af9033: provide dyn0_clk clock source Antti Palosaari
` (34 preceding siblings ...)
2014-09-04 2:36 ` [PATCH 36/37] af9033: wrap DVBv3 BER to DVBv5 BER Antti Palosaari
@ 2014-09-04 2:36 ` Antti Palosaari
35 siblings, 0 replies; 37+ messages in thread
From: Antti Palosaari @ 2014-09-04 2:36 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Statistics are now calculated for DVBv5 and those DVBv5 values are
returned for legacy DVBv3 calls also. So we could remove all old
statistics calculation logic.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/dvb-frontends/af9033.c | 49 ------------------------------------
1 file changed, 49 deletions(-)
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index f5267fd..be5002a 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -36,15 +36,12 @@ struct af9033_dev {
bool ts_mode_serial;
fe_status_t fe_status;
- u32 ber;
- u32 ucb;
u64 post_bit_error_prev; /* for old read_ber we return (curr - prev) */
u64 post_bit_error;
u64 post_bit_count;
u64 error_block_count;
u64 total_block_count;
struct delayed_work stat_work;
- unsigned long last_stat_check;
};
/* write multiple registers */
@@ -870,52 +867,6 @@ err:
return ret;
}
-static int af9033_update_ch_stat(struct af9033_dev *dev)
-{
- int ret = 0;
- u32 err_cnt, bit_cnt;
- u16 abort_cnt;
- u8 buf[7];
-
- /* only update data every half second */
- if (time_after(jiffies, dev->last_stat_check + msecs_to_jiffies(500))) {
- ret = af9033_rd_regs(dev, 0x800032, buf, sizeof(buf));
- if (ret < 0)
- goto err;
- /* in 8 byte packets? */
- abort_cnt = (buf[1] << 8) + buf[0];
- /* in bits */
- err_cnt = (buf[4] << 16) + (buf[3] << 8) + buf[2];
- /* in 8 byte packets? always(?) 0x2710 = 10000 */
- bit_cnt = (buf[6] << 8) + buf[5];
-
- if (bit_cnt < abort_cnt) {
- abort_cnt = 1000;
- dev->ber = 0xffffffff;
- } else {
- /*
- * 8 byte packets, that have not been rejected already
- */
- bit_cnt -= (u32)abort_cnt;
- if (bit_cnt == 0) {
- dev->ber = 0xffffffff;
- } else {
- err_cnt -= (u32)abort_cnt * 8 * 8;
- bit_cnt *= 8 * 8;
- dev->ber = err_cnt * (0xffffffff / bit_cnt);
- }
- }
- dev->ucb += abort_cnt;
- dev->last_stat_check = jiffies;
- }
-
- return 0;
-err:
- dev_dbg(&dev->client->dev, "failed=%d\n", ret);
-
- return ret;
-}
-
static int af9033_read_ber(struct dvb_frontend *fe, u32 *ber)
{
struct af9033_dev *dev = fe->demodulator_priv;
--
http://palosaari.fi/
^ permalink raw reply related [flat|nested] 37+ messages in thread