From patchwork Wed Nov 7 18:49:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Belinassi X-Patchwork-Id: 10672895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96B1913A4 for ; Wed, 7 Nov 2018 18:49:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 861362CC67 for ; Wed, 7 Nov 2018 18:49:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7732B2CC93; Wed, 7 Nov 2018 18:49:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7DE82CC19 for ; Wed, 7 Nov 2018 18:49:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728693AbeKHEVX (ORCPT ); Wed, 7 Nov 2018 23:21:23 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:43688 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726068AbeKHEVX (ORCPT ); Wed, 7 Nov 2018 23:21:23 -0500 Received: by mail-qk1-f194.google.com with SMTP id r71so22169044qkr.10; Wed, 07 Nov 2018 10:49:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=BPVN4bnWxVWD68pt2r0WHkMb4BWmAIrSIvpOqkpnGvs=; b=uAOgUk+qBcusZ7rfoGQZivsnzu+OztW3Wzxayu3vLhen264AC43BiuAC3PfRUmRCWJ 1ZNVbV50Ds6Iq1G/Ix8XaXSo8v/lFUZTy21IUSCFADOqGYtOlIi6eFmmlyY3LU0j/28r k7oe+Vp46CYj3V/EFeva00k3fWbBS5Tk33gqZOM81gqEk5zbh9+oXzk330qdQIdnTFnO qRbFPqZhFTb0YbhyocxeLwWZXecaN+xPl9HtIVTK1jD+X5GBniH5C5w56pB1PlN6YkCj RO8fkl/xOsAbzNSs3lLLopTK+evr+cCpc2L20SSTURhQnEGrgV8I11J4SVc8WQTqbMLP GJ3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=BPVN4bnWxVWD68pt2r0WHkMb4BWmAIrSIvpOqkpnGvs=; b=rUvLPS06ggVY0tt8spk55jPEyD5oZW8rpbxRtOOC+siofMMjt0k5ZzBv9SaoUcYHMQ 4ZwLEUr6z12YYYYE4YS5P8Z+wZHst17MKRwQ26LWu6S7vW5agQEOoFzllFgQIxZdU+7M b6/7o0P2JWsPDZpuB31AdjriMNa1kkgnHtAopYUkCSwFrkKUTqkkbatVc0Wekc8NMpPs v9y/vGNp2daf3v3IXzaezyXaw63ff50IZOUzYiSmCnFgNNJjqUINDwXwY26hDrvCEV/U bxlBxo8Gp1xn6T8IYhdBoJrz5Mgo9zoWSVv8JBtgn0MuYYFkL/j8jRC2RiIYEnNpo+Nc 1HNw== X-Gm-Message-State: AGRZ1gKOrmlz+Ky6Hn7f5QNARTmGUe7SruRdGt2pWCafU3YTyWquezm4 e/S0c/V0B9En0D3xynNH+Bk= X-Google-Smtp-Source: AJdET5fJvkhUY2XZaM+fbhE6BMLxdPbtc/rsxDlZiWdLpkxZDp9QdpFOJg5ihiI/uAM+oj4Dz4AriA== X-Received: by 2002:a37:6cc3:: with SMTP id h186-v6mr1339141qkc.49.1541616584713; Wed, 07 Nov 2018 10:49:44 -0800 (PST) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id i26sm1164596qtc.13.2018.11.07.10.49.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Nov 2018 10:49:44 -0800 (PST) From: Giuliano Belinassi X-Google-Original-From: Giuliano Belinassi Date: Wed, 7 Nov 2018 16:49:39 -0200 To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, renatogeh@gmail.com Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com Subject: [PATCH 1/3] staging: iio: ad7780: Add is_ad778x flag chip info Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180716 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch allows further checking of whatever the chip is (ad778x or ad717x). Signed-off-by: Giuliano Belinassi --- drivers/staging/iio/adc/ad7780.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index 91e016d534ed..6e51bfdb076a 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -35,6 +35,7 @@ struct ad7780_chip_info { struct iio_chan_spec channel; unsigned int pattern_mask; unsigned int pattern; + u8 is_ad778x; }; struct ad7780_state { @@ -135,21 +136,25 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = { .channel = AD7780_CHANNEL(12, 24), .pattern = 0x5, .pattern_mask = 0x7, + .is_ad778x = false, }, [ID_AD7171] = { .channel = AD7780_CHANNEL(16, 24), .pattern = 0x5, .pattern_mask = 0x7, + .is_ad778x = false, }, [ID_AD7780] = { .channel = AD7780_CHANNEL(24, 32), .pattern = 0x1, .pattern_mask = 0x3, + .is_ad778x = true, }, [ID_AD7781] = { .channel = AD7780_CHANNEL(20, 32), .pattern = 0x1, .pattern_mask = 0x3, + .is_ad778x = true, }, }; From patchwork Wed Nov 7 18:50:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Belinassi X-Patchwork-Id: 10672897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A34FF13A4 for ; Wed, 7 Nov 2018 18:50:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92F402CC93 for ; Wed, 7 Nov 2018 18:50:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8724D2CCA1; Wed, 7 Nov 2018 18:50:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 286842CC93 for ; Wed, 7 Nov 2018 18:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726068AbeKHEV5 (ORCPT ); Wed, 7 Nov 2018 23:21:57 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:33762 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726892AbeKHEV5 (ORCPT ); Wed, 7 Nov 2018 23:21:57 -0500 Received: by mail-qk1-f196.google.com with SMTP id o89so22278527qko.0; Wed, 07 Nov 2018 10:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=aUmnHASi5VAienY0hiyzBD+kiBDa50KR9QnFaLrop4c=; b=YeCywS48uAwP1TAyM+sgynRgPNVY7PsaSOZbwGfvynI7S6qo6K8T+TXclD1MQyQEH6 hvB7rsC7TLly8p4tZ8aT1V8i/v6SbWdchiwoGii4FTfNLMb/RZcCgbT49CR8pS+3WsBb 4gjOUxOeHXG9VPLMSjLYKvZvVUlTVzEPfaxNAFNRKj2WKM9+WwPKur7d7gVmL4NLrvEL uyEcBa3+7w/EzbWSmh3xssqi2aitnW7smkNA2r87yR9qS9I/ss1eo20T/yE2Ajz5KBFy xKY4DtaIfIkAmveAhHz0gK5jMtQpYI2AXC9sFxry/Wa0z3Tsbz92UQLGJAwK4ywmIe+f fbAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=aUmnHASi5VAienY0hiyzBD+kiBDa50KR9QnFaLrop4c=; b=S4BR39LllKx3Ie0guyEqVxa0xvFNXf5qjgtLGmCEbaif333+sKqfyE3KFMEEeP0hB6 4pb4po6aXnkvKmWt3HtsjQxB2KTn4p3xLTyFPvV/W5iTZR0kiIH1fBP7yExTanDqLelT zQRZcX5UcrVcE6m1ZNqmHcW5F7etWNJCcjCrpWXfPzeWCq01EAvCNMIWhk/qNMoVtfb6 wNQqMn1ipJws2ZxMGnuAITkB1gLLY6Pq3Z+qW76B/PJ6uyR1TotcPAehMPQl2i0K64Nk Yj/1jmLtkqHq7Wx9vywKxwBolsFMLufR9ygx/5vBmypF+LkJye6HnOy+16WjW2FgnDUl 4J8Q== X-Gm-Message-State: AGRZ1gJdBC+6yg5SNJ2lRjbYGDNLU4gvooxgUxyH1/aqwqDk8aYW5hk0 IBADOZeC6hBFpEqbneLWMcE= X-Google-Smtp-Source: AJdET5dTCnLaZv4QWPaBZyLT5W4OgPQqOEA5rJAa8A3fXxPw9W5+fF0YcPeUiM785QPEpYxKiQk8lw== X-Received: by 2002:a37:d1c5:: with SMTP id o66mr1356715qkl.293.1541616618385; Wed, 07 Nov 2018 10:50:18 -0800 (PST) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id f30-v6sm1163673qtf.50.2018.11.07.10.50.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Nov 2018 10:50:18 -0800 (PST) From: Giuliano Belinassi X-Google-Original-From: Giuliano Belinassi Date: Wed, 7 Nov 2018 16:50:10 -0200 To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, renatogeh@gmail.com Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com Subject: [PATCH 2/3] staging: iio: ad7780: check if ad778x before gain update Message-ID: <2a521e5f036eb74b684f368a6227509cac93fe0d.1541615978.git.giuliano.belinassi@usp.br> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180716 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Only the ad778x have the 'gain' status bit. Check it before updating. Signed-off-by: Giuliano Belinassi --- drivers/staging/iio/adc/ad7780.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index 6e51bfdb076a..0a473aae52f2 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -114,10 +114,12 @@ static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta, ((raw_sample & chip_info->pattern_mask) != chip_info->pattern)) return -EIO; - if (raw_sample & AD7780_GAIN) - st->gain = 1; - else - st->gain = 128; + if (chip_info->is_ad778x) { + if (raw_sample & AD7780_GAIN) + st->gain = 1; + else + st->gain = 128; + } return 0; } From patchwork Wed Nov 7 18:50:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Belinassi X-Patchwork-Id: 10672899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C0E2215E9 for ; Wed, 7 Nov 2018 18:51:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B13EB2CCAA for ; Wed, 7 Nov 2018 18:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A54552CCB2; Wed, 7 Nov 2018 18:51:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 332292CCAA for ; Wed, 7 Nov 2018 18:51:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727006AbeKHEWi (ORCPT ); Wed, 7 Nov 2018 23:22:38 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:37226 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726892AbeKHEWi (ORCPT ); Wed, 7 Nov 2018 23:22:38 -0500 Received: by mail-qk1-f193.google.com with SMTP id 131so22235479qkd.4; Wed, 07 Nov 2018 10:50:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=fqVW9dmdIWiv8QzanvaPNs8+eLiSJsnKkzhg+ry8T9w=; b=k/UpmasQJt3v9ru8qQpWlhEKxShVDvfN9ee/0qWZakyPY/mQwhoKcd4vr/afkhoVsy BJDfSEeyMFjdDE/LQsUuSmffAwRaQ2FYlnpMGGHPRH3vFRs1/A1yH6hNf/MMJExJJjyR T7Wc0Grot0XmYStw5XZmo2QC89Wdsm3+N+9IQ4IzfzbxuNVImfCifMUVSNdhfZtLBVF1 /COnRvkSLuafcA3matR4wbK8jH3BUGlXkMqPqaHjTSMZSmlnmhVH60CvsTQX42Yc566Z aM60zohn0xslAHivzTURHn1dvEslOMgiogTfNbepfjO3mV3z2GZQU8xHS+XFXbhhOsOg QgJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=fqVW9dmdIWiv8QzanvaPNs8+eLiSJsnKkzhg+ry8T9w=; b=YLUaNQl1SQ2kO58LhlvqZ5Ww8mz2jhs7sq9GMSzOEuT4E683jRZ1YLWxYyUWyFsrC3 ODe+sGQU2hxx1HXoPLEGBf6+DOfbCCeTXKtcvY2cYUTebz8pLC+yhAvd3dXjd2mVusLv HlQN1L6gUtXqzBJYHIgtCj1ljMCPfh2tBvGqJoSiwMk2BfGrondQ417UPQlSscjb5ZbE uhIWmp104VfrN+ewq2yJrr70b9hLbFCRdaNkyA1C7wDY+Fzh9vvZL15/DjjGZRaSsQWm bygk8A089uV0ENjm2Mj9V72lbuTAwW9gpfcVqKS+AEc+elCi7ObwWKPJHKbgipObL3f4 D4lA== X-Gm-Message-State: AGRZ1gIOBm7my2nEwe19ig1GJeQjjCAVbrBumYxN53+u4VubbtRyWXnl mMasd4dAoC3fYx6Ag9K+NIQ= X-Google-Smtp-Source: AJdET5fnH4ewbda0Jqt+hJ0oSBMTL92rllZMaw1EsftVjsb9/nzhz9Bp+M1wvhHOICfJhUUpSAxzQA== X-Received: by 2002:ac8:528b:: with SMTP id s11mr1367442qtn.199.1541616659345; Wed, 07 Nov 2018 10:50:59 -0800 (PST) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id m61-v6sm818076qte.30.2018.11.07.10.50.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Nov 2018 10:50:58 -0800 (PST) From: Giuliano Belinassi X-Google-Original-From: Giuliano Belinassi Date: Wed, 7 Nov 2018 16:50:53 -0200 To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, renatogeh@gmail.com Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com Subject: [PATCH 3/3] staging: iio: ad7780: generates pattern_mask from PAT bits Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180716 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Previously, all pattern_masks in the chip_info table were hardcoded. Now they are generated using the PAT macros, as described in the datasheets. Signed-off-by: Giuliano Belinassi --- drivers/staging/iio/adc/ad7780.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index 0a473aae52f2..fa9e047b5191 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -31,6 +31,8 @@ #define AD7780_PAT1 BIT(1) #define AD7780_PAT0 BIT(0) +#define AD7170_PAT2 BIT(2) + struct ad7780_chip_info { struct iio_chan_spec channel; unsigned int pattern_mask; @@ -137,25 +139,25 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = { [ID_AD7170] = { .channel = AD7780_CHANNEL(12, 24), .pattern = 0x5, - .pattern_mask = 0x7, + .pattern_mask = AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2, .is_ad778x = false, }, [ID_AD7171] = { .channel = AD7780_CHANNEL(16, 24), .pattern = 0x5, - .pattern_mask = 0x7, + .pattern_mask = AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2, .is_ad778x = false, }, [ID_AD7780] = { .channel = AD7780_CHANNEL(24, 32), .pattern = 0x1, - .pattern_mask = 0x3, + .pattern_mask = AD7780_PAT0 | AD7780_PAT1, .is_ad778x = true, }, [ID_AD7781] = { .channel = AD7780_CHANNEL(20, 32), .pattern = 0x1, - .pattern_mask = 0x3, + .pattern_mask = AD7780_PAT0 | AD7780_PAT1, .is_ad778x = true, }, };