samples: subsys: display: lvgl: Use input-lvgl for touch input

faxe1008 · carlescufi · commit 116ec2c41cac · 2023-08-29T10:17:52.000+02:00
Changes all board specific configurations to use the new
zephyr,lvgl-pointer-input compatible. The kscan_input node in the boards
remains to have downstream backwards compatibility.

Signed-off-by: Fabian Blatz &lt;fabianblatz@gmail.com&gt;
diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco.dts b/boards/arm/stm32f746g_disco/stm32f746g_disco.dts
@@ -97,7 +97,7 @@
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
 
-	ft5336@38 {
+	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpioi 13 0>;
diff --git a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts
@@ -131,7 +131,7 @@
 	clock-frequency = <I2C_BITRATE_FAST>;
 	status = "okay";
 
-	ft5336@38 {
+	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpioh 2 0>;
diff --git a/samples/subsys/display/lvgl/boards/native_posix.conf b/samples/subsys/display/lvgl/boards/native_posix.conf
@@ -1,5 +1,3 @@
 CONFIG_LV_COLOR_DEPTH_32=y
 CONFIG_GPIO=y
-CONFIG_KSCAN=y
 CONFIG_INPUT=y
-CONFIG_LV_Z_POINTER_KSCAN=y
diff --git a/samples/subsys/display/lvgl/boards/native_posix.overlay b/samples/subsys/display/lvgl/boards/native_posix.overlay
@@ -19,6 +19,12 @@
 			zephyr,code = <INPUT_KEY_0>;
 		};
 	};
+
+	lvgl_pointer_input {
+		status = "okay";
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&input_sdl_touch>;
+	};
 };
 
 &gpio0 {
diff --git a/samples/subsys/display/lvgl/boards/native_posix_64.conf b/samples/subsys/display/lvgl/boards/native_posix_64.conf
@@ -1,5 +1,3 @@
 CONFIG_LV_COLOR_DEPTH_32=y
 CONFIG_GPIO=y
-CONFIG_KSCAN=y
 CONFIG_INPUT=y
-CONFIG_LV_Z_POINTER_KSCAN=y
diff --git a/samples/subsys/display/lvgl/boards/native_sim.conf b/samples/subsys/display/lvgl/boards/native_sim.conf
@@ -1,5 +1,3 @@
 CONFIG_LV_COLOR_DEPTH_32=y
 CONFIG_GPIO=y
-CONFIG_KSCAN=y
 CONFIG_INPUT=y
-CONFIG_LV_Z_POINTER_KSCAN=y
diff --git a/samples/subsys/display/lvgl/boards/native_sim_64.conf b/samples/subsys/display/lvgl/boards/native_sim_64.conf
@@ -1,5 +1,3 @@
 CONFIG_LV_COLOR_DEPTH_32=y
 CONFIG_GPIO=y
-CONFIG_KSCAN=y
 CONFIG_INPUT=y
-CONFIG_LV_Z_POINTER_KSCAN=y
diff --git a/samples/subsys/display/lvgl/boards/stm32f746g_disco.conf b/samples/subsys/display/lvgl/boards/stm32f746g_disco.conf
diff --git a/samples/subsys/display/lvgl/boards/stm32f746g_disco.overlay b/samples/subsys/display/lvgl/boards/stm32f746g_disco.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2023, Fabian Blatz <fabianblatz@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	lvgl_pointer_input {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+	};
+};
diff --git a/samples/subsys/display/lvgl/boards/stm32h7b3i_dk.conf b/samples/subsys/display/lvgl/boards/stm32h7b3i_dk.conf
diff --git a/samples/subsys/display/lvgl/boards/stm32h7b3i_dk.overlay b/samples/subsys/display/lvgl/boards/stm32h7b3i_dk.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2023, Fabian Blatz <fabianblatz@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	lvgl_pointer_input {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+	};
+};
diff --git a/samples/subsys/display/lvgl/src/main.c b/samples/subsys/display/lvgl/src/main.c
@@ -77,7 +77,7 @@ int main(void)
 	}
 #endif
 
-	if (IS_ENABLED(CONFIG_LV_Z_POINTER_KSCAN)) {
+	if (IS_ENABLED(CONFIG_LV_Z_POINTER_KSCAN) || IS_ENABLED(CONFIG_LV_Z_POINTER_INPUT)) {
 		lv_obj_t *hello_world_button;
 
 		hello_world_button = lv_btn_create(lv_scr_act());
