From patchwork Mon Sep 25 08:18:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Billy Tsai X-Patchwork-Id: 144285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1057597vqu; Mon, 25 Sep 2023 01:29:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHC2auObbyQNcp+XdKB1lKmKuU9Ecd0OoHbDQAKpJ8DBYBH5IIDbHtQjtFhW94cjJkisLp X-Received: by 2002:a05:6808:158c:b0:3a9:e8e2:579d with SMTP id t12-20020a056808158c00b003a9e8e2579dmr6609175oiw.2.1695630568157; Mon, 25 Sep 2023 01:29:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695630568; cv=none; d=google.com; s=arc-20160816; b=PNQbBiKoo7HQkKo36bWRYZNFrvSeSyUompHngB0UWVa+QhP7cfhQ4mnhtCydYDUsvm /0L5KfRcpW7agxwIbD0ssJBmYHl+b8vGItPZGkj3bHm55XdQ+JpZYOcmcpccC9tJLhZS 8K3GCSl1GXrcLnUGdrXsVsEJxyr4GhmjpEUPETScOsQBQyZ0tRsFX0UFUi49scjLUxDe WPrxB0EK1jDDiS6K+J0nEFKYMI/CnKG2wmRfZSabY+kA/SxLHCkKTnEQQ6UZFEYQKdyu 2A4ofkNjuP3jRhIW/h8de2GDQqFA/WQzEsrGuIigtnlHCvTuywIA0Sc1ac3dDwCWO+3w VsJw== 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 :message-id:date:subject:to:from; bh=D+0G6ULZInH+uYzUX44LR0ZcJRe+pUS7X5qYs3TkqDI=; fh=jsiy+voF0ukDqiSa0vqTdp43NFEbdr2nczWrK6q8WCw=; b=r0F7NFEhoyt55cmosuyhUsklJ53meFwQM/KZQjR5quiAzXFQdy9vX2qyvR4cQl8XxP dhJPdASiSntJUcNOAzndmcpr2pfoN54D+xkjjEGCtAUEX0Xs7vsfp21eMquoTvCQKr8Z eor8hVC/f4V0syBMp+xiWaLcxGsI+XzxtKiYEX70qBdkldyh1XqxV2igl8S5QHc0oBo4 o4H4eNk7R4ehqqaZvYMmVQgViw+2UIghxpmszNctu1hzQtlo9F5kTC5mJAQuZyGUidDc m6Yp8AVwLHKY3APQj/bchYBV3GvgQ06SpvxW+EZZTOESyfau7xV7wSAWhkEQEH1IZ+lh wl7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=aspeedtech.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g2-20020a056a0023c200b0068beee4922csi10313211pfc.23.2023.09.25.01.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 01:29:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=aspeedtech.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4247980E7133; Mon, 25 Sep 2023 01:19:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232623AbjIYITA (ORCPT + 30 others); Mon, 25 Sep 2023 04:19:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232117AbjIYIS5 (ORCPT ); Mon, 25 Sep 2023 04:18:57 -0400 Received: from TWMBX02.aspeed.com (mail.aspeedtech.com [211.20.114.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A560CA3; Mon, 25 Sep 2023 01:18:49 -0700 (PDT) Received: from TWMBX02.aspeed.com (192.168.0.24) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 25 Sep 2023 16:18:46 +0800 Received: from twmbx02.aspeed.com (192.168.10.10) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 25 Sep 2023 16:18:46 +0800 From: Billy Tsai To: , , , , , , , , , , Subject: [PATCH v1] iio: adc: aspeed: Support deglitch feature. Date: Mon, 25 Sep 2023 16:18:45 +0800 Message-ID: <20230925081845.4147424-1-billy_tsai@aspeedtech.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Received-SPF: Fail (TWMBX02.aspeed.com: domain of billy_tsai@aspeedtech.com does not designate 192.168.10.10 as permitted sender) receiver=TWMBX02.aspeed.com; client-ip=192.168.10.10; helo=twmbx02.aspeed.com; X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_FAIL,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 25 Sep 2023 01:19:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777997518861219944 X-GMAIL-MSGID: 1777997518861219944 Create event sysfs for applying the deglitch condition. When in_voltageY_thresh_rising_en/in_voltageY_thresh_falling_en is set to true, the driver will use the in_voltageY_thresh_rising_value and in_voltageY_thresh_falling_value as threshold values. If the ADC value falls outside this threshold, the driver will wait for the ADC sampling period and perform an additional read once to achieve the deglitching purpose. Signed-off-by: Billy Tsai --- drivers/iio/adc/aspeed_adc.c | 193 ++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c index 998e8bcc06e1..9e746c81d916 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c @@ -95,6 +95,7 @@ struct aspeed_adc_model_data { bool wait_init_sequence; bool need_prescaler; bool bat_sense_sup; + bool require_extra_eoc; u8 scaler_bit_width; unsigned int num_channels; const struct aspeed_adc_trim_locate *trim_locate; @@ -120,6 +121,26 @@ struct aspeed_adc_data { int cv; bool battery_sensing; struct adc_gain battery_mode_gain; + unsigned int required_eoc_num; + u16 *upper_bound; + u16 *lower_bound; + bool *upper_en; + bool *lower_en; +}; + +static const struct iio_event_spec aspeed_adc_events[] = { + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_RISING, + .mask_separate = + BIT(IIO_EV_INFO_VALUE) | BIT(IIO_EV_INFO_ENABLE), + }, + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_FALLING, + .mask_separate = + BIT(IIO_EV_INFO_VALUE) | BIT(IIO_EV_INFO_ENABLE), + }, }; #define ASPEED_CHAN(_idx, _data_reg_addr) { \ @@ -131,6 +152,8 @@ struct aspeed_adc_data { .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ BIT(IIO_CHAN_INFO_SAMP_FREQ) | \ BIT(IIO_CHAN_INFO_OFFSET), \ + .event_spec = aspeed_adc_events, \ + .num_event_specs = ARRAY_SIZE(aspeed_adc_events), \ } static const struct iio_chan_spec aspeed_adc_iio_channels[] = { @@ -277,6 +300,35 @@ static int aspeed_adc_set_sampling_rate(struct iio_dev *indio_dev, u32 rate) return 0; } +static int aspeed_adc_get_voltage_raw(struct aspeed_adc_data *data, + struct iio_chan_spec const *chan) +{ + int val; + + val = readw(data->base + chan->address); + dev_dbg(data->dev, + "%d upper_bound: %d %x, lower_bound: %d %x, delay: %d * %d ns", + chan->channel, data->upper_en[chan->channel], + data->upper_bound[chan->channel], data->lower_en[chan->channel], + data->lower_bound[chan->channel], data->sample_period_ns, + data->required_eoc_num); + if (data->upper_en[chan->channel]) { + if (val >= data->upper_bound[chan->channel]) { + ndelay(data->sample_period_ns * + data->required_eoc_num); + val = readw(data->base + chan->address); + } + } + if (data->lower_en[chan->channel]) { + if (val <= data->lower_bound[chan->channel]) { + ndelay(data->sample_period_ns * + data->required_eoc_num); + val = readw(data->base + chan->address); + } + } + return val; +} + static int aspeed_adc_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -299,14 +351,15 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, * Experiment result is 1ms. */ mdelay(1); - *val = readw(data->base + chan->address); + *val = aspeed_adc_get_voltage_raw(data, chan); *val = (*val * data->battery_mode_gain.mult) / data->battery_mode_gain.div; /* Restore control register value */ writel(adc_engine_control_reg_val, data->base + ASPEED_REG_ENGINE_CONTROL); - } else - *val = readw(data->base + chan->address); + } else { + *val = aspeed_adc_get_voltage_raw(data, chan); + } return IIO_VAL_INT; case IIO_CHAN_INFO_OFFSET: @@ -369,9 +422,106 @@ static int aspeed_adc_reg_access(struct iio_dev *indio_dev, return 0; } +static int aspeed_adc_read_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct aspeed_adc_data *data = iio_priv(indio_dev); + + switch (dir) { + case IIO_EV_DIR_RISING: + return data->upper_en[chan->channel]; + case IIO_EV_DIR_FALLING: + return data->lower_en[chan->channel]; + default: + return -EINVAL; + } +} + +static int aspeed_adc_write_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + int state) +{ + struct aspeed_adc_data *data = iio_priv(indio_dev); + + switch (dir) { + case IIO_EV_DIR_RISING: + data->upper_en[chan->channel] = state ? 1 : 0; + break; + case IIO_EV_DIR_FALLING: + data->lower_en[chan->channel] = state ? 1 : 0; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int aspeed_adc_write_event_value(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, int val, + int val2) +{ + struct aspeed_adc_data *data = iio_priv(indio_dev); + + if (info != IIO_EV_INFO_VALUE) + return -EINVAL; + + switch (dir) { + case IIO_EV_DIR_RISING: + if (val >= BIT(ASPEED_RESOLUTION_BITS)) + return -EINVAL; + data->upper_bound[chan->channel] = val; + break; + case IIO_EV_DIR_FALLING: + data->lower_bound[chan->channel] = val; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int aspeed_adc_read_event_value(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, int *val, + int *val2) +{ + struct aspeed_adc_data *data = iio_priv(indio_dev); + + if (info != IIO_EV_INFO_VALUE) + return -EINVAL; + + switch (dir) { + case IIO_EV_DIR_RISING: + *val = data->upper_bound[chan->channel]; + break; + case IIO_EV_DIR_FALLING: + *val = data->lower_bound[chan->channel]; + break; + default: + return -EINVAL; + } + + return IIO_VAL_INT; +} + static const struct iio_info aspeed_adc_iio_info = { .read_raw = aspeed_adc_read_raw, .write_raw = aspeed_adc_write_raw, + .read_event_config = &aspeed_adc_read_event_config, + .write_event_config = &aspeed_adc_write_event_config, + .read_event_value = &aspeed_adc_read_event_value, + .write_event_value = &aspeed_adc_write_event_value, .debugfs_reg_access = aspeed_adc_reg_access, }; @@ -502,6 +652,30 @@ static int aspeed_adc_probe(struct platform_device *pdev) if (IS_ERR(data->base)) return PTR_ERR(data->base); + data->upper_bound = devm_kzalloc(&pdev->dev, + sizeof(data->upper_bound) * + data->model_data->num_channels, + GFP_KERNEL); + if (!data->upper_bound) + return -ENOMEM; + data->upper_en = devm_kzalloc(&pdev->dev, + sizeof(data->upper_en) * + data->model_data->num_channels, + GFP_KERNEL); + if (!data->upper_en) + return -ENOMEM; + data->lower_bound = devm_kzalloc(&pdev->dev, + sizeof(data->lower_bound) * + data->model_data->num_channels, + GFP_KERNEL); + if (!data->lower_bound) + return -ENOMEM; + data->lower_en = devm_kzalloc(&pdev->dev, + sizeof(data->lower_en) * + data->model_data->num_channels, + GFP_KERNEL); + if (!data->lower_en) + return -ENOMEM; /* Register ADC clock prescaler with source specified by device tree. */ spin_lock_init(&data->clk_lock); snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), "%s", @@ -632,7 +806,14 @@ static int aspeed_adc_probe(struct platform_device *pdev) adc_engine_control_reg_val |= ASPEED_ADC_CTRL_CHANNEL; writel(adc_engine_control_reg_val, data->base + ASPEED_REG_ENGINE_CONTROL); - + adc_engine_control_reg_val = + FIELD_GET(ASPEED_ADC_CTRL_CHANNEL, + readl(data->base + ASPEED_REG_ENGINE_CONTROL)); + data->required_eoc_num = hweight_long(adc_engine_control_reg_val); + if (data->model_data->require_extra_eoc && + (adc_engine_control_reg_val & + BIT(data->model_data->num_channels - 1))) + data->required_eoc_num += 12; indio_dev->name = data->model_data->model_name; indio_dev->info = &aspeed_adc_iio_info; indio_dev->modes = INDIO_DIRECT_MODE; @@ -668,6 +849,7 @@ static const struct aspeed_adc_model_data ast2400_model_data = { .need_prescaler = true, .scaler_bit_width = 10, .num_channels = 16, + .require_extra_eoc = 0, }; static const struct aspeed_adc_model_data ast2500_model_data = { @@ -680,6 +862,7 @@ static const struct aspeed_adc_model_data ast2500_model_data = { .scaler_bit_width = 10, .num_channels = 16, .trim_locate = &ast2500_adc_trim, + .require_extra_eoc = 0, }; static const struct aspeed_adc_model_data ast2600_adc0_model_data = { @@ -691,6 +874,7 @@ static const struct aspeed_adc_model_data ast2600_adc0_model_data = { .scaler_bit_width = 16, .num_channels = 8, .trim_locate = &ast2600_adc0_trim, + .require_extra_eoc = 1, }; static const struct aspeed_adc_model_data ast2600_adc1_model_data = { @@ -702,6 +886,7 @@ static const struct aspeed_adc_model_data ast2600_adc1_model_data = { .scaler_bit_width = 16, .num_channels = 8, .trim_locate = &ast2600_adc1_trim, + .require_extra_eoc = 1, }; static const struct of_device_id aspeed_adc_matches[] = {