[media] mn88472: convert driver to I2C client (528af195) · Commits · 戴 / test

drivers/media/dvb-frontends/mn88472.c

+152 −89

Original line number	Diff line number	Diff line
		@@ -40,13 +40,13 @@ static int mn88472_wregs(struct mn88472_dev dev, u16 reg, const u8 val, int le
		buf[0] = (reg >> 0) & 0xff;
		memcpy(&buf[1], val, len);

		ret = i2c_transfer(dev->i2c, msg, 1);
		ret = i2c_transfer(dev->client[0]->adapter, msg, 1);
		if (ret == 1) {
		ret = 0;
		} else {
		dev_warn(&dev->i2c->dev,
		"%s: i2c wr failed=%d reg=%02x len=%d\n",
		KBUILD_MODNAME, ret, reg, len);
		dev_warn(&dev->client[0]->dev,
		"i2c wr failed=%d reg=%02x len=%d\n",
		ret, reg, len);
		ret = -EREMOTEIO;
		}

		@@ -79,14 +79,14 @@ static int mn88472_rregs(struct mn88472_dev dev, u16 reg, u8 val, int len)

		buf[0] = (reg >> 0) & 0xff;

		ret = i2c_transfer(dev->i2c, msg, 2);
		ret = i2c_transfer(dev->client[0]->adapter, msg, 2);
		if (ret == 2) {
		memcpy(val, buf, len);
		ret = 0;
		} else {
		dev_warn(&dev->i2c->dev,
		"%s: i2c rd failed=%d reg=%02x len=%d\n",
		KBUILD_MODNAME, ret, reg, len);
		dev_warn(&dev->client[0]->dev,
		"i2c rd failed=%d reg=%02x len=%d\n",
		ret, reg, len);
		ret = -EREMOTEIO;
		}

		@@ -114,13 +114,15 @@ static int mn88472_get_tune_settings(struct dvb_frontend *fe,

		static int mn88472_set_frontend(struct dvb_frontend *fe)
		{
		struct mn88472_dev *dev = fe->demodulator_priv;
		struct i2c_client *client = fe->demodulator_priv;
		struct mn88472_dev *dev = i2c_get_clientdata(client);
		struct dtv_frontend_properties *c = &fe->dtv_property_cache;
		int ret;
		u32 if_frequency = 0;
		dev_dbg(&dev->i2c->dev,
		"%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d\n",
		__func__, c->delivery_system, c->modulation,

		dev_dbg(&client->dev,
		"delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d\n",
		c->delivery_system, c->modulation,
		c->frequency, c->symbol_rate, c->inversion);

		if (!dev->warm) {
		@@ -140,13 +142,12 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
		if (ret)
		goto err;

		dev_dbg(&dev->i2c->dev, "%s: get_if_frequency=%d\n",
		__func__, if_frequency);
		dev_dbg(&client->dev, "get_if_frequency=%d\n", if_frequency);
		}

		if (if_frequency != 5070000) {
		dev_err(&dev->i2c->dev, "%s: IF frequency %d not supported\n",
		KBUILD_MODNAME, if_frequency);
		dev_err(&client->dev, "IF frequency %d not supported\n",
		if_frequency);
		ret = -EINVAL;
		goto err;
		}
		@@ -212,13 +213,14 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)

		return 0;
		err:
		dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
		dev_dbg(&client->dev, "failed=%d\n", ret);
		return ret;
		}

		static int mn88472_read_status(struct dvb_frontend fe, fe_status_t status)
		{
		struct mn88472_dev *dev = fe->demodulator_priv;
		struct i2c_client *client = fe->demodulator_priv;
		struct mn88472_dev *dev = i2c_get_clientdata(client);
		int ret;
		u8 u8tmp;

		@@ -239,17 +241,19 @@ static int mn88472_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(&client->dev, "failed=%d\n", ret);
		return ret;
		}

		static int mn88472_init(struct dvb_frontend *fe)
		{
		struct mn88472_dev *dev = fe->demodulator_priv;
		struct i2c_client *client = fe->demodulator_priv;
		struct mn88472_dev *dev = i2c_get_clientdata(client);
		int ret, len, remaining;
		const struct firmware *fw = NULL;
		u8 *fw_file = MN88472_FIRMWARE;
		dev_dbg(&dev->i2c->dev, "%s:\n", __func__);

		dev_dbg(&client->dev, "\n");

		/* set cold state by default */
		dev->warm = false;
		@@ -264,32 +268,31 @@ static int mn88472_init(struct dvb_frontend *fe)
		goto err;

		/* 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) {
		dev_err(&dev->i2c->dev, "%s: firmare file '%s' not found\n",
		KBUILD_MODNAME, fw_file);
		dev_err(&client->dev, "firmare file '%s' not found\n",
		fw_file);
		goto err;
		}

		dev_info(&dev->i2c->dev, "%s: downloading firmware from file '%s'\n",
		KBUILD_MODNAME, fw_file);
		dev_info(&client->dev, "downloading firmware from file '%s'\n",
		fw_file);

		ret = mn88472_wreg(dev, 0x18f5, 0x03);
		if (ret)
		goto err;

		for (remaining = fw->size; remaining > 0;
		remaining -= (dev->cfg->i2c_wr_max - 1)) {
		remaining -= (dev->i2c_wr_max - 1)) {
		len = remaining;
		if (len > (dev->cfg->i2c_wr_max - 1))
		len = (dev->cfg->i2c_wr_max - 1);
		if (len > (dev->i2c_wr_max - 1))
		len = (dev->i2c_wr_max - 1);

		ret = mn88472_wregs(dev, 0x18f6,
		&fw->data[fw->size - remaining], len);
		if (ret) {
		dev_err(&dev->i2c->dev,
		"%s: firmware download failed=%d\n",
		KBUILD_MODNAME, ret);
		dev_err(&client->dev,
		"firmware download failed=%d\n", ret);
		goto err;
		}
		}
		@@ -309,15 +312,17 @@ err:
		if (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;
		}

		static int mn88472_sleep(struct dvb_frontend *fe)
		{
		struct mn88472_dev *dev = fe->demodulator_priv;
		struct i2c_client *client = fe->demodulator_priv;
		struct mn88472_dev *dev = i2c_get_clientdata(client);
		int ret;
		dev_dbg(&dev->i2c->dev, "%s:\n", __func__);

		dev_dbg(&client->dev, "\n");

		/* power off */
		ret = mn88472_wreg(dev, 0x1c0b, 0x30);
		@@ -332,53 +337,10 @@ static int mn88472_sleep(struct dvb_frontend *fe)

		return 0;
		err:
		dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
		dev_dbg(&client->dev, "failed=%d\n", ret);
		return ret;
		}

		static void mn88472_release(struct dvb_frontend *fe)
		{
		struct mn88472_dev *dev = fe->demodulator_priv;

		kfree(dev);
		}

		struct dvb_frontend mn88472_attach(const struct mn88472_config cfg,
		struct i2c_adapter *i2c)
		{
		int ret;
		struct mn88472_dev *dev;
		u8 u8tmp;
		dev_dbg(&i2c->dev, "%s:\n", __func__);

		/* allocate memory for the internal state */
		dev = kzalloc(sizeof(*dev), GFP_KERNEL);
		if (dev == NULL) {
		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 = mn88472_rreg(dev, 0x1c00, &u8tmp);
		if (ret)
		goto err;

		/* create dvb_frontend */
		memcpy(&dev->fe.ops, &mn88472_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(mn88472_attach);

		static struct dvb_frontend_ops mn88472_ops = {
		.delsys = {SYS_DVBC_ANNEX_A},
		.info = {
		@@ -404,20 +366,121 @@ static struct dvb_frontend_ops mn88472_ops = {
		FE_CAN_MULTISTREAM
		},

		.release = mn88472_release,

		.get_tune_settings = mn88472_get_tune_settings,

		.init = mn88472_init,
		.sleep = mn88472_sleep,

		.set_frontend = mn88472_set_frontend,
		/* .get_frontend = mn88472_get_frontend, */

		.read_status = mn88472_read_status,
		/* .read_snr = mn88472_read_snr, */
		};

		static int mn88472_probe(struct i2c_client *client,
		const struct i2c_device_id *id)
		{
		struct mn88472_config *config = client->dev.platform_data;
		struct mn88472_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 = mn88472_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, &mn88472_ops, sizeof(struct dvb_frontend_ops));
		dev->fe.demodulator_priv = client;
		*config->fe = &dev->fe;
		i2c_set_clientdata(client, dev);

		dev_info(&client->dev, "Panasonic MN88472 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 mn88472_remove(struct i2c_client *client)
		{
		struct mn88472_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 mn88472_id_table[] = {
		{"mn88472", 0},
		{}
		};
		MODULE_DEVICE_TABLE(i2c, mn88472_id_table);

		static struct i2c_driver mn88472_driver = {
		.driver = {
		.owner = THIS_MODULE,
		.name = "mn88472",
		},
		.probe = mn88472_probe,
		.remove = mn88472_remove,
		.id_table = mn88472_id_table,
		};

		module_i2c_driver(mn88472_driver);

		MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
		MODULE_DESCRIPTION("Panasonic MN88472 DVB-T/T2/C demodulator driver");
		MODULE_LICENSE("GPL");

drivers/media/dvb-frontends/mn88472.h

+11 −19

Original line number	Diff line number	Diff line
		@@ -21,26 +21,18 @@

		struct mn88472_config {
		/*
		* max bytes I2C client could write
		* Value must be set.
		* Max num of bytes given I2C adapter could write at once.
		* Default: none
		*/
		int i2c_wr_max;
		};
		u16 i2c_wr_max;

		#if IS_ENABLED(CONFIG_DVB_MN88472)
		extern struct dvb_frontend *mn88472_attach(
		const struct mn88472_config *cfg,
		struct i2c_adapter *i2c
		);
		#else
		static inline struct dvb_frontend *mn88472_attach(
		const struct mn88472_config *cfg,
		struct i2c_adapter *i2c
		)
		{
		dev_warn(&i2c->dev, "%s: driver disabled by Kconfig\n", __func__);
		return NULL;
		}
		#endif

		/* Everything after that is returned by the driver. */

		/*
		* DVB frontend.
		*/
		struct dvb_frontend **fe;
		};

		#endif

drivers/media/dvb-frontends/mn88472_priv.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -19,16 +19,14 @@

		#include "dvb_frontend.h"
		#include "mn88472.h"
		#include "dvb_math.h"
		#include <linux/firmware.h>
		#include <linux/i2c-mux.h>

		#define MN88472_FIRMWARE "dvb-demod-mn88472-02.fw"

		struct mn88472_dev {
		struct i2c_adapter *i2c;
		const struct mn88472_config *cfg;
		struct i2c_client *client[3];
		struct dvb_frontend fe;
		u16 i2c_wr_max;
		fe_delivery_system_t delivery_system;
		bool warm; /* FW running */
		};

Admin message