Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp3170430pxb; Tue, 24 Aug 2021 17:25:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyi2lUBRN+4Dfpaw9FuOVhsgRmVa0AnhzOu4SWDBjJ2az2Pmd4ulbHE7m9HvgN8D/xIvgtd X-Received: by 2002:a02:a695:: with SMTP id j21mr33955688jam.99.1629851153053; Tue, 24 Aug 2021 17:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629851153; cv=none; d=google.com; s=arc-20160816; b=ZS1Ipdk+3x+/o/owfCZIK2hH6yhZsGDL/IDv3dI/4xrhWKMUtOQW4n6fNiw0/uMF4e VbfHKm9ZHskGFVkSSlLauBd78kOoRpiwVLoZ2F25B/NNjze4MN/krdbbaZC+bsZsbArY itwlLigRn4lQIXvQlh6Yny1+S5jvrczi1HYxNgOlKR0q8ox0yiQSfhbPomS0RHcyQMN4 /TuLJuaysCyFmturuNUquCBafGkN0/8jkCHE+jYZQ1nNHVTELaHmhvdkAH5au4/zAyVI ih9PdtA3GFnIlGWotPL62fZ4SZvWLKv5GM/R2txbec8uF0PSer8dhNM0C9CXasYEU3Uz N5wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:date:subject:cc:to:from:message-id; bh=DuBCCwmiWAtKHi9x6Kq0QwHrvwXHJhgIsjBc/aii61k=; b=cCqkCHtuI+bgOizhJkg4HG+5je9agZ/8XeMqbt5Zso5qWe65FjMKnWnbvCNl5vmVz8 1U2g73/N1w3MkqoSmCSvZ2vSumotbU4NBnFzsExm88oQGKcqsBHl0gos1KH1VKpfFsz0 aU5oQ34j6gH3HPz4dHFwJ+EL26lXbxTTPdZa/DBCWzeMQ66jz1Vk5O8gU10LtwKzsXNT 8+N3zQcug6OjjV2RgwFsphU4aIA7VWcXApZSWgcc1MngxKCvoImL6mx96NXkC4O0onrM hTF1Q/h1m6XGzGHUK5ZGYQvczdQnKY8FY+YOQKm8ZoejfIKdtvRzpVpEYM3EOrRffUn8 M2Xg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y20si1179998jao.34.2021.08.24.17.25.26; Tue, 24 Aug 2021 17:25:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236143AbhHYAYv (ORCPT + 99 others); Tue, 24 Aug 2021 20:24:51 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:48881 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234259AbhHYAYv (ORCPT ); Tue, 24 Aug 2021 20:24:51 -0400 Received: (from root@localhost) by twspam01.aspeedtech.com id 17P05VMT096162 for ; Wed, 25 Aug 2021 08:05:31 +0800 (GMT-8) (envelope-from billy_tsai@aspeedtech.com) Message-Id: <202108250005.17P05VMT096162@twspam01.aspeedtech.com> Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 17O8rHTG098403; Tue, 24 Aug 2021 16:53:17 +0800 (GMT-8) (envelope-from billy_tsai@aspeedtech.com) Received: from BillyTsai-pc.aspeed.com (192.168.2.149) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Aug 2021 17:11:49 +0800 From: Billy Tsai To: , , , , , , , , , , , , , CC: Subject: [RESEND v4 12/15] iio: adc: aspeed: Add func to set sampling rate. Date: Tue, 24 Aug 2021 17:12:40 +0800 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210824091243.9393-1-billy_tsai@aspeedtech.com> References: <20210824091243.9393-1-billy_tsai@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [192.168.2.149] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 17P05VMT096162 X-MSS: FORWARD@twspam01.aspeedtech.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the function to set the sampling rate and keep the sampling period for a driver used to wait the lastest value. Signed-off-by: Billy Tsai --- drivers/iio/adc/aspeed_adc.c | 58 +++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c index 8fe7da1a651f..4d979dd7fe88 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c @@ -65,6 +65,12 @@ #define ASPEED_ADC_INIT_POLLING_TIME 500 #define ASPEED_ADC_INIT_TIMEOUT 500000 +/* + * When the sampling rate is too high, the ADC may not have enough charging + * time, resulting in a low voltage value. Thus, default use slow sampling + * rate for most user case. + */ +#define ASPEED_ADC_DEF_SAMPLING_RATE 65000 struct aspeed_adc_model_data { const char *model_name; @@ -88,6 +94,7 @@ struct aspeed_adc_data { struct clk_hw *clk_scaler; struct reset_control *rst; int vref; + u32 sample_period_ns; }; #define ASPEED_CHAN(_idx, _data_reg_addr) { \ @@ -119,6 +126,24 @@ static const struct iio_chan_spec aspeed_adc_iio_channels[] = { ASPEED_CHAN(15, 0x2E), }; +static int aspeed_adc_set_sampling_rate(struct iio_dev *indio_dev, u32 rate) +{ + struct aspeed_adc_data *data = iio_priv(indio_dev); + + if (rate < data->model_data->min_sampling_rate || + rate > data->model_data->max_sampling_rate) + return -EINVAL; + /* Each sampling needs 12 clocks to covert.*/ + clk_set_rate(data->clk_scaler->clk, rate * ASPEED_CLOCKS_PER_SAMPLE); + rate = clk_get_rate(data->clk_scaler->clk); + data->sample_period_ns = DIV_ROUND_UP_ULL( + (u64)NSEC_PER_SEC * ASPEED_CLOCKS_PER_SAMPLE, rate); + dev_dbg(data->dev, "Adc clock = %d sample period = %d ns", rate, + data->sample_period_ns); + + return 0; +} + static int aspeed_adc_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -149,17 +174,10 @@ static int aspeed_adc_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int val, int val2, long mask) { - struct aspeed_adc_data *data = iio_priv(indio_dev); switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: - if (val < data->model_data->min_sampling_rate || - val > data->model_data->max_sampling_rate) - return -EINVAL; - - clk_set_rate(data->clk_scaler->clk, - val * ASPEED_CLOCKS_PER_SAMPLE); - return 0; + return aspeed_adc_set_sampling_rate(indio_dev, val); case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_RAW: @@ -386,6 +404,20 @@ static int aspeed_adc_probe(struct platform_device *pdev) if (ret) return ret; + ret = clk_prepare_enable(data->clk_scaler->clk); + if (ret) + return ret; + + ret = devm_add_action_or_reset(data->dev, + aspeed_adc_clk_disable_unprepare, + data->clk_scaler->clk); + if (ret) + return ret; + + ret = aspeed_adc_set_sampling_rate(indio_dev, ASPEED_ADC_DEF_SAMPLING_RATE); + if (ret) + return ret; + ret = aspeed_adc_vref_config(indio_dev); if (ret) return ret; @@ -413,16 +445,6 @@ static int aspeed_adc_probe(struct platform_device *pdev) } /* Start all channels in normal mode. */ - ret = clk_prepare_enable(data->clk_scaler->clk); - if (ret) - return ret; - - ret = devm_add_action_or_reset(data->dev, - aspeed_adc_clk_disable_unprepare, - data->clk_scaler->clk); - if (ret) - return ret; - adc_engine_control_reg_val = readl(data->base + ASPEED_REG_ENGINE_CONTROL); adc_engine_control_reg_val |= -- 2.25.1