Merge pull request #708 from FrameworkComputer/fwk.als_sensor

kiram9 · web-flow · commit 20ab3660fae7 · 2023-07-10T07:14:52.000-07:00
Read the ALS sensor (CM32183) vai ALS task
diff --git a/common/als.c b/common/als.c
@@ -18,6 +18,10 @@
 #include "timer.h"
 #include "util.h"
 
+#ifdef CONFIG_ZEPHYR
+#include "cros_als.h"
+#endif
+
 #define CPUTS(outstr) cputs(CC_ALS, outstr)
 #define CPRINTS(format, args...) cprints(CC_ALS, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_ALS, format, ##args)
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -201,6 +201,8 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BODY_DETECTION
                                                 "${PLATFORM_EC}/common/body_detection.c")
 zephyr_library_sources_ifdef(CONFIG_NAMED_ADC_CHANNELS
                                                 "${PLATFORM_EC}/common/adc.c")
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_DEDICATED_ALS
+                                                "${PLATFORM_EC}/common/als.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ALS_TCS3400
                                                 "${PLATFORM_EC}/driver/als_tcs3400.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ALS_CM32183
diff --git a/zephyr/Kconfig.motionsense b/zephyr/Kconfig.motionsense
@@ -193,3 +193,17 @@ rsource "Kconfig.sensor_devices"
 rsource "Kconfig.body_detection"
 
 endif # PLATFORM_EC_MOTIONSENSE
+
+config PLATFORM_EC_DEDICATED_ALS
+  bool "Enable als task without motionsense config"
+  default n
+  select HAS_TASK_ALS
+  help
+    Enable ALS task without motionsense.
+    This config must defines the als_t als[] in project layer.
+
+if PLATFORM_EC_DEDICATED_ALS
+
+rsource "Kconfig.sensor_devices"
+
+endif #PLATFORM_EC_DEDICATED_ALS
diff --git a/zephyr/Kconfig.stacks b/zephyr/Kconfig.stacks
@@ -86,6 +86,11 @@ config TASK_CYPD_STACK_SIZE
 	default 1024 if SOC_SERIES_NPCX7
 	default 1024 if SOC_SERIES_NPCX9
 
+config TASK_ALS_STACK_SIZE
+	default 1280 if SOC_SERIES_RISCV32_IT8XXX2
+	default 1024 if SOC_SERIES_NPCX7
+	default 1024 if SOC_SERIES_NPCX9
+
 config TASK_USB_CHG_STACK_SIZE
 	default 1152 if SOC_SERIES_RISCV32_IT8XXX2
 	default 800 if SOC_SERIES_NPCX7
diff --git a/zephyr/Kconfig.tasks b/zephyr/Kconfig.tasks
@@ -270,6 +270,23 @@ config TASK_CYPD_STACK_SIZE
 
 endif # HASK_TASK_CYPD
 
+config HAS_TASK_ALS
+	bool
+	depends on PLATFORM_EC_DEDICATED_ALS
+	help
+	  This turns on the ALS task which store the ASL sensor value into
+	  EC memmap.
+
+if HAS_TASK_ALS
+
+config TASK_ALS_STACK_SIZE
+	int "ALS task stack size"
+	default 768
+	help
+	  The stack size of the ALS task.
+
+endif # HAS_TASK_ALS
+
 config HAS_TASK_TOUCHPAD
 	bool
 	help
diff --git a/zephyr/dts/bindings/motionsense/driver/cm32183.yaml b/zephyr/dts/bindings/motionsense/driver/cm32183.yaml
@@ -0,0 +1,10 @@
+# Copyright 2021 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+description: >
+  Properties for a CM32183 I2C ambient light sensor
+
+compatible: "nxp,cm32183"
+
+include: i2c-device.yaml
diff --git a/zephyr/program/lotus/CMakeLists.txt b/zephyr/program/lotus/CMakeLists.txt
@@ -14,6 +14,7 @@ zephyr_library_sources("src/cpu_power.c")
 zephyr_library_sources("src/factory.c")
 zephyr_library_sources("src/diagnostics.c")
 zephyr_library_sources("src/ucsi.c")
+zephyr_library_sources("src/als.c")
 
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
 	"src/led_pwm.c")
diff --git a/zephyr/program/lotus/azalea/i2c.dtsi b/zephyr/program/lotus/azalea/i2c.dtsi
@@ -43,7 +43,8 @@
 		i2c_sensor: sensor {
 			i2c-port = <&i2c7_0>;
 			enum-names =  "I2C_PORT_SENSOR",
-				"I2C_PORT_THERMAL_AP";
+				"I2C_PORT_THERMAL_AP",
+				"I2C_PORT_ALS";
 		};
 	};
 };
@@ -156,6 +157,11 @@
 		compatible = "amd,sb-tsi";
 		reg = <0x4c>;
 	};
+
+	als_cm32183: als-cm32183@29 {
+		compatible = "nxp,cm32183";
+		reg = <0x29>;
+	};
 };
 
 &i2c_ctrl7 {
diff --git a/zephyr/program/lotus/lotus/i2c.dtsi b/zephyr/program/lotus/lotus/i2c.dtsi
@@ -54,7 +54,8 @@
 		i2c_sensor: sensor {
 			i2c-port = <&i2c7_0>;
 			enum-names =  "I2C_PORT_SENSOR",
-				"I2C_PORT_THERMAL_AP";
+				"I2C_PORT_THERMAL_AP",
+				"I2C_PORT_ALS";
 		};
 	};
 };
@@ -214,6 +215,11 @@
 		compatible = "amd,sb-tsi";
 		reg = <0x4c>;
 	};
+
+	als_cm32183: als-cm32183@29 {
+		compatible = "nxp,cm32183";
+		reg = <0x29>;
+	};
 };
 
 &i2c_ctrl7 {
diff --git a/zephyr/program/lotus/program.conf b/zephyr/program/lotus/program.conf
@@ -74,6 +74,10 @@ CONFIG_SENSOR=y
 CONFIG_PLATFORM_EC_FAN=y
 CONFIG_LTO=n
 
+# ALS
+CONFIG_PLATFORM_EC_MOTIONSENSE=n
+CONFIG_PLATFORM_EC_DEDICATED_ALS=y
+
 # LED
 CONFIG_PLATFORM_EC_LED_COMMON=y
 CONFIG_PLATFORM_EC_LED_DT=n
diff --git a/zephyr/program/lotus/src/als.c b/zephyr/program/lotus/src/als.c
@@ -0,0 +1,66 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "als.h"
+#include "cros_als.h"
+#include "common.h"
+#include "driver/als_cm32183.h"
+#include "ec_commands.h"
+#include "i2c.h"
+#include "timer.h"
+
+/*
+ * Read CM32183 light sensor data.
+ */
+int cm32183_read_lux(int *lux, int af)
+{
+	int ret;
+	int data;
+
+	ret = i2c_read16(I2C_PORT_ALS, CM32183_I2C_ADDR,
+		CM32183_REG_ALS_RESULT, &data);
+
+	if (ret)
+		return ret;
+
+	/*
+	 * lux = data * 0.016
+	 * lux = (data * 16 / 1000) * af / 10;
+	 */
+	*lux = data * af * 16 / 10000;
+
+	return EC_SUCCESS;
+}
+
+/**
+ * Initialise CM32183 light sensor.
+ */
+int cm32183_init(void)
+{
+	int retry_count;
+
+	for (retry_count = 0; retry_count < 3; retry_count++) {
+
+		/**
+		 * The resume hook does not match the sensor power on sequence,
+		 * it will cause the sensor initial fail and disable the als task.
+		 * Add the delay time 10ms to retry again if sensor enable fail,
+		 * make sure the sensor and als task are enable.
+		 */
+		if (i2c_write16(I2C_PORT_ALS, CM32183_I2C_ADDR,
+			CM32183_REG_CONFIGURE, CM32183_REG_CONFIGURE_CH_EN))
+			k_msleep(10);
+		else
+			return EC_SUCCESS;
+	}
+
+	return EC_ERROR_OVERFLOW;
+
+}
+
+struct als_t als[] = {
+	{"CAPELLA", cm32183_init, cm32183_read_lux, 32},
+};
+BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT);
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
@@ -2326,6 +2326,8 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE];
 #if DT_NODE_HAS_PROP(SENSOR_INFO_NODE, als_sensors)
 #define CONFIG_ALS
 #define ALS_COUNT DT_PROP_LEN(SENSOR_INFO_NODE, als_sensors)
+#elif CONFIG_PLATFORM_EC_DEDICATED_ALS
+#define CONFIG_ALS
 #else
 #define ALS_COUNT 0
 #endif
diff --git a/zephyr/shim/include/cros_als.h b/zephyr/shim/include/cros_als.h
@@ -0,0 +1,19 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef __ZEPHYR_CROS_EC_ALS_H
+#define __ZEPHYR_CROS_EC_ALS_H
+
+#define CM32183_COMPAT nxp_cm32183
+
+#define CM32183_SENSOR_ID(node_id) DT_CAT(CM32183_, node_id)
+#define CM32183_SENSOR_ID_WITH_COMMA(node_id) CM32183_SENSOR_ID(node_id),
+
+enum als_id {
+	DT_FOREACH_STATUS_OKAY(CM32183_COMPAT, CM32183_SENSOR_ID_WITH_COMMA)
+	ALS_COUNT,
+};
+
+#endif /* __ZEPHYR_CROS_EC_ALS_H */
diff --git a/zephyr/shim/include/shimmed_task_id.h b/zephyr/shim/include/shimmed_task_id.h
@@ -50,6 +50,7 @@ enum {
 	EC_TASK_PD_INT_C2_PRIO,
 	EC_TASK_PD_INT_C3_PRIO,
 	EC_TASK_CYPD_PRIO,
+	EC_TASK_ALS_PRIO,
 	EC_TASK_PRIO_COUNT,
 };
 
@@ -166,7 +167,12 @@ enum {
 		    (CROS_EC_TASK(CYPD, cypd_interrupt_handler_task, 0,    \
 				  CONFIG_TASK_CYPD_STACK_SIZE,             \
 				  EC_TASK_CYPD_PRIO)),                     \
-                    ())                                                    \
+		())                                                    \
+	COND_CODE_1(HAS_TASK_ALS,                                         \
+		    (CROS_EC_TASK(ALS, als_task, 0,    \
+				  CONFIG_TASK_ALS_STACK_SIZE,             \
+				  EC_TASK_ALS_PRIO)),                     \
+		())                                                    \
 	COND_CODE_1(HAS_TASK_TOUCHPAD,                                     \
 		    (CROS_EC_TASK(TOUCHPAD, touchpad_task, 0,              \
 				  CONFIG_TASK_TOUCHPAD_STACK_SIZE,         \
@@ -217,7 +223,9 @@ enum {
 	CROS_EC_TASK(PD_INT_C2, NULL, 2, 0, EC_TASK_PD_INT_C2_PRIO)         \
 	CROS_EC_TASK(PD_INT_C3, NULL, 3, 0, EC_TASK_PD_INT_C3_PRIO)         \
 	CROS_EC_TASK(CYPD, NULL, 0, 0, EC_TASK_CYPD_PRIO)                   \
-	CROS_EC_TASK(TOUCHPAD, NULL, 0, 0, EC_TASK_TOUCHPAD_PRIO)
+	CROS_EC_TASK(ALS, NULL, 0, 0, EC_TASK_ALS_PRIO)                   \
+	CROS_EC_TASK(TOUCHPAD, NULL, 0, 0, EC_TASK_TOUCHPAD_PRIO)           \
+
 
 #endif /* CONFIG_SHIMMED_TASKS */
 
diff --git a/zephyr/shim/include/shimmed_tasks.h b/zephyr/shim/include/shimmed_tasks.h
@@ -55,6 +55,10 @@
 #define HAS_TASK_CYPD 1
 #endif /* CONFIG_HAS_TASK_CYPD */
 
+#ifdef CONFIG_HAS_TASK_ALS
+#define HAS_TASK_ALS 1
+#endif /* CONFIG_HAS_TASK_ALS */
+
 #ifndef CONFIG_TASK_HOSTCMD_THREAD_MAIN
 #define HAS_TASK_MAIN 1
 #endif /* CONFIG_TASK_HOSTCMD_THREAD_DEDICATED */
