system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-01 00:39:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] mn88473: convert driver to I2C binding

Browse source 
Driver was using DVB proprietary binding model. As it is I2C
device, we could change it to normal kernel I2C driver.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Antti Palosaari 2014-10-02 22:41:26 -03:00 committed by Mauro Carvalho Chehab
parent df810e8a97
commit 01b4be1452
3 changed files with 172 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

258
drivers/media/dvb-frontends/mn88473.c
View file

@ -40,13 +40,13 @@ static int mn88473_wregs(struct mn88473_dev *dev, u16 reg, const u8 *val, int le
buf[0] = (reg >> 0) & 0xff; buf[0] = (reg >> 0) & 0xff;
memcpy(&buf[1], val, len); memcpy(&buf[1], val, len);
ret = i2c_transfer(dev->i2c, msg, 1); ret = i2c_transfer(dev->client[0]->adapter, msg, 1);
if (ret == 1) { if (ret == 1) {
ret = 0; ret = 0;
} else { } else {
dev_warn(&dev->i2c->dev, dev_warn(&dev->client[0]->dev,
"%s: i2c wr failed=%d reg=%02x len=%d\n", "i2c wr failed=%d reg=%02x len=%d\n",
KBUILD_MODNAME, ret, reg, len); ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
@ -79,14 +79,14 @@ static int mn88473_rregs(struct mn88473_dev *dev, u16 reg, u8 *val, int len)
buf[0] = (reg >> 0) & 0xff; buf[0] = (reg >> 0) & 0xff;
ret = i2c_transfer(dev->i2c, msg, 2); ret = i2c_transfer(dev->client[0]->adapter, msg, 2);
if (ret == 2) { if (ret == 2) {
memcpy(val, buf, len); memcpy(val, buf, len);
ret = 0; ret = 0;
} else { } else {
dev_warn(&dev->i2c->dev, dev_warn(&dev->client[0]->dev,
"%s: i2c rd failed=%d reg=%02x len=%d\n", "i2c rd failed=%d reg=%02x len=%d\n",
KBUILD_MODNAME, ret, reg, len); ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
@ -114,15 +114,16 @@ static int mn88473_get_tune_settings(struct dvb_frontend *fe,
static int mn88473_set_frontend(struct dvb_frontend *fe) static int mn88473_set_frontend(struct dvb_frontend *fe)
{ {
struct mn88473_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct mn88473_dev *dev = i2c_get_clientdata(client);
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i; int ret, i;
u32 if_frequency; u32 if_frequency;
u8 delivery_system_val, if_val[3], bw_val[7]; u8 delivery_system_val, if_val[3], bw_val[7];
dev_dbg(&dev->i2c->dev, dev_dbg(&client->dev,
"%s: delivery_system=%u modulation=%u frequency=%u bandwidth_hz=%u symbol_rate=%u inversion=%d stream_id=%d\n", "delivery_system=%u modulation=%u frequency=%u bandwidth_hz=%u symbol_rate=%u inversion=%d stream_id=%d\n",
__func__, c->delivery_system, c->modulation, c->delivery_system, c->modulation,
c->frequency, c->bandwidth_hz, c->symbol_rate, c->frequency, c->bandwidth_hz, c->symbol_rate,
c->inversion, c->stream_id); c->inversion, c->stream_id);
@ -188,8 +189,7 @@ static int mn88473_set_frontend(struct dvb_frontend *fe)
if (ret) if (ret)
goto err; goto err;
dev_dbg(&dev->i2c->dev, "%s: get_if_frequency=%d\n", dev_dbg(&client->dev, "get_if_frequency=%d\n", if_frequency);
__func__, if_frequency);
} else { } else {
if_frequency = 0; if_frequency = 0;
} }
@ -200,8 +200,8 @@ static int mn88473_set_frontend(struct dvb_frontend *fe)
case 5070000: case 5070000:
break; break;
default: default:
dev_err(&dev->i2c->dev, "%s: IF frequency %d not supported\n", dev_err(&client->dev, "IF frequency %d not supported\n",
KBUILD_MODNAME, if_frequency); if_frequency);
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
@ -271,13 +271,14 @@ static int mn88473_set_frontend(struct dvb_frontend *fe)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status) static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status)
{ {
struct mn88473_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct mn88473_dev *dev = i2c_get_clientdata(client);
int ret; int ret;
*status = 0; *status = 0;
@ -292,49 +293,48 @@ static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static int mn88473_init(struct dvb_frontend *fe) static int mn88473_init(struct dvb_frontend *fe)
{ {
struct mn88473_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct mn88473_dev *dev = i2c_get_clientdata(client);
int ret, len, remaining; int ret, len, remaining;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
u8 *fw_file = MN88473_FIRMWARE; u8 *fw_file = MN88473_FIRMWARE;
dev_dbg(&dev->i2c->dev, "%s:\n", __func__); dev_dbg(&client->dev, "\n");
if (dev->warm) if (dev->warm)
return 0; return 0;
/* request the firmware, this will block and timeout */ /* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, dev->i2c->dev.parent); ret = request_firmware(&fw, fw_file, &client->dev);
if (ret) { if (ret) {
dev_err(&dev->i2c->dev, "%s: firmare file '%s' not found\n", dev_err(&client->dev, "firmare file '%s' not found\n", fw_file);
KBUILD_MODNAME, fw_file);
goto err; goto err;
} }
dev_info(&dev->i2c->dev, "%s: downloading firmware from file '%s'\n", dev_info(&client->dev, "downloading firmware from file '%s'\n",
KBUILD_MODNAME, fw_file); fw_file);
ret = mn88473_wreg(dev, 0x18f5, 0x03); ret = mn88473_wreg(dev, 0x18f5, 0x03);
if (ret) if (ret)
goto err; goto err;
for (remaining = fw->size; remaining > 0; for (remaining = fw->size; remaining > 0;
remaining -= (dev->cfg->i2c_wr_max - 1)) { remaining -= (dev->i2c_wr_max - 1)) {
len = remaining; len = remaining;
if (len > (dev->cfg->i2c_wr_max - 1)) if (len > (dev->i2c_wr_max - 1))
len = (dev->cfg->i2c_wr_max - 1); len = (dev->i2c_wr_max - 1);
ret = mn88473_wregs(dev, 0x18f6, ret = mn88473_wregs(dev, 0x18f6,
&fw->data[fw->size - remaining], len); &fw->data[fw->size - remaining], len);
if (ret) { if (ret) {
dev_err(&dev->i2c->dev, dev_err(&client->dev, "firmware download failed=%d\n",
"%s: firmware download failed=%d\n", ret);
KBUILD_MODNAME, ret);
goto err; goto err;
} }
} }
@ -354,16 +354,17 @@ static int mn88473_init(struct dvb_frontend *fe)
if (fw) if (fw)
release_firmware(fw); release_firmware(fw);
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static int mn88473_sleep(struct dvb_frontend *fe) static int mn88473_sleep(struct dvb_frontend *fe)
{ {
struct mn88473_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct mn88473_dev *dev = i2c_get_clientdata(client);
int ret; int ret;
dev_dbg(&dev->i2c->dev, "%s:\n", __func__); dev_dbg(&client->dev, "\n");
ret = mn88473_wreg(dev, 0x1c05, 0x3e); ret = mn88473_wreg(dev, 0x1c05, 0x3e);
if (ret) if (ret)
@ -373,80 +374,35 @@ static int mn88473_sleep(struct dvb_frontend *fe)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static void mn88473_release(struct dvb_frontend *fe)
{
struct mn88473_dev *dev = fe->demodulator_priv;
kfree(dev);
}
struct dvb_frontend *mn88473_attach(const struct mn88473_config *cfg,
struct i2c_adapter *i2c)
{
int ret;
struct mn88473_dev *dev;
u8 u8tmp;
dev_dbg(&i2c->dev, "%s:\n", __func__);
/* allocate memory for the internal state */
dev = kzalloc(sizeof(struct mn88473_dev), GFP_KERNEL);
if (!dev) {
ret = -ENOMEM;
dev_err(&i2c->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
goto err;
}
dev->cfg = cfg;
dev->i2c = i2c;
/* check demod responds to I2C */
ret = mn88473_rreg(dev, 0x1c00, &u8tmp);
if (ret)
goto err;
/* create dvb_frontend */
memcpy(&dev->fe.ops, &mn88473_ops, sizeof(struct dvb_frontend_ops));
dev->fe.demodulator_priv = dev;
return &dev->fe;
err:
dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
kfree(dev);
return NULL;
}
EXPORT_SYMBOL(mn88473_attach);
static struct dvb_frontend_ops mn88473_ops = { static struct dvb_frontend_ops mn88473_ops = {
.delsys = {SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_AC}, .delsys = {SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_AC},
.info = { .info = {
.name = "Panasonic MN88473", .name = "Panasonic MN88473",
.caps = FE_CAN_FEC_1_2 | .caps = FE_CAN_FEC_1_2 |
FE_CAN_FEC_2_3 | FE_CAN_FEC_2_3 |
FE_CAN_FEC_3_4 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_5_6 |
FE_CAN_FEC_7_8 | FE_CAN_FEC_7_8 |
FE_CAN_FEC_AUTO | FE_CAN_FEC_AUTO |
FE_CAN_QPSK | FE_CAN_QPSK |
FE_CAN_QAM_16 | FE_CAN_QAM_16 |
FE_CAN_QAM_32 | FE_CAN_QAM_32 |
FE_CAN_QAM_64 | FE_CAN_QAM_64 |
FE_CAN_QAM_128 | FE_CAN_QAM_128 |
FE_CAN_QAM_256 | FE_CAN_QAM_256 |
FE_CAN_QAM_AUTO | FE_CAN_QAM_AUTO |
FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_TRANSMISSION_MODE_AUTO |
FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
FE_CAN_HIERARCHY_AUTO | FE_CAN_HIERARCHY_AUTO |
FE_CAN_MUTE_TS | FE_CAN_MUTE_TS |
FE_CAN_2G_MODULATION | FE_CAN_2G_MODULATION |
FE_CAN_MULTISTREAM FE_CAN_MULTISTREAM
}, },
.release = mn88473_release,
.get_tune_settings = mn88473_get_tune_settings, .get_tune_settings = mn88473_get_tune_settings,
.init = mn88473_init, .init = mn88473_init,
@ -457,6 +413,110 @@ static struct dvb_frontend_ops mn88473_ops = {
.read_status = mn88473_read_status, .read_status = mn88473_read_status,
}; };
static int mn88473_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct mn88473_config *config = client->dev.platform_data;
struct mn88473_dev *dev;
int ret;
u8 u8tmp;
dev_dbg(&client->dev, "\n");
/* Caller really need to provide pointer for frontend we create. */
if (config->fe == NULL) {
dev_err(&client->dev, "frontend pointer not defined\n");
ret = -EINVAL;
goto err;
}
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
ret = -ENOMEM;
goto err;
}
dev->client[0] = client;
dev->i2c_wr_max = config->i2c_wr_max;
/* check demod answers to I2C */
ret = mn88473_rreg(dev, 0x1c00, &u8tmp);
if (ret)
goto err_kfree;
/*
* Chip has three I2C addresses for different register pages. Used
* addresses are 0x18, 0x1a and 0x1c. We register two dummy clients,
* 0x1a and 0x1c, in order to get own I2C client for each register page.
*/
dev->client[1] = i2c_new_dummy(client->adapter, 0x1a);
if (dev->client[1] == NULL) {
ret = -ENODEV;
dev_err(&client->dev, "I2C registration failed\n");
if (ret)
goto err_kfree;
}
i2c_set_clientdata(dev->client[1], dev);
dev->client[2] = i2c_new_dummy(client->adapter, 0x1c);
if (dev->client[2] == NULL) {
ret = -ENODEV;
dev_err(&client->dev, "2nd I2C registration failed\n");
if (ret)
goto err_client_1_i2c_unregister_device;
}
i2c_set_clientdata(dev->client[2], dev);
/* create dvb_frontend */
memcpy(&dev->fe.ops, &mn88473_ops, sizeof(struct dvb_frontend_ops));
dev->fe.demodulator_priv = client;
*config->fe = &dev->fe;
i2c_set_clientdata(client, dev);
dev_info(&dev->client[0]->dev, "Panasonic MN88473 successfully attached\n");
return 0;
err_client_1_i2c_unregister_device:
i2c_unregister_device(dev->client[1]);
err_kfree:
kfree(dev);
err:
dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}
static int mn88473_remove(struct i2c_client *client)
{
struct mn88473_dev *dev = i2c_get_clientdata(client);
dev_dbg(&client->dev, "\n");
i2c_unregister_device(dev->client[2]);
i2c_unregister_device(dev->client[1]);
kfree(dev);
return 0;
}
static const struct i2c_device_id mn88473_id_table[] = {
{"mn88473", 0},
{}
};
MODULE_DEVICE_TABLE(i2c, mn88473_id_table);
static struct i2c_driver mn88473_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "mn88473",
},
.probe = mn88473_probe,
.remove = mn88473_remove,
.id_table = mn88473_id_table,
};
module_i2c_driver(mn88473_driver);
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
MODULE_DESCRIPTION("Panasonic MN88473 DVB-T/T2/C demodulator driver"); MODULE_DESCRIPTION("Panasonic MN88473 DVB-T/T2/C demodulator driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

30
drivers/media/dvb-frontends/mn88473.h
View file

@ -21,26 +21,18 @@
struct mn88473_config { struct mn88473_config {
/* /*
* max bytes I2C client could write * Max num of bytes given I2C adapter could write at once.
* Value must be set. * Default: none
*/ */
int i2c_wr_max; u16 i2c_wr_max;
/* Everything after that is returned by the driver. */
/*
* DVB frontend.
*/
struct dvb_frontend **fe;
}; };
#if IS_ENABLED(CONFIG_DVB_MN88473)
extern struct dvb_frontend *mn88473_attach(
const struct mn88473_config *cfg,
struct i2c_adapter *i2c
);
#else
static inline struct dvb_frontend *mn88473_attach(
const struct mn88473_config *cfg,
struct i2c_adapter *i2c
)
{
dev_warn(&i2c->dev, "%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif
#endif #endif

4
drivers/media/dvb-frontends/mn88473_priv.h
View file

@ -24,9 +24,9 @@
#define MN88473_FIRMWARE "dvb-demod-mn88473-01.fw" #define MN88473_FIRMWARE "dvb-demod-mn88473-01.fw"
struct mn88473_dev { struct mn88473_dev {
struct i2c_adapter *i2c; struct i2c_client *client[3];
const struct mn88473_config *cfg;
struct dvb_frontend fe; struct dvb_frontend fe;
u16 i2c_wr_max;
fe_delivery_system_t delivery_system; fe_delivery_system_t delivery_system;
bool warm; /* FW running */ bool warm; /* FW running */
}; };