]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: adc: Enable multiple consecutive channels based on model data
authorBilly Tsai <billy_tsai@aspeedtech.com>
Fri, 20 Mar 2026 05:46:36 +0000 (13:46 +0800)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 21 Mar 2026 15:48:53 +0000 (15:48 +0000)
Add helpers to generate channel masks and enable multiple ADC channels
according to the device model's channel count.

Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/aspeed_adc.c

index 8eebaa3dc53481bbd24fea76ef2fd7ed8fb47ed6..3ff24474f394a2638d4a070f6baa8ef6e9ea4868 100644 (file)
@@ -123,6 +123,24 @@ struct aspeed_adc_data {
        struct adc_gain         battery_mode_gain;
 };
 
+/*
+ * Enable multiple consecutive channels starting from channel 0.
+ * This creates a bitmask for channels 0 to (num_channels - 1).
+ * For example: num_channels=3 creates mask 0x0007 (channels 0,1,2)
+ */
+static inline u32 aspeed_adc_channels_mask(unsigned int num_channels)
+{
+       if (num_channels > 16)
+               return GENMASK(15, 0);
+
+       return BIT(num_channels) - 1;
+}
+
+static inline unsigned int aspeed_adc_get_active_channels(const struct aspeed_adc_data *data)
+{
+       return data->model_data->num_channels;
+}
+
 #define ASPEED_CHAN(_idx, _data_reg_addr) {                    \
        .type = IIO_VOLTAGE,                                    \
        .indexed = 1,                                           \
@@ -612,7 +630,9 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        /* Start all channels in normal mode. */
        adc_engine_control_reg_val =
                readl(data->base + ASPEED_REG_ENGINE_CONTROL);
-       adc_engine_control_reg_val |= ASPEED_ADC_CTRL_CHANNEL;
+       FIELD_MODIFY(ASPEED_ADC_CTRL_CHANNEL, &adc_engine_control_reg_val,
+                    aspeed_adc_channels_mask(aspeed_adc_get_active_channels(data)));
+
        writel(adc_engine_control_reg_val,
               data->base + ASPEED_REG_ENGINE_CONTROL);