From patchwork Sun Feb 9 08:48:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 3611981 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 3E49FBF418 for ; Sun, 9 Feb 2014 08:50:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64D9A2010B for ; Sun, 9 Feb 2014 08:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88EE3200DC for ; Sun, 9 Feb 2014 08:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbaBIIuH (ORCPT ); Sun, 9 Feb 2014 03:50:07 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:40949 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751987AbaBIIuD (ORCPT ); Sun, 9 Feb 2014 03:50:03 -0500 Received: from [82.128.187.60] (helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1WCQ5P-0007At-HU; Sun, 09 Feb 2014 10:49:59 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari , Mauro Carvalho Chehab Subject: [REVIEW PATCH 42/86] r820t: add manual gain controls Date: Sun, 9 Feb 2014 10:48:47 +0200 Message-Id: <1391935771-18670-43-git-send-email-crope@iki.fi> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391935771-18670-1-git-send-email-crope@iki.fi> References: <1391935771-18670-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.187.60 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add gain control for LNA, Mixer and IF. Expose controls via DVB frontend .set_config callback. Cc: Mauro Carvalho Chehab Signed-off-by: Antti Palosaari --- drivers/media/tuners/r820t.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/media/tuners/r820t.h | 7 +++++++ 2 files changed, 45 insertions(+) diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c index 319adc4..231c614 100644 --- a/drivers/media/tuners/r820t.c +++ b/drivers/media/tuners/r820t.c @@ -1251,6 +1251,43 @@ static int r820t_set_gain_mode(struct r820t_priv *priv, } #endif +static int r820t_set_config(struct dvb_frontend *fe, void *priv_cfg) +{ + struct r820t_priv *priv = fe->tuner_priv; + struct r820t_ctrl *ctrl = priv_cfg; + int rc; + + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 1); + + if (ctrl->lna_gain == INT_MIN) + rc = r820t_write_reg_mask(priv, 0x05, 0x00, 0x10); + else + rc = r820t_write_reg_mask(priv, 0x05, + 0x10 | ctrl->lna_gain, 0x1f); + if (rc < 0) + goto err; + + if (ctrl->mixer_gain == INT_MIN) + rc = r820t_write_reg_mask(priv, 0x07, 0x10, 0x10); + else + rc = r820t_write_reg_mask(priv, 0x07, + 0x00 | ctrl->mixer_gain, 0x1f); + if (rc < 0) + goto err; + + if (ctrl->if_gain == INT_MIN) + rc = r820t_write_reg_mask(priv, 0x0c, 0x10, 0x10); + else + rc = r820t_write_reg_mask(priv, 0x0c, + 0x00 | ctrl->if_gain, 0x1f); +err: + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 0); + + return rc; +} + static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */, unsigned bw, @@ -2275,6 +2312,7 @@ static const struct dvb_tuner_ops r820t_tuner_ops = { .release = r820t_release, .sleep = r820t_sleep, .set_params = r820t_set_params, + .set_config = r820t_set_config, .set_analog_params = r820t_set_analog_freq, .get_if_frequency = r820t_get_if_frequency, .get_rf_strength = r820t_signal, diff --git a/drivers/media/tuners/r820t.h b/drivers/media/tuners/r820t.h index 48af354..42c0d8e 100644 --- a/drivers/media/tuners/r820t.h +++ b/drivers/media/tuners/r820t.h @@ -42,6 +42,13 @@ struct r820t_config { bool use_predetect; }; +/* set INT_MIN for automode */ +struct r820t_ctrl { + int lna_gain; + int mixer_gain; + int if_gain; +}; + #if IS_ENABLED(CONFIG_MEDIA_TUNER_R820T) struct dvb_frontend *r820t_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c,