From patchwork Mon Dec 4 14:12:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 120545 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4486786qgn; Mon, 4 Dec 2017 06:15:07 -0800 (PST) X-Google-Smtp-Source: AGs4zMboYOGw4guvhkYckMlxnBpsNk3mC7PL2uCeOeNcOUREkIn6+S0clr0C9pPmM1V+nrU3Nd5t X-Received: by 10.98.31.142 with SMTP id l14mr19573123pfj.62.1512396907844; Mon, 04 Dec 2017 06:15:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512396907; cv=none; d=google.com; s=arc-20160816; b=Z7ge86Pm4uPwxabBKnxMx3T8kYxmWH8Bxnl6w7R6Qx4ZkrGaUHDPDX+2ZPwfbal5dk RsuLe+QvA6ykOk60b4i6a+WyFFoa5SlNeM7PgSA51BhVaqJT34QCNoJvWRr87ejvnBpx XdRQMDD7LlZbwyBLaFuhyG78ay0tulZEq0htzHIeM/l5Nn/pknDXIOvwAxV75NeV4W5p RxUzNeFB8dYzJsZQRdRjdg3dTHybbkGAQIoZKK1KKtudtRdRP/ghCaUQ9lZcDlI75YCk xMqgmOlWoiYoLQcbUyHjaIK9abJQ9mUjxyqGLF+nI1RXUGy5c9Tgp6qrDc16mr56z7oD mibg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Ia8VGFvFu7rB1NeddIukqwiQQ+DjOPZM4o0NUuoh5Ww=; b=ZXIdvFEgqnmZlX+0+EIzjNFaUlsp9am3LML1z7UfUjA8bX42RDaAphuvJjZ+RbdckS jZSlz2pogi5DmS0gt9mt6Rq9IbsyJsWlnPT6Id8ndEYun8m160WY8QuD5Zpgbg9Ord16 W+1MvQdGwu+wgsxBNiBv1y3eow7iWukm6tByODrjyVsoC9r9aotLEKrZINX1wsqm1Obt 1RSss8GVajjtlOAXhOArYdWBGm9XOyw4V4xC4r0q+kMQXK6g0G6lvJBXGpu1tIW2W6P0 8nsGxudZmE8m9koEbxmhD1bbvNvm+Jf7kmmPJtvySFtQoiXCO4/z8xKXAmjfpH0pcDcV NBnw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 h9si9420955pgp.365.2017.12.04.06.15.07; Mon, 04 Dec 2017 06:15:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752688AbdLDOPG (ORCPT + 6 others); Mon, 4 Dec 2017 09:15:06 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:54095 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753942AbdLDOPC (ORCPT ); Mon, 4 Dec 2017 09:15:02 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id ABF9820744; Mon, 4 Dec 2017 15:15:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 37C7D20976; Mon, 4 Dec 2017 15:14:50 +0100 (CET) From: Quentin Schulz To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, jic23@kernel.org, lee.jones@linaro.org Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-iio@vger.kernel.org, icenowy@aosc.io, linux-sunxi@googlegroups.com, thomas.petazzoni@free-electrons.com, Quentin Schulz Subject: [PATCH 1/8] iio: adc: axp20x_adc: put ADC rate setting in a per-variant function Date: Mon, 4 Dec 2017 15:12:47 +0100 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org To prepare for a new comer that set a different register with different values, move rate setting in a function that is specific to each AXP variant. Signed-off-by: Quentin Schulz --- drivers/iio/adc/axp20x_adc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) -- git-series 0.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Jonathan Cameron diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c index a30a972..7274f4f 100644 --- a/drivers/iio/adc/axp20x_adc.c +++ b/drivers/iio/adc/axp20x_adc.c @@ -470,14 +470,18 @@ static const struct iio_info axp22x_adc_iio_info = { .read_raw = axp22x_read_raw, }; -static int axp20x_adc_rate(int rate) +static int axp20x_adc_rate(struct axp20x_adc_iio *info, int rate) { - return AXP20X_ADC_RATE_HZ(rate); + return regmap_update_bits(info->regmap, AXP20X_ADC_RATE, + AXP20X_ADC_RATE_MASK, + AXP20X_ADC_RATE_HZ(rate)); } -static int axp22x_adc_rate(int rate) +static int axp22x_adc_rate(struct axp20x_adc_iio *info, int rate) { - return AXP22X_ADC_RATE_HZ(rate); + return regmap_update_bits(info->regmap, AXP20X_ADC_RATE, + AXP20X_ADC_RATE_MASK, + AXP22X_ADC_RATE_HZ(rate)); } struct axp_data { @@ -485,7 +489,7 @@ struct axp_data { int num_channels; struct iio_chan_spec const *channels; unsigned long adc_en1_mask; - int (*adc_rate)(int rate); + int (*adc_rate)(struct axp20x_adc_iio *info, int rate); bool adc_en2; struct iio_map *maps; }; @@ -554,8 +558,7 @@ static int axp20x_probe(struct platform_device *pdev) AXP20X_ADC_EN2_MASK, AXP20X_ADC_EN2_MASK); /* Configure ADCs rate */ - regmap_update_bits(info->regmap, AXP20X_ADC_RATE, AXP20X_ADC_RATE_MASK, - info->data->adc_rate(100)); + info->data->adc_rate(info, 100); ret = iio_map_array_register(indio_dev, info->data->maps); if (ret < 0) {