Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5319060ybc; Wed, 27 Nov 2019 02:09:02 -0800 (PST) X-Google-Smtp-Source: APXvYqy/d06+51WZSHYL5S0hf15iNoNPLA3dFzNRyz/RGvmODxYsSwzBP+oqa022SeMpWPcNIbGu X-Received: by 2002:aa7:c54a:: with SMTP id s10mr25019478edr.5.1574849342637; Wed, 27 Nov 2019 02:09:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574849342; cv=none; d=google.com; s=arc-20160816; b=XI9Qu1QKjZBnPIpUnYSvGz4/QEGMVajG8Dpt7/t1ZWDcI9nVjr7+obU/2hRtVqr88G ZCm7rr3we8bqnK8OhhgJfqqr8Ilw111SUgt0DdJMsWtYzWg34ctQXE7rSl47xnfKBHp+ LVyBeYHGoa2Mvpq8l7WySxPDECqRS4Zz4wN+yk9qe/BaeXx0kz9ltXMmjnaZbMH18VYQ QU8dbhNLKmGVMZj+jIR937Yzq8Rpiy7MKtmfe5VnDObDMQytUnKb4QA8sDA4+NcpoF4I pGcSZm7htZtUtY6WHHbG5+ymSjsZJ1SqUXwl1bdBDhNZIhw3LQ/GrpuTTVHpNIT+c7SY QGjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:to :from:dkim-signature; bh=VAggDD7eOOudtLCJRIZWwLHbOcnWRF07mVpnmo9075g=; b=m5wn7WEIVctFktNsqYnGXO1A34PVxmFLJwdrkRvNIvDoupbg8t3q2UqScys5pQ0Jkk zfMtsxqESlpBs733Nt5BtxehGr59ukFbOImC7g9UjrrbycgdgS7kJUkG08/BNhACJ0mV fwGto1Uj7O41TzOf1lU09Fa+PY4LKrPQUlZpaDklAmbxyPaRPbj0NDkb7ludf37wEizV +ZlMCGMsxinHmVjwbT0pgMx2xMXd/XBly1Od13UVk30l+Vighjj+CMCyUbVYayhcYz72 zn7GE42nrTu+IonK0gQtBQ3oIv3eWSqjwUKm45RweT5Wzq7ZBNR4eO87pQV4hAnGhFub GC8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=Xhl35aFk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=st.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q23si2482847edc.300.2019.11.27.02.08.38; Wed, 27 Nov 2019 02:09:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=Xhl35aFk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726698AbfK0KHi (ORCPT + 99 others); Wed, 27 Nov 2019 05:07:38 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:16124 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726092AbfK0KHh (ORCPT ); Wed, 27 Nov 2019 05:07:37 -0500 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xARA7AGl032453; Wed, 27 Nov 2019 11:07:17 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : subject : date : message-id : mime-version : content-type; s=STMicroelectronics; bh=VAggDD7eOOudtLCJRIZWwLHbOcnWRF07mVpnmo9075g=; b=Xhl35aFk4FKmIqnDte+5HLyVlueiHnEO478B0pFnD948tio0UouOKZVf1p5ug0J3FF6b GQahQBaXYLsF+G0iXQFc3njAHBeXohOOjfLhHs0p92fjbeOaS0ZLvRpd+WmqPWTvSAs1 3FayiqM255Dv43/6E3ndE+Bs4J3zqL/EhECsINQO6V652R7XCOJJ0qXxrwsDQuLkMsQB rc7tBT7uCKWG1CWsNe+JiRoht0vHA1y7lrf3jluG4vd2UsP2inL5RC5rmh3FlHfJMFtt lPO/oYlNdv+by9JGnpcen2O1AN07t5jyftnYezEnmHH2rHmgsbjtoo/afOASpM3NITTn aw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2whcxsax09-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Nov 2019 11:07:17 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 7E14A100038; Wed, 27 Nov 2019 11:07:15 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag6node2.st.com [10.75.127.17]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id C806E2B11EF; Wed, 27 Nov 2019 11:07:15 +0100 (CET) Received: from localhost (10.75.127.47) by SFHDAG6NODE2.st.com (10.75.127.17) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Wed, 27 Nov 2019 11:07:15 +0100 From: Olivier Moysan To: , , , , , , , , , , , , Subject: [INTERNAL][PATCH] iio: adc: stm32-dfsdm: adapt sampling rate to oversampling ratio Date: Wed, 27 Nov 2019 11:07:12 +0100 Message-ID: <20191127100712.24558-1-olivier.moysan@st.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.47] X-ClientProxiedBy: SFHDAG6NODE2.st.com (10.75.127.17) To SFHDAG6NODE2.st.com (10.75.127.17) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-27_02:2019-11-27,2019-11-27 signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update sampling rate when oversampling ratio is changed through the IIO ABI. Signed-off-by: Olivier Moysan --- drivers/iio/adc/stm32-dfsdm-adc.c | 32 ++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c index 0339ecdd06bd..87a842507509 100644 --- a/drivers/iio/adc/stm32-dfsdm-adc.c +++ b/drivers/iio/adc/stm32-dfsdm-adc.c @@ -1221,14 +1221,32 @@ static int stm32_dfsdm_write_raw(struct iio_dev *indio_dev, unsigned int spi_freq; int ret = -EINVAL; + switch (ch->src) { + case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL: + spi_freq = adc->dfsdm->spi_master_freq; + break; + case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_FALLING: + case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_RISING: + spi_freq = adc->dfsdm->spi_master_freq / 2; + break; + default: + spi_freq = adc->spi_freq; + } + switch (mask) { case IIO_CHAN_INFO_OVERSAMPLING_RATIO: ret = iio_device_claim_direct_mode(indio_dev); if (ret) return ret; + ret = stm32_dfsdm_compute_all_osrs(indio_dev, val); - if (!ret) + if (!ret) { + dev_dbg(&indio_dev->dev, + "Sampling rate changed from (%u) to (%u)\n", + adc->sample_freq, spi_freq / val); adc->oversamp = val; + adc->sample_freq = spi_freq / val; + } iio_device_release_direct_mode(indio_dev); return ret; @@ -1240,18 +1258,6 @@ static int stm32_dfsdm_write_raw(struct iio_dev *indio_dev, if (ret) return ret; - switch (ch->src) { - case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL: - spi_freq = adc->dfsdm->spi_master_freq; - break; - case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_FALLING: - case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_RISING: - spi_freq = adc->dfsdm->spi_master_freq / 2; - break; - default: - spi_freq = adc->spi_freq; - } - ret = dfsdm_adc_set_samp_freq(indio_dev, val, spi_freq); iio_device_release_direct_mode(indio_dev); return ret; -- 2.17.1