drivers: sensor: apds9960: Allow multiple sensor instances

Allow for multiple apds9960s to be present

Signed-off-by: Thomas Lang <[email protected]>

Author: batkay

drivers/sensor/apds9960/Kconfig

@@ -58,81 +58,4 @@ config APDS9960_ENABLE_ALS
 	help
 	  Enable Ambient Light Sense (ALS).
 
-choice
-	prompt "Proximity Gain"
-	default APDS9960_PGAIN_4X
-
-config APDS9960_PGAIN_1X
-	bool "1x"
-
-config APDS9960_PGAIN_2X
-	bool "2x"
-
-config APDS9960_PGAIN_4X
-	bool "4x"
-
-config APDS9960_PGAIN_8X
-	bool "8x"
-
-endchoice
-
-choice
-	prompt "ALS and Color Gain"
-	default APDS9960_AGAIN_4X
-
-config APDS9960_AGAIN_1X
-	bool "1x"
-
-config APDS9960_AGAIN_4X
-	bool "4x"
-
-config APDS9960_AGAIN_16X
-	bool "16x"
-
-config APDS9960_AGAIN_64X
-	bool "64x"
-
-endchoice
-
-choice
-	prompt "Proximity Pulse Length"
-	default APDS9960_PPULSE_LENGTH_8US
-
-config APDS9960_PPULSE_LENGTH_4US
-	bool "4us"
-
-config APDS9960_PPULSE_LENGTH_8US
-	bool "8us"
-
-config APDS9960_PPULSE_LENGTH_16US
-	bool "16us"
-
-config APDS9960_PPULSE_LENGTH_32US
-	bool "32us"
-
-endchoice
-
-choice
-	prompt "Proximity LED boost current"
-	default APDS9960_PLED_BOOST_100PCT
-
-config APDS9960_PLED_BOOST_300PCT
-	bool "300%"
-
-config APDS9960_PLED_BOOST_200PCT
-	bool "200%"
-
-config APDS9960_PLED_BOOST_150PCT
-	bool "150%"
-
-config APDS9960_PLED_BOOST_100PCT
-	bool "100%"
-
-endchoice
-
-config APDS9960_PPULSE_COUNT
-	int "Proximity Pulse Count"
-	range 1 64
-	default 8
-
 endif # APDS9960

drivers/sensor/apds9960/apds9960.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <zephyr/logging/log.h>
 
-#include "apds9960.h"
+#include <zephyr/drivers/sensor/apds9960.h>
 
 LOG_MODULE_REGISTER(APDS9960, CONFIG_SENSOR_LOG_LEVEL);
 
@@ -520,57 +520,28 @@ static DEVICE_API(sensor, apds9960_driver_api) = {
 #endif
 };
 
-static const struct apds9960_config apds9960_config = {
-	.i2c = I2C_DT_SPEC_INST_GET(0),
-#ifdef CONFIG_APDS9960_FETCH_MODE_INTERRUPT
-	.int_gpio = GPIO_DT_SPEC_INST_GET(0, int_gpios),
-#endif
-#if CONFIG_APDS9960_PGAIN_8X
-	.pgain = APDS9960_PGAIN_8X,
-#elif CONFIG_APDS9960_PGAIN_4X
-	.pgain = APDS9960_PGAIN_4X,
-#elif CONFIG_APDS9960_PGAIN_2X
-	.pgain = APDS9960_PGAIN_2X,
-#else
-	.pgain = APDS9960_PGAIN_1X,
-#endif
-#if CONFIG_APDS9960_AGAIN_64X
-	.again = APDS9960_AGAIN_64X,
-#elif CONFIG_APDS9960_AGAIN_16X
-	.again = APDS9960_AGAIN_16X,
-#elif CONFIG_APDS9960_AGAIN_4X
-	.again = APDS9960_AGAIN_4X,
-#else
-	.again = APDS9960_AGAIN_1X,
-#endif
-#if CONFIG_APDS9960_PPULSE_LENGTH_32US
-	.ppcount = APDS9960_PPULSE_LENGTH_32US |
-		   (CONFIG_APDS9960_PPULSE_COUNT - 1),
-#elif CONFIG_APDS9960_PPULSE_LENGTH_16US
-	.ppcount = APDS9960_PPULSE_LENGTH_16US |
-		   (CONFIG_APDS9960_PPULSE_COUNT - 1),
-#elif CONFIG_APDS9960_PPULSE_LENGTH_8US
-	.ppcount = APDS9960_PPULSE_LENGTH_8US |
-		   (CONFIG_APDS9960_PPULSE_COUNT - 1),
+#if CONFIG_APDS9960_FETCH_MODE_INTERRUPT
+#define APDS9960_CONFIG_INTERRUPT(inst) \
+		.int_gpio = GPIO_DT_SPEC_INST_GET(i, int_gpios),
 #else
-	.ppcount = APDS9960_PPULSE_LENGTH_4US |
-		   (CONFIG_APDS9960_PPULSE_COUNT - 1),
+#define APDS9960_CONFIG_INTERRUPT(inst)
 #endif
-#if CONFIG_APDS9960_PLED_BOOST_300PCT
-	.pled_boost = APDS9960_PLED_BOOST_300,
-#elif CONFIG_APDS9960_PLED_BOOST_200PCT
-	.pled_boost = APDS9960_PLED_BOOST_200,
-#elif CONFIG_APDS9960_PLED_BOOST_150PCT
-	.pled_boost = APDS9960_PLED_BOOST_150,
-#else
-	.pled_boost = APDS9960_PLED_BOOST_100,
-#endif
-};
-
-static struct apds9960_data apds9960_data;
-
-PM_DEVICE_DT_INST_DEFINE(0, apds9960_pm_action);
 
-SENSOR_DEVICE_DT_INST_DEFINE(0, apds9960_init,
-	      PM_DEVICE_DT_INST_GET(0), &apds9960_data, &apds9960_config,
-	      POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api);
+#define APDS9960_INIT(i)                                                                           \
+	static struct apds9960_config apds9960_data_##i;                                           \
+	static const struct apds9960_config apds9960_config_##i = {                                \
+		.i2c = I2C_DT_SPEC_INST_GET(i),                                                    \
+		APDS9960_CONFIG_INTERRUPT(i)                                                       \
+		.pgain = DT_INST_PROP(i, pgain) << 1,                                              \
+		.again = DT_INST_PROP(i, again),                                                   \
+		.ppcount = DT_INST_PROP(i, ppulse_length) | (DT_INST_PROP(i, ppulse_count) - 1),   \
+		.pled_boost = DT_INST_PROP(i, pled_boost) << 4,                                    \
+	};                                                                                         \
+                                                                                                   \
+	PM_DEVICE_DT_INST_DEFINE(i, apds9960_pm_action);                                           \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(i, apds9960_init,                                             \
+		PM_DEVICE_DT_INST_GET(i), &apds9960_data_##i, &apds9960_config_##i,                \
+		POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(APDS9960_INIT)

drivers/sensor/apds9960/apds9960_trigger.c

@@ -10,7 +10,7 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
-#include "apds9960.h"
+#include <zephyr/drivers/sensor/apds9960.h>
 
 extern struct apds9960_data apds9960_driver;
 

dts/bindings/sensor/avago,apds9960.yaml

@@ -15,3 +15,48 @@ properties:
       The interrupt pin of APDS9960 is open-drain, active low.
       If connected directly the MCU pin should be configured
       as pull-up, active low.
+
+  pled-boost:
+    type: int
+    default: 0x01
+    description: Proximity LED Boost Current
+    enum:
+      - 0x00 # 100
+      - 0x01 # 150
+      - 0x10 # 200
+      - 0x11 # 300
+
+  pgain:
+    type: int
+    default: 0x01
+    description: ALS and Color Gain
+    enum:
+      - 0x00 # 1x
+      - 0x01 # 4x
+      - 0x10 # 4x
+      - 0x11 # 8x
+
+  again:
+    type: int
+    default: 0x01
+    description: ALS and Color Gain
+    enum:
+      - 0x00 # 1x
+      - 0x01 # 4x
+      - 0x10 # 16x
+      - 0x11 # 64x
+
+  ppulse-length:
+    type: int
+    default: 0x01
+    description: Proximity Pulse Length
+    enum:
+      - 0x00 # 4us
+      - 0x01 # 8us
+      - 0x10 # 16us
+      - 0x11 # 32us
+
+  ppulse-count:
+    type: int
+    default: 0x8
+    description: Proximity Pulse Count