From patchwork Wed Nov 12 04:11:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 5284411 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5BB14C11AC for ; Wed, 12 Nov 2014 04:11:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AC3E2010B for ; Wed, 12 Nov 2014 04:11:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B5842013D for ; Wed, 12 Nov 2014 04:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934160AbaKLELk (ORCPT ); Tue, 11 Nov 2014 23:11:40 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:47036 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934136AbaKLELh (ORCPT ); Tue, 11 Nov 2014 23:11:37 -0500 Received: from dyn3-82-128-189-191.psoas.suomi.net ([82.128.189.191] helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1XoPHL-0001LW-UJ; Wed, 12 Nov 2014 06:11:35 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari Subject: [PATCH 06/11] mn88472: convert driver to I2C client Date: Wed, 12 Nov 2014 06:11:12 +0200 Message-Id: <1415765477-23153-7-git-send-email-crope@iki.fi> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415765477-23153-1-git-send-email-crope@iki.fi> References: <1415765477-23153-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.189.191 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It uses I2C bus so better to implement it as a standard I2C driver model. It was using proprietary DVB binding. Signed-off-by: Antti Palosaari --- drivers/media/dvb-frontends/mn88472.c | 241 ++++++++++++++++++----------- drivers/media/dvb-frontends/mn88472.h | 30 ++-- drivers/media/dvb-frontends/mn88472_priv.h | 6 +- 3 files changed, 165 insertions(+), 112 deletions(-) diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c index 1d72e02..a65741a 100644 --- a/drivers/media/dvb-frontends/mn88472.c +++ b/drivers/media/dvb-frontends/mn88472.c @@ -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,91 +337,149 @@ 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; +static struct dvb_frontend_ops mn88472_ops = { + .delsys = {SYS_DVBC_ANNEX_A}, + .info = { + .name = "Panasonic MN88472", + .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_32 | + FE_CAN_QAM_64 | + FE_CAN_QAM_128 | + FE_CAN_QAM_256 | + FE_CAN_QAM_AUTO | + FE_CAN_TRANSMISSION_MODE_AUTO | + FE_CAN_GUARD_INTERVAL_AUTO | + FE_CAN_HIERARCHY_AUTO | + FE_CAN_MUTE_TS | + FE_CAN_2G_MODULATION | + FE_CAN_MULTISTREAM + }, - kfree(dev); -} + .get_tune_settings = mn88472_get_tune_settings, + + .init = mn88472_init, + .sleep = mn88472_sleep, + + .set_frontend = mn88472_set_frontend, + + .read_status = mn88472_read_status, +}; -struct dvb_frontend *mn88472_attach(const struct mn88472_config *cfg, - struct i2c_adapter *i2c) +static int mn88472_probe(struct i2c_client *client, + const struct i2c_device_id *id) { - int ret; + struct mn88472_config *config = client->dev.platform_data; struct mn88472_dev *dev; + int ret; u8 u8tmp; - dev_dbg(&i2c->dev, "%s:\n", __func__); - /* allocate memory for the internal state */ + 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; - dev_err(&i2c->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME); goto err; } - dev->cfg = cfg; - dev->i2c = i2c; + dev->client[0] = client; + dev->i2c_wr_max = config->i2c_wr_max; - /* check demod responds to I2C */ + /* check demod answers to I2C */ ret = mn88472_rreg(dev, 0x1c00, &u8tmp); if (ret) - goto err; + 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 = dev; + dev->fe.demodulator_priv = client; + *config->fe = &dev->fe; + i2c_set_clientdata(client, dev); - return &dev->fe; -err: - dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret); + 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); - return NULL; +err: + dev_dbg(&client->dev, "failed=%d\n", ret); + return ret; } -EXPORT_SYMBOL(mn88472_attach); -static struct dvb_frontend_ops mn88472_ops = { - .delsys = {SYS_DVBC_ANNEX_A}, - .info = { - .name = "Panasonic MN88472", - .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_32 | - FE_CAN_QAM_64 | - FE_CAN_QAM_128 | - FE_CAN_QAM_256 | - FE_CAN_QAM_AUTO | - FE_CAN_TRANSMISSION_MODE_AUTO | - FE_CAN_GUARD_INTERVAL_AUTO | - FE_CAN_HIERARCHY_AUTO | - FE_CAN_MUTE_TS | - FE_CAN_2G_MODULATION | - FE_CAN_MULTISTREAM - }, +static int mn88472_remove(struct i2c_client *client) +{ + struct mn88472_dev *dev = i2c_get_clientdata(client); - .release = mn88472_release, + dev_dbg(&client->dev, "\n"); - .get_tune_settings = mn88472_get_tune_settings, + i2c_unregister_device(dev->client[2]); - .init = mn88472_init, - .sleep = mn88472_sleep, + i2c_unregister_device(dev->client[1]); - .set_frontend = mn88472_set_frontend, -/* .get_frontend = mn88472_get_frontend, */ + kfree(dev); - .read_status = mn88472_read_status, -/* .read_snr = mn88472_read_snr, */ + 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 "); MODULE_DESCRIPTION("Panasonic MN88472 DVB-T/T2/C demodulator driver"); diff --git a/drivers/media/dvb-frontends/mn88472.h b/drivers/media/dvb-frontends/mn88472.h index 5ce6ac1..da4558b 100644 --- a/drivers/media/dvb-frontends/mn88472.h +++ b/drivers/media/dvb-frontends/mn88472.h @@ -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 diff --git a/drivers/media/dvb-frontends/mn88472_priv.h b/drivers/media/dvb-frontends/mn88472_priv.h index be31adb..0fde80c 100644 --- a/drivers/media/dvb-frontends/mn88472_priv.h +++ b/drivers/media/dvb-frontends/mn88472_priv.h @@ -19,16 +19,14 @@ #include "dvb_frontend.h" #include "mn88472.h" -#include "dvb_math.h" #include -#include #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 */ };