From patchwork Wed Apr 19 23:13:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40911 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0yo4-0002sF-HB; Wed, 19 Apr 2017 23:14:40 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1d0yo2-0006BG-1C; Thu, 20 Apr 2017 01:14:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S940335AbdDSXOg (ORCPT + 1 other); Wed, 19 Apr 2017 19:14:36 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:33408 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940326AbdDSXOc (ORCPT ); Wed, 19 Apr 2017 19:14:32 -0400 Received: by mail-qk0-f173.google.com with SMTP id h67so33360910qke.0 for ; Wed, 19 Apr 2017 16:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernellabs-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7f3QldQTk5IVXoVuKRO4qs46cdX3dqbU3I0A8xRtqpg=; b=q4cg6o0Yxeiny/voZfV6kDKtIOEE49D4y7eAutRSGrs6v+1+ipxRWUH7S3cHlpimSW /yNb+mCA2oqAH7kIoXHRw0HYyeoZOmSpC0gG8iBrRRV73qE7lmBD8qpsFjekAvXQZbHb mgkO3gZlA/4gDXSKFwH9SpxKcwWn80DzdhUPBhlEhqoRC3Le46/pH4mlCXIJyuzAiP32 AzVUUIKoeLEvAmKLNwZoMmcHT7ywk/N3U4mxzKAgfFDkEEbcK8vpzajiloDn8tI2PYiH KLIEp1lhbuQwYiVfzeWdXX64CCl5hbw1mfH2vKFZGvs4eMWL6Noqj8BTuGhSBan5a/Nc CrUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7f3QldQTk5IVXoVuKRO4qs46cdX3dqbU3I0A8xRtqpg=; b=fyIAYpGGQUY1vegu3Pxmnb6fGkZO/fLyklNYQ4lVwhQeHaSbfKvSfXgboy4Nhd5CJU oE67PCuQVjiX4Vsle1iJim7bP/e9EIVtJpr20euT0cyqFAx9i8VF3LybgBI7/I7ZTTqs uZaZ1+2OE1nTOEu6vJxp0HMZyL/bI6Itp4EY5jT/x7zhG6ukZE6Ez1X3FR4GFb0RrsHa 4QGOs+jdmBhruV+Kb6AyognaG+RE3grFhH2piHao3J78g7udlU5dPVQeIZt8YvYBLtk1 bVi3Ht8ct3ThQjGgKfA7zmXsADs0zMSjdX7nWeK/is/ptP39lILyilirDEfkJi7FEVIo flqA== X-Gm-Message-State: AN3rC/4Htgpxz7GemWjbZWB/Hw0/+CsbaX4rH2fDa6o9GyqXNjplOz/i BQVQyLlaAxG10T80qnc= X-Received: by 10.55.78.201 with SMTP id c192mr5391688qkb.81.1492643671236; Wed, 19 Apr 2017 16:14:31 -0700 (PDT) Received: from localhost.localdomain (cpe-74-71-114-159.nyc.res.rr.com. [74.71.114.159]) by smtp.gmail.com with ESMTPSA id 123sm2951916qkm.22.2017.04.19.16.14.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Apr 2017 16:14:30 -0700 (PDT) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller Subject: [PATCH 06/12] au8522 Remove 0x4 bit for register reads Date: Wed, 19 Apr 2017 19:13:49 -0400 Message-Id: <1492643635-30823-7-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492643635-30823-1-git-send-email-dheitmueller@kernellabs.com> References: <1492643635-30823-1-git-send-email-dheitmueller@kernellabs.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.4.19.230617 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' The second highest bit in the register value is an indicator to do a register read, so remove it since now au8522_regread() inserts the bit automatically. Also remove a stray instance where we were actually trying to write to the I2C status register, which was actually a read. Signed-off-by: Devin Heitmueller --- drivers/media/dvb-frontends/au8522_dig.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c index d117ddb..3f3635f 100644 --- a/drivers/media/dvb-frontends/au8522_dig.c +++ b/drivers/media/dvb-frontends/au8522_dig.c @@ -284,7 +284,6 @@ static int au8522_set_if(struct dvb_frontend *fe, enum au8522_if_freq if_freq) u16 data; } VSB_mod_tab[] = { { 0x0090, 0x84 }, - { 0x4092, 0x11 }, { 0x2005, 0x00 }, { 0x0091, 0x80 }, { 0x00a3, 0x0c }, @@ -654,12 +653,12 @@ static int au8522_read_status(struct dvb_frontend *fe, enum fe_status *status) if (state->current_modulation == VSB_8) { dprintk("%s() Checking VSB_8\n", __func__); - reg = au8522_readreg(state, 0x4088); + reg = au8522_readreg(state, 0x0088); if ((reg & 0x03) == 0x03) *status |= FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI; } else { dprintk("%s() Checking QAM\n", __func__); - reg = au8522_readreg(state, 0x4541); + reg = au8522_readreg(state, 0x0541); if (reg & 0x80) *status |= FE_HAS_VITERBI; if (reg & 0x20) @@ -745,17 +744,17 @@ static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr) if (state->current_modulation == QAM_256) ret = au8522_mse2snr_lookup(qam256_mse2snr_tab, ARRAY_SIZE(qam256_mse2snr_tab), - au8522_readreg(state, 0x4522), + au8522_readreg(state, 0x0522), snr); else if (state->current_modulation == QAM_64) ret = au8522_mse2snr_lookup(qam64_mse2snr_tab, ARRAY_SIZE(qam64_mse2snr_tab), - au8522_readreg(state, 0x4522), + au8522_readreg(state, 0x0522), snr); else /* VSB_8 */ ret = au8522_mse2snr_lookup(vsb_mse2snr_tab, ARRAY_SIZE(vsb_mse2snr_tab), - au8522_readreg(state, 0x4311), + au8522_readreg(state, 0x0311), snr); if (state->config.led_cfg) @@ -804,9 +803,9 @@ static int au8522_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) struct au8522_state *state = fe->demodulator_priv; if (state->current_modulation == VSB_8) - *ucblocks = au8522_readreg(state, 0x4087); + *ucblocks = au8522_readreg(state, 0x0087); else - *ucblocks = au8522_readreg(state, 0x4543); + *ucblocks = au8522_readreg(state, 0x0543); return 0; }