drivers: sensor: qdec_nrfx: use standard instantiation

drivers/sensor/nordic/qdec_nrfx/Kconfig

@@ -5,12 +5,7 @@ config QDEC_NRFX
 	bool "Nordic QDEC nrfx driver"
 	default y
 	depends on DT_HAS_NORDIC_NRF_QDEC_ENABLED
-	select NRFX_QDEC0 if HAS_HW_NRF_QDEC0
-	select NRFX_QDEC1 if HAS_HW_NRF_QDEC1
-	select NRFX_QDEC20 if HAS_HW_NRF_QDEC20
-	select NRFX_QDEC21 if HAS_HW_NRF_QDEC21
-	select NRFX_QDEC130 if HAS_HW_NRF_QDEC130
-	select NRFX_QDEC131 if HAS_HW_NRF_QDEC131
+	select NRFX_QDEC
 	select PINCTRL
 	help
 	  Enable support for nrfx QDEC driver for nRF MCU series.

drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c

@@ -43,6 +43,7 @@
 	     "Different SAMPLEPER register values in devicetree binding and nRF HAL");
 
 struct qdec_nrfx_data {
+	nrfx_qdec_t qdec;
 	int32_t fetched_acc;
 	int32_t acc;
 	bool overflow;
@@ -51,7 +52,6 @@
 };
 
 struct qdec_nrfx_config {
-	nrfx_qdec_t qdec;
 	nrfx_qdec_config_t config;
 	void (*irq_connect)(void);
 	const struct pinctrl_dev_config *pcfg;
@@ -78,7 +78,6 @@
 static int qdec_nrfx_sample_fetch(const struct device *dev,
 				  enum sensor_channel chan)
 {
-	const struct qdec_nrfx_config *config = dev->config;
 	struct qdec_nrfx_data *data = dev->data;
 	int32_t acc;
 	uint32_t accdbl;
@@ -87,7 +86,7 @@
 		return -ENOTSUP;
 	}
 
-	nrfx_qdec_accumulators_read(&config->qdec, &acc, &accdbl);
+	nrfx_qdec_accumulators_read(&data->qdec, &acc, &accdbl);
 
 	accumulate(data, acc);
 
@@ -212,8 +211,9 @@
 static void qdec_pm_suspend(const struct device *dev)
 {
 	const struct qdec_nrfx_config *config = dev->config;
+	struct qdec_nrfx_data *dev_data = dev->data;
 
-	nrfx_qdec_disable(&config->qdec);
+	nrfx_qdec_disable(&dev_data->qdec);
 	qdec_nrfx_gpio_ctrl(dev, false);
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
@@ -222,10 +222,11 @@
 static void qdec_pm_resume(const struct device *dev)
 {
 	const struct qdec_nrfx_config *config = dev->config;
+	struct qdec_nrfx_data *dev_data = dev->data;
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 	qdec_nrfx_gpio_ctrl(dev, true);
-	nrfx_qdec_enable(&config->qdec);
+	nrfx_qdec_enable(&dev_data->qdec);
 }
 
 static int qdec_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
@@ -251,13 +252,15 @@
 static int qdec_nrfx_init(const struct device *dev)
 {
 	const struct qdec_nrfx_config *config = dev->config;
-	nrfx_err_t nerr;
+	struct qdec_nrfx_data *dev_data = dev->data;
+	int nerr;
 
 	config->irq_connect();
 
-	nerr = nrfx_qdec_init(&config->qdec, &config->config, qdec_nrfx_event_handler, (void *)dev);
-	if (nerr != NRFX_SUCCESS) {
-		return (nerr == NRFX_ERROR_INVALID_STATE) ? -EBUSY : -EFAULT;
+	nerr = nrfx_qdec_init(&dev_data->qdec, &config->config, qdec_nrfx_event_handler,
+		(void *)dev);
+	if (nerr != 0) {
+		return -EALREADY;
 	}
 
 	/* End up in suspend state. */
@@ -269,88 +272,63 @@
 	return pm_device_driver_init(dev, qdec_nrfx_pm_action);
 }
 
-#define QDEC(idx)			DT_NODELABEL(qdec##idx)
-#define QDEC_PROP(idx, prop)		DT_PROP(QDEC(idx), prop)
-
 /* Macro determines PM actions interrupt safety level.
  *
  * Requesting/releasing QDEC device may be ISR safe, but it cannot be reliably known whether
  * managing its power domain is. It is then assumed that if power domains are used, device is
  * no longer ISR safe. This macro let's us check if we will be requesting/releasing
  * power domains and determines PM device ISR safety value.
  */
-#define QDEC_PM_ISR_SAFE(idx)									\
-	COND_CODE_1(										\
-		UTIL_AND(									\
-			IS_ENABLED(CONFIG_PM_DEVICE_POWER_DOMAIN),				\
-			UTIL_AND(								\
-				DT_NODE_HAS_PROP(QDEC(idx), power_domains),			\
-				DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE(QDEC(idx), power_domains))	\
-			)									\
-		),										\
-		(0),										\
-		(PM_DEVICE_ISR_SAFE)								\
+#define QDEC_PM_ISR_SAFE(inst)								        \
+	COND_CODE_1(									        \
+		UTIL_AND(								        \
+			IS_ENABLED(CONFIG_PM_DEVICE_POWER_DOMAIN),			        \
+			UTIL_AND(DT_INST_NODE_HAS_PROP(inst, power_domains),		        \
+				 DT_NODE_HAS_STATUS_OKAY(DT_INST_PHANDLE(inst, power_domains))) \
+		),									        \
+		(0),									        \
+		(PM_DEVICE_ISR_SAFE)							        \
 	)
 
-#define SENSOR_NRFX_QDEC_DEVICE(idx)							     \
-	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(QDEC(idx));					     \
-	BUILD_ASSERT(QDEC_PROP(idx, steps) > 0,						     \
-		     "Wrong QDEC"#idx" steps setting in dts. Only positive number valid");   \
-	BUILD_ASSERT(QDEC_PROP(idx, steps) <= 2048,					     \
-		     "Wrong QDEC"#idx" steps setting in dts. Overflow possible");	     \
-	static void irq_connect##idx(void)						     \
-	{										     \
-		IRQ_CONNECT(DT_IRQN(QDEC(idx)), DT_IRQ(QDEC(idx), priority),		     \
-			    nrfx_isr, nrfx_qdec_##idx##_irq_handler, 0);		     \
-	}										     \
-	static struct qdec_nrfx_data qdec_##idx##_data;					     \
-	PINCTRL_DT_DEFINE(QDEC(idx));							     \
-	static struct qdec_nrfx_config qdec_##idx##_config = {				     \
-		.qdec = NRFX_QDEC_INSTANCE(idx),					     \
-		.config = {								     \
-			.reportper = NRF_QDEC_REPORTPER_40,				     \
-			.sampleper = DT_STRING_TOKEN(QDEC(idx), nordic_period),              \
-			.skip_gpio_cfg = true,						     \
-			.skip_psel_cfg = true,						     \
-			.ledpre  = QDEC_PROP(idx, led_pre),				     \
-			.ledpol  = NRF_QDEC_LEPOL_ACTIVE_HIGH,				     \
-			.reportper_inten = true,					     \
-		},									     \
-		.irq_connect = irq_connect##idx,					     \
-		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(QDEC(idx)),				     \
-		.enable_pin = DT_PROP_OR(QDEC(idx), enable_pin, NRF_QDEC_PIN_NOT_CONNECTED), \
-		.steps = QDEC_PROP(idx, steps),						     \
-	};										     \
-	PM_DEVICE_DT_DEFINE(QDEC(idx), qdec_nrfx_pm_action, QDEC_PM_ISR_SAFE(idx));	     \
-	SENSOR_DEVICE_DT_DEFINE(QDEC(idx),						     \
-				qdec_nrfx_init,						     \
-				PM_DEVICE_DT_GET(QDEC(idx)),				     \
-				&qdec_##idx##_data,					     \
-				&qdec_##idx##_config,					     \
-				POST_KERNEL,						     \
-				CONFIG_SENSOR_INIT_PRIORITY,				     \
+#define SENSOR_NRFX_QDEC_DEVICE(inst)							    \
+	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(DT_DRV_INST(inst));			            \
+	BUILD_ASSERT(DT_INST_PROP(inst, steps) > 0,				            \
+		     "Wrong QDEC"#inst" steps setting in dts. Only positive number valid"); \
+	BUILD_ASSERT(DT_INST_PROP(inst, steps) <= 2048,					    \
+		     "Wrong QDEC"#inst" steps setting in dts. Overflow possible");	    \
+	static struct qdec_nrfx_data qdec_##inst##_data = {				    \
+		.qdec = NRFX_QDEC_INSTANCE(DT_INST_REG_ADDR(inst)),			    \
+	};										    \
+	static void irq_connect##inst(void)						    \
+	{										    \
+		IRQ_CONNECT(DT_INST_IRQN(inst), DT_INST_IRQ(inst, priority),		    \
+			nrfx_qdec_irq_handler, &qdec_##inst##_data.qdec, 0);		    \
+	}										    \
+	PINCTRL_DT_DEFINE(DT_DRV_INST(inst));						    \
+	static struct qdec_nrfx_config qdec_##inst##_config = {				    \
+		.config = {								    \
+			.reportper = NRF_QDEC_REPORTPER_40,				    \
+			.sampleper = DT_STRING_TOKEN(DT_DRV_INST(inst), nordic_period),	    \
+			.skip_gpio_cfg = true,						    \
+			.skip_psel_cfg = true,						    \
+			.ledpre  = DT_INST_PROP(inst, led_pre),				    \
+			.ledpol  = NRF_QDEC_LEPOL_ACTIVE_HIGH,				    \
+			.reportper_inten = true,					    \
+		},									    \
+		.irq_connect = irq_connect##inst,					    \
+		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_DRV_INST(inst)),			    \
+		.enable_pin = DT_PROP_OR(						    \
+			DT_DRV_INST(inst), enable_pin, NRF_QDEC_PIN_NOT_CONNECTED),	    \
+		.steps = DT_INST_PROP(inst, steps),					    \
+	};										    \
+	PM_DEVICE_DT_INST_DEFINE(inst, qdec_nrfx_pm_action, QDEC_PM_ISR_SAFE(inst));	    \
+	SENSOR_DEVICE_DT_DEFINE(DT_DRV_INST(inst),					    \
+				qdec_nrfx_init,						    \
+				PM_DEVICE_DT_INST_GET(inst),				    \
+				&qdec_##inst##_data,					    \
+				&qdec_##inst##_config,					    \
+				POST_KERNEL,						    \
+				CONFIG_SENSOR_INIT_PRIORITY,				    \
 				&qdec_nrfx_driver_api)
 
-#ifdef CONFIG_HAS_HW_NRF_QDEC0
-SENSOR_NRFX_QDEC_DEVICE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_QDEC1
-SENSOR_NRFX_QDEC_DEVICE(1);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_QDEC20
-SENSOR_NRFX_QDEC_DEVICE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_QDEC21
-SENSOR_NRFX_QDEC_DEVICE(21);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_QDEC130
-SENSOR_NRFX_QDEC_DEVICE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_QDEC131
-SENSOR_NRFX_QDEC_DEVICE(131);
-#endif
+DT_INST_FOREACH_STATUS_OKAY(SENSOR_NRFX_QDEC_DEVICE)

modules/hal_nordic/nrfx/Kconfig

@@ -433,36 +433,6 @@ config NRFX_PWM133
 config NRFX_QDEC
 	bool
 
-config NRFX_QDEC0
-	bool "QDEC0 driver instance"
-	depends on $(dt_nodelabel_exists,qdec0)
-	select NRFX_QDEC
-
-config NRFX_QDEC1
-	bool "QDEC1 driver instance"
-	depends on $(dt_nodelabel_exists,qdec1)
-	select NRFX_QDEC
-
-config NRFX_QDEC20
-	bool "QDEC20 driver instance"
-	depends on $(dt_nodelabel_exists,qdec20)
-	select NRFX_QDEC
-
-config NRFX_QDEC21
-	bool "QDEC21 driver instance"
-	depends on $(dt_nodelabel_exists,qdec21)
-	select NRFX_QDEC
-
-config NRFX_QDEC130
-	bool "QDEC130 driver instance"
-	depends on $(dt_nodelabel_exists,qdec130)
-	select NRFX_QDEC
-
-config NRFX_QDEC131
-	bool "QDEC131 driver instance"
-	depends on $(dt_nodelabel_exists,qdec131)
-	select NRFX_QDEC
-
 config NRFX_QSPI
 	bool "QSPI driver"
 	depends on $(dt_nodelabel_exists,qspi)

modules/hal_nordic/nrfx/nrfx_kconfig.h

@@ -398,24 +398,6 @@
 #ifdef CONFIG_NRFX_QDEC_LOG
 #define NRFX_QDEC_CONFIG_LOG_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_QDEC0
-#define NRFX_QDEC0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC1
-#define NRFX_QDEC1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC20
-#define NRFX_QDEC20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC21
-#define NRFX_QDEC21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC130
-#define NRFX_QDEC130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC131
-#define NRFX_QDEC131_ENABLED 1
-#endif
 
 #ifdef CONFIG_NRFX_QSPI
 #define NRFX_QSPI_ENABLED 1

soc/nordic/common/Kconfig.peripherals

@@ -180,24 +180,6 @@ config HAS_HW_NRF_PWM132
 config HAS_HW_NRF_PWM133
 	def_bool $(dt_nodelabel_enabled_with_compat,pwm133,$(DT_COMPAT_NORDIC_NRF_PWM))
 
-config HAS_HW_NRF_QDEC0
-	def_bool $(dt_nodelabel_enabled_with_compat,qdec0,$(DT_COMPAT_NORDIC_NRF_QDEC))
-
-config HAS_HW_NRF_QDEC1
-	def_bool $(dt_nodelabel_enabled_with_compat,qdec1,$(DT_COMPAT_NORDIC_NRF_QDEC))
-
-config HAS_HW_NRF_QDEC20
-	def_bool $(dt_nodelabel_enabled_with_compat,qdec20,$(DT_COMPAT_NORDIC_NRF_QDEC))
-
-config HAS_HW_NRF_QDEC21
-	def_bool $(dt_nodelabel_enabled_with_compat,qdec21,$(DT_COMPAT_NORDIC_NRF_QDEC))
-
-config HAS_HW_NRF_QDEC130
-	def_bool $(dt_nodelabel_enabled_with_compat,qdec130,$(DT_COMPAT_NORDIC_NRF_QDEC))
-
-config HAS_HW_NRF_QDEC131
-	def_bool $(dt_nodelabel_enabled_with_compat,qdec131,$(DT_COMPAT_NORDIC_NRF_QDEC))
-
 config HAS_HW_NRF_QSPI
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_QSPI))