From patchwork Wed Jun 21 06:26:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 110799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4160602vqr; Tue, 20 Jun 2023 23:37:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4LTlcFdO2yt1SbJ0cwWFJgq9ypYwY7x9uWaMD+6y8rtGSkMV+5Cv/ktZmSr5eCjXpqBC1Z X-Received: by 2002:a05:6a20:4289:b0:122:5c71:6c82 with SMTP id o9-20020a056a20428900b001225c716c82mr4999756pzj.41.1687329422172; Tue, 20 Jun 2023 23:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687329422; cv=none; d=google.com; s=arc-20160816; b=o/nWcZX0yRV3iK+RUD1H6n6Eerjofe9rLc9ahZZyOcRaldKboSSyw8KBz1bhrRxakH mmhJmDWgXrjm9po7B7pnBIiv3nTBWP0E55nTVXnmfRUusNRdcgwQCaDhD0IOe4lUbFVF k74LyOdviev4o0Q9OH4K05rg+G0K0V2vtvXu+olQTVsXLDDg3U8EEyvvfj3YMsDncuTi w+UfxeCdv+nyKGcFsE9P0+n+G4AT88lnnIJcCinEMUkPP5NUY+vnDBHRSUwVVzp4v8UM jw+/fp5AGLC+bi8wk+fwKtlq/uHa48BZZTiAqtpua0c/TUxxRUMJumAudAKcCNY7kmdx Tv/g== 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:message-id:date:subject:cc:to:from :dkim-signature; bh=iYMidsTDXcTCWyifw1vWsk3ddCRuBC/523lS3FYIPhA=; b=ruNX/Fom1okV13o8M8PJELXHikejo+NcS+Gk0EntvcJ5Uevdjfhhf9SqEE032mQEJS RrSMuGAkE1nEl1LIAVxZoU8lCbWtm2R9A9NLJX7N8IN0k7Q4zlZUNd0L5siY+qkpNqg5 MiWhTmQuU1e5iRQSIzf5gM5SOoBJo8HF9GGFyPhOc1NnaZuM1JfxmdBS1mu5hI7hcm5u Pf49ea8zHAdhKwt8P2M6SZ5fL7+588IxcwH9XpZ0e9gbLUgywzQ5XBT15VSjDIGYeMCC 0TTxfWPc0rTmxO2cJ5dFpdk/6V+HbYc1uzSSL0yTszsKZWY8XoIDUkqXM4PMEw07U5YF AQnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=d91jAQnp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k13-20020a170902c40d00b001b3d6462915si3894646plk.623.2023.06.20.23.36.49; Tue, 20 Jun 2023 23:37:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=d91jAQnp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230293AbjFUG1u (ORCPT + 99 others); Wed, 21 Jun 2023 02:27:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230259AbjFUG1j (ORCPT ); Wed, 21 Jun 2023 02:27:39 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 352A61A3; Tue, 20 Jun 2023 23:27:38 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 851195FD61; Wed, 21 Jun 2023 09:27:36 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1687328856; bh=iYMidsTDXcTCWyifw1vWsk3ddCRuBC/523lS3FYIPhA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=d91jAQnp+1oOd7EG36ECRbKu2NluxoeVSEEiTUd+3ULMtQv2z3CSczX/CHzaCeLhF XDHWa9jh8ooov05wqJE2FPhTyVl9fZXyAoSwZOLkntZBr7H0V8Q3B0FIghnZQTIU30 eTP4UJpzwSvbsES98TfHRxOR4sTRhatLEWh5+QQwCOhQao9qvd+XNzOoikgn48pYdm /qTyR8V9GOqkVEvS45goJtDNIzoRUL5ZIeXS5t8qH2yoWqQuCFlW1Hk8M78wfRJxyp rC0GkQiqWJUvEcOvIk1VM/GNGl9g3oQBxaY1fjo5wkpubxch1GqrgJ6qCmC/qyu8Zy Clvf2m+/oSxuQ== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) by mx.sberdevices.ru (Postfix) with ESMTP; Wed, 21 Jun 2023 09:27:36 +0300 (MSK) From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v1 3/3] meson saradc: support reading from channel7 mux inputs Date: Wed, 21 Jun 2023 09:26:10 +0300 Message-ID: <20230621062715.455652-4-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230621062715.455652-1-gnstark@sberdevices.ru> References: <20230621062715.455652-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/06/20 23:30:00 #21539802 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769293135983846001?= X-GMAIL-MSGID: =?utf-8?q?1769293135983846001?= meson saradc channel 7 is connected to muxer that can switch channel input to well-known sources like Vdd, GND and several Vdd dividers. This patch adds iio channel for every mux input. Signed-off-by: George Stark --- drivers/iio/adc/meson_saradc.c | 65 +++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 66d6f527122c..c4f350b4523e 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -163,6 +163,7 @@ #define MESON_SAR_ADC_MAX_FIFO_SIZE 32 #define MESON_SAR_ADC_TIMEOUT 100 /* ms */ #define MESON_SAR_ADC_VOLTAGE_AND_TEMP_CHANNEL 6 +#define MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL 7 #define MESON_SAR_ADC_TEMP_OFFSET 27 /* temperature sensor calibration information in eFuse */ @@ -201,6 +202,19 @@ .datasheet_name = "TEMP_SENSOR", \ } +#define MESON_SAR_ADC_MUX(_chan, _sel) { \ + .type = IIO_VOLTAGE, \ + .channel = _chan, \ + .indexed = 1, \ + .address = MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_AVERAGE_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_CALIBBIAS) | \ + BIT(IIO_CHAN_INFO_CALIBSCALE), \ + .datasheet_name = "SAR_ADC_MUX_"#_sel, \ +} + enum meson_sar_adc_avg_mode { NO_AVERAGING = 0x0, MEAN_AVERAGING = 0x1, @@ -233,6 +247,27 @@ enum meson_sar_adc_channel_index { INDEX_CHAN_6, INDEX_CHAN_7, INDEX_CHAN_SOFT_TIMESTAMP, + INDEX_MUX_0_VSS, + INDEX_MUX_1_VDD_DIV4, + INDEX_MUX_2_VDD_DIV2, + INDEX_MUX_3_VDD_MUL3_DIV4, + INDEX_MUX_4_VDD, +}; + +static enum meson_sar_adc_chan7_mux_sel chan7_mux_values[] = { + CHAN7_MUX_VSS, + CHAN7_MUX_VDD_DIV4, + CHAN7_MUX_VDD_DIV2, + CHAN7_MUX_VDD_MUL3_DIV4, + CHAN7_MUX_VDD, +}; + +static const char * const chan7_mux_names[] = { + "gnd", + "0.25vdd", + "0.5vdd", + "0.75vdd", + "vdd", }; static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { @@ -245,6 +280,11 @@ static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { MESON_SAR_ADC_CHAN(INDEX_CHAN_6), MESON_SAR_ADC_CHAN(INDEX_CHAN_7), IIO_CHAN_SOFT_TIMESTAMP(INDEX_CHAN_SOFT_TIMESTAMP), + MESON_SAR_ADC_MUX(INDEX_MUX_0_VSS, 0), + MESON_SAR_ADC_MUX(INDEX_MUX_1_VDD_DIV4, 1), + MESON_SAR_ADC_MUX(INDEX_MUX_2_VDD_DIV2, 2), + MESON_SAR_ADC_MUX(INDEX_MUX_3_VDD_MUL3_DIV4, 3), + MESON_SAR_ADC_MUX(INDEX_MUX_4_VDD, 4), MESON_SAR_ADC_TEMP_CHAN(), /* must be the last item */ }; @@ -284,6 +324,7 @@ struct meson_sar_adc_priv { bool temperature_sensor_calibrated; u8 temperature_sensor_coefficient; u16 temperature_sensor_adc_val; + enum meson_sar_adc_chan7_mux_sel chan7_mux_sel; }; static const struct regmap_config meson_sar_adc_regmap_config_gxbb = { @@ -348,6 +389,8 @@ static void meson_sar_adc_set_chan7_mux(struct iio_dev *indio_dev, MESON_SAR_ADC_REG3_CTRL_CHAN7_MUX_SEL_MASK, regval); usleep_range(10, 20); + + priv->chan7_mux_sel = sel; } static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, @@ -443,6 +486,15 @@ static void meson_sar_adc_enable_channel(struct iio_dev *indio_dev, regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELTA_10, MESON_SAR_ADC_DELTA_10_TEMP_SEL, regval); + } else if (chan->address == MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL) { + enum meson_sar_adc_chan7_mux_sel sel; + + if (chan->channel == INDEX_CHAN_7) + sel = CHAN7_MUX_CH7_INPUT; + else + sel = chan7_mux_values[chan->channel - INDEX_MUX_0_VSS]; + if (sel != priv->chan7_mux_sel) + meson_sar_adc_set_chan7_mux(indio_dev, sel); } } @@ -1015,7 +1067,7 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); usleep_range(10, 20); ret = meson_sar_adc_get_sample(indio_dev, - &indio_dev->channels[INDEX_CHAN_7], + &indio_dev->channels[INDEX_MUX_1_VDD_DIV4], MEAN_AVERAGING, EIGHT_SAMPLES, &value0); if (ret < 0) goto out; @@ -1023,7 +1075,7 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_MUL3_DIV4); usleep_range(10, 20); ret = meson_sar_adc_get_sample(indio_dev, - &indio_dev->channels[INDEX_CHAN_7], + &indio_dev->channels[INDEX_MUX_3_VDD_MUL3_DIV4], MEAN_AVERAGING, EIGHT_SAMPLES, &value1); if (ret < 0) goto out; @@ -1050,8 +1102,13 @@ static int read_label(struct iio_dev *indio_dev, { if (chan->type == IIO_TEMP) return sprintf(label, "%s\n", "temp-sensor"); - if (chan->type == IIO_VOLTAGE) - return sprintf(label, "channel-%d\n", chan->channel); + if (chan->type == IIO_VOLTAGE) { + if (chan->channel <= INDEX_CHAN_7) + return sprintf(label, "channel-%d\n", chan->channel); + if (chan->channel >= INDEX_MUX_0_VSS) + return sprintf(label, "%s\n", + chan7_mux_names[chan->channel - INDEX_MUX_0_VSS]); + } return 0; }