Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp243950imm; Tue, 17 Jul 2018 18:08:12 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfyPD6NAarYqaw8AS+3GdsOp9QI0uqy1yJJqYI8tPJzDNu69f6zF1+N4UUVNClim4d0hyZS X-Received: by 2002:a17:902:a508:: with SMTP id s8-v6mr864730plq.223.1531876092399; Tue, 17 Jul 2018 18:08:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531876092; cv=none; d=google.com; s=arc-20160816; b=JJSB1XBv2YlVmV/uJ4SGBp25GC5nF01S5sVJCHK0zzbp5GbkSDVWYX8eJl7+TACjiH cxiqupVrHaF2Pc2GLWfjufM3qTkC+lEtcLRLBP4/ujZiKQVzZt8WGaLhYIOmtP66W0Fb yWf8qStsPUSy9X889XzlRrucJveTMsjNrZwL+LTGc+WWZV8yg7Vcw9rOIe3cQ2FPfGHV 8p/Q+wC3E1Qt6Jy5GXMsPFzbLIuKuakVSzIpIvUzzV5aj2kmnYXX/shS4yPgl0yhPkL0 voIZO1EanXsu+an63XgphH6R+m9h9wJSgCcIPSEKRTC45LF2xGY925wI6RSC7KY2Go6K 8QZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=z0rMYq66sVAarMkqrRBhYI3Sn97f0pIaORR/9gT2mHk=; b=jIeEiSLWWobLbWuJZKfS0Ts7YJAaJPm0HYfTjmWo3LZaNlSAyZescxUVmg0Z+2MONm pPlFvFW0yv3Y3R4+SVBgbV/j/QfcZ+pqGAB+XAQ+OG3qoNKG0SjW4/19wM/JVWx3CMrB enSZUPrNMNJbI3rJXQRQnYVzGScaom6lNVHq11iEwqKZVlBFIGWHFgb9ZH44hTOvnfq0 RdUYVYvMEZLLGRbvcQGN7cSeys1ga7vlZL+GpzMLCNZm9cjlPZyYa6IdBXRtSnhXdegu iQPYsKEn3P0CxbGwbBivQx8dW5A+Jpwj4NA8sPgHVhLCE2aVgwsD7Srd+ye9m0ZxrLLI d5SA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t9-v6si1746456plo.307.2018.07.17.18.07.56; Tue, 17 Jul 2018 18:08:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731565AbeGRBmR (ORCPT + 99 others); Tue, 17 Jul 2018 21:42:17 -0400 Received: from mx.socionext.com ([202.248.49.38]:16358 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731193AbeGRBmQ (ORCPT ); Tue, 17 Jul 2018 21:42:16 -0400 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 18 Jul 2018 10:06:59 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id 39E7E60034; Wed, 18 Jul 2018 10:06:59 +0900 (JST) Received: from 172.31.9.53 (172.31.9.53) by m-FILTER with ESMTP; Wed, 18 Jul 2018 10:06:59 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by iyokan.css.socionext.com (Postfix) with ESMTP id B78254039E; Wed, 18 Jul 2018 10:06:58 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 91222120424; Wed, 18 Jul 2018 10:06:58 +0900 (JST) From: Katsuhiro Suzuki To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: Masami Hiramatsu , Jassi Brar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH v5] media: helene: add I2C device probe function Date: Wed, 18 Jul 2018 10:06:42 +0900 Message-Id: <20180718010642.18654-1-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.18.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds I2C probe function to use dvb_module_probe() with this driver. And also support multiple delivery systems at the same device. Signed-off-by: Katsuhiro Suzuki --- Changes since v4: - Fix wrong max/min frequency range - Depends on Mauro's DVB core fixes https://patchwork.linuxtv.org/patch/50886/ https://patchwork.linuxtv.org/patch/50887/ https://patchwork.linuxtv.org/patch/50888/ Changes since v3: - Drop wrong patch 2/2 from v3 series, no changes in this patch Changes since v2: - Nothing Changes since v1: - Add documents for dvb_frontend member of helene_config --- drivers/media/dvb-frontends/helene.c | 88 ++++++++++++++++++++++++++-- drivers/media/dvb-frontends/helene.h | 3 + 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/drivers/media/dvb-frontends/helene.c b/drivers/media/dvb-frontends/helene.c index dc70fb684681..d7790cb98a0c 100644 --- a/drivers/media/dvb-frontends/helene.c +++ b/drivers/media/dvb-frontends/helene.c @@ -666,7 +666,7 @@ static int helene_set_params_s(struct dvb_frontend *fe) return 0; } -static int helene_set_params(struct dvb_frontend *fe) +static int helene_set_params_t(struct dvb_frontend *fe) { u8 data[MAX_WRITE_REGSIZE]; u32 frequency; @@ -835,6 +835,19 @@ static int helene_set_params(struct dvb_frontend *fe) return 0; } +static int helene_set_params(struct dvb_frontend *fe) +{ + struct dtv_frontend_properties *p = &fe->dtv_property_cache; + + if (p->delivery_system == SYS_DVBT || + p->delivery_system == SYS_DVBT2 || + p->delivery_system == SYS_ISDBT || + p->delivery_system == SYS_DVBC_ANNEX_A) + return helene_set_params_t(fe); + + return helene_set_params_s(fe); +} + static int helene_get_frequency(struct dvb_frontend *fe, u32 *frequency) { struct helene_priv *priv = fe->tuner_priv; @@ -843,7 +856,7 @@ static int helene_get_frequency(struct dvb_frontend *fe, u32 *frequency) return 0; } -static const struct dvb_tuner_ops helene_tuner_ops = { +static const struct dvb_tuner_ops helene_tuner_ops_t = { .info = { .name = "Sony HELENE Ter tuner", .frequency_min_hz = 1 * MHz, @@ -853,7 +866,7 @@ static const struct dvb_tuner_ops helene_tuner_ops = { .init = helene_init, .release = helene_release, .sleep = helene_sleep, - .set_params = helene_set_params, + .set_params = helene_set_params_t, .get_frequency = helene_get_frequency, }; @@ -871,6 +884,20 @@ static const struct dvb_tuner_ops helene_tuner_ops_s = { .get_frequency = helene_get_frequency, }; +static const struct dvb_tuner_ops helene_tuner_ops = { + .info = { + .name = "Sony HELENE Sat/Ter tuner", + .frequency_min_hz = 1 * MHz, + .frequency_max_hz = 2500 * MHz, + .frequency_step_hz = 25 * kHz, + }, + .init = helene_init, + .release = helene_release, + .sleep = helene_sleep, + .set_params = helene_set_params, + .get_frequency = helene_get_frequency, +}; + /* power-on tuner * call once after reset */ @@ -1035,7 +1062,7 @@ struct dvb_frontend *helene_attach(struct dvb_frontend *fe, if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); - memcpy(&fe->ops.tuner_ops, &helene_tuner_ops, + memcpy(&fe->ops.tuner_ops, &helene_tuner_ops_t, sizeof(struct dvb_tuner_ops)); fe->tuner_priv = priv; dev_info(&priv->i2c->dev, @@ -1045,6 +1072,59 @@ struct dvb_frontend *helene_attach(struct dvb_frontend *fe, } EXPORT_SYMBOL(helene_attach); +static int helene_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct helene_config *config = client->dev.platform_data; + struct dvb_frontend *fe = config->fe; + struct device *dev = &client->dev; + struct helene_priv *priv; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->i2c_address = client->addr; + priv->i2c = client->adapter; + priv->set_tuner_data = config->set_tuner_priv; + priv->set_tuner = config->set_tuner_callback; + priv->xtal = config->xtal; + + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 1); + + if (helene_x_pon(priv) != 0) + return -EINVAL; + + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 0); + + memcpy(&fe->ops.tuner_ops, &helene_tuner_ops, + sizeof(struct dvb_tuner_ops)); + fe->tuner_priv = priv; + i2c_set_clientdata(client, priv); + + dev_info(dev, "Sony HELENE attached on addr=%x at I2C adapter %p\n", + priv->i2c_address, priv->i2c); + + return 0; +} + +static const struct i2c_device_id helene_id[] = { + { "helene", }, + {} +}; +MODULE_DEVICE_TABLE(i2c, helene_id); + +static struct i2c_driver helene_driver = { + .driver = { + .name = "helene", + }, + .probe = helene_probe, + .id_table = helene_id, +}; +module_i2c_driver(helene_driver); + MODULE_DESCRIPTION("Sony HELENE Sat/Ter tuner driver"); MODULE_AUTHOR("Abylay Ospan "); MODULE_LICENSE("GPL"); diff --git a/drivers/media/dvb-frontends/helene.h b/drivers/media/dvb-frontends/helene.h index c9fc81c7e4e7..8562d01bc93e 100644 --- a/drivers/media/dvb-frontends/helene.h +++ b/drivers/media/dvb-frontends/helene.h @@ -39,6 +39,7 @@ enum helene_xtal { * @set_tuner_callback: Callback function that notifies the parent driver * which tuner is active now * @xtal: Cristal frequency as described by &enum helene_xtal + * @fe: Frontend for which connects this tuner */ struct helene_config { u8 i2c_address; @@ -46,6 +47,8 @@ struct helene_config { void *set_tuner_priv; int (*set_tuner_callback)(void *, int); enum helene_xtal xtal; + + struct dvb_frontend *fe; }; #if IS_REACHABLE(CONFIG_DVB_HELENE) -- 2.18.0