iio: trigger: stm32-timer: add support for stm32mp25

Add support for STM32MP25 SoC. Use newly introduced compatible to handle
this new HW variant. Add TIM20 trigger definitions that can be used by
the stm32 analog-to-digital converter. Use compatible data to identify
it.
As the counter framework is now superseding the deprecated IIO counter
interface (IIO_COUNT), don't support it. Only register IIO trigger
devices for ADC usage. So, make the valids_table a cfg option.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://patch.msgid.link/20241220095927.1122782-4-fabrice.gasnier@foss.st.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
index bd58e60f586c57277e50efed5c0aaa4c360a92ab..e41cb741253b8410cfa6734f7e4c82d220160a97 100644 (file)
--- a/drivers/iio/trigger/stm32-timer-trigger.c
+++ b/drivers/iio/trigger/stm32-timer-trigger.c
@@ -38,6 +38,9 @@ static const void *triggers_table[][MAX_TRIGGERS] = {
        { TIM15_TRGO,},
        { TIM16_OC1,},
        { TIM17_OC1,},
+       { }, /* timer 18 */
+       { }, /* timer 19 */
+       { TIM20_TRGO, TIM20_TRGO2, TIM20_OC1, TIM20_OC2, TIM20_OC3, },
 };
 
 /* List the triggers accepted by each timer */
@@ -791,7 +794,7 @@ static int stm32_timer_trigger_probe(struct platform_device *pdev)
                return -EINVAL;
 
        /* Create an IIO device only if we have triggers to be validated */
-       if (*cfg->valids_table[index])
+       if (cfg->valids_table && *cfg->valids_table[index])
                priv = stm32_setup_counter_device(dev);
        else
                priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -804,7 +807,8 @@ static int stm32_timer_trigger_probe(struct platform_device *pdev)
        priv->clk = ddata->clk;
        priv->max_arr = ddata->max_arr;
        priv->triggers = triggers_table[index];
-       priv->valids = cfg->valids_table[index];
+       if (cfg->valids_table && *cfg->valids_table[index])
+               priv->valids = cfg->valids_table[index];
        stm32_timer_detect_trgo2(priv);
        mutex_init(&priv->lock);
 
@@ -896,6 +900,16 @@ static const struct stm32_timer_trigger_cfg stm32h7_timer_trg_cfg = {
        .num_valids_table = ARRAY_SIZE(stm32h7_valids_table),
 };
 
+static const struct stm32_timer_trigger_cfg stm32mp25_timer_trg_cfg = {
+       /*
+        * valids_table not used: counter framework is now superseding the deprecated IIO
+        * counter interface (IIO_COUNT), so don't support it. num_valids_table is only
+        * kept here to register the IIO HW triggers. valids_table should be moved at some
+        * point to the stm32-timer-cnt driver instead.
+        */
+       .num_valids_table = ARRAY_SIZE(triggers_table),
+};
+
 static const struct of_device_id stm32_trig_of_match[] = {
        {
                .compatible = "st,stm32-timer-trigger",
@@ -903,6 +917,9 @@ static const struct of_device_id stm32_trig_of_match[] = {
        }, {
                .compatible = "st,stm32h7-timer-trigger",
                .data = (void *)&stm32h7_timer_trg_cfg,
+       }, {
+               .compatible = "st,stm32mp25-timer-trigger",
+               .data = (void *)&stm32mp25_timer_trg_cfg,
        },
        { /* end node */ },
 };

diff --git a/include/linux/iio/timer/stm32-timer-trigger.h b/include/linux/iio/timer/stm32-timer-trigger.h
index 37572e4dc73aa2d9ea1402cb0f406228a5b11d71..1ee237b5618374ef522e0afd0f729ab312ebed23 100644 (file)
--- a/include/linux/iio/timer/stm32-timer-trigger.h
+++ b/include/linux/iio/timer/stm32-timer-trigger.h
@@ -72,6 +72,12 @@
 
 #define TIM17_OC1      "tim17_oc1"
 
+#define TIM20_OC1      "tim20_oc1"
+#define TIM20_OC2      "tim20_oc2"
+#define TIM20_OC3      "tim20_oc3"
+#define TIM20_TRGO     "tim20_trgo"
+#define TIM20_TRGO2    "tim20_trgo2"
+
 #if IS_REACHABLE(CONFIG_IIO_STM32_TIMER_TRIGGER)
 bool is_stm32_timer_trigger(struct iio_trigger *trig);
 #else