zephyrproject-rtos · carlescufi · Sep 5, 2023 · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023
diff --git a/boards/arm/bl5340_dvk/Kconfig.defconfig b/boards/arm/bl5340_dvk/Kconfig.defconfig
@@ -104,15 +104,9 @@ config BT_HCI_VS
 # https://www.buydisplay.com/2-8-inch-tft-touch-shield-for-arduino-w-capacitive-touch-screen-module
 if DISPLAY
 
-if KSCAN
-
-config INPUT_FT5336
-	default y
-
 config INPUT_FT5336_INTERRUPT
 	default y
 
-endif # KSCAN
 
 if LVGL
 
@@ -129,24 +123,9 @@ endchoice
 config LV_COLOR_16_SWAP
 	default y
 
-config KSCAN
-	default y
-
 config INPUT
 	default y
 
-config LV_Z_POINTER_KSCAN
-	default y
-
-config LV_Z_POINTER_KSCAN_SWAP_XY
-	default y
-
-config LV_Z_POINTER_KSCAN_INVERT_X
-	default y
-
-config LV_Z_POINTER_KSCAN_INVERT_Y
-	default y
-
 endif # LVGL
 
 endif # DISPLAY

diff --git a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi
@@ -16,7 +16,6 @@
 		zephyr,bt-c2h-uart = &uart0;
 		zephyr,display = &ili9340;
 		zephyr,bt-hci-rpmsg-ipc = &ipc0;
-		zephyr,keyboard-scan = &touch_controller;
 	};
 
 	/* Main LEDs and buttons are on an I2C TCA9538 GPIO port expander */
@@ -74,6 +73,14 @@
 		};
 	};
 
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+		swap-xy;
+		invert-x;
+		invert-y;
+	};
+
 	gpio_fwd: nrf-gpio-forwarder {
 		compatible = "nordic,nrf-gpio-forwarder";
 		status = "okay";
@@ -99,7 +106,6 @@
 		accel0 = &lis3dh;
 		bbram0 = &extrtc0;
 		spi-flash0 = &mx25r64;
-		kscan0 = &touch_controller;
 	};
 };
 
@@ -141,14 +147,10 @@
 		irq-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>, <&gpio0 24 GPIO_ACTIVE_HIGH>;
 	};
 
-	ft5336@38 {
+	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-
-		touch_controller: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 
 	bme680@76 {

diff --git a/boards/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/arm/mimxrt1050_evk/Kconfig.defconfig
@@ -31,11 +31,8 @@ config FLASH_MCUX_FLEXSPI_NOR
 
 endif #FLASH
 
-config KSCAN
-	default y if LVGL
-
 config INPUT
-	default y if KSCAN
+	default y if LVGL
 
 if INPUT
 
@@ -56,9 +53,6 @@ endif # NETWORKING
 
 if LVGL
 
-config LV_Z_POINTER_KSCAN
-	default y
-
 config LV_Z_VDB_SIZE
 	default 16
 

diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
@@ -18,7 +18,6 @@
 	aliases {
 		led0 = &green_led;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		watchdog0 = &wdog0;
 		magn0 = &fxos8700;
 		accel0 = &fxos8700;
@@ -35,7 +34,6 @@
 		zephyr,flash = &s26ks512s0;
 		zephyr,code-partition = &slot0_partition;
 		zephyr,display = &lcdif;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	sdram0: memory@80000000 {
@@ -61,6 +59,11 @@
 		};
 	};
 
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+	};
+
 	arduino_header: connector {
 		compatible = "arduino-header-r3";
 		#gpio-cells = <2>;
@@ -219,14 +222,10 @@ arduino_serial: &lpuart3 {
 		int2-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
 	};
 
-	ft5336@38 {
+	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 

diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml
@@ -26,6 +26,5 @@ supported:
   - sdhc
   - spi
   - usb_device
-  - kscan:touch
   - watchdog
   - adc
diff --git a/boards/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/arm/mimxrt1060_evk/Kconfig.defconfig
@@ -34,11 +34,8 @@ config FLASH_MCUX_FLEXSPI_HYPERFLASH
 
 endif #FLASH
 
-config KSCAN
-	default y if LVGL
-
 config INPUT
-	default y if KSCAN
+	default y if LVGL
 
 if INPUT
 
@@ -59,9 +56,6 @@ endif # NETWORKING
 
 if LVGL
 
-config LV_Z_POINTER_KSCAN
-	default y
-
 # LVGL should allocate buffers equal to size of display
 config LV_Z_VDB_SIZE
 	default 100

diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
@@ -19,7 +19,6 @@
 		led0 = &green_led;
 		pwm-led0 = &green_pwm_led;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		watchdog0 = &wdog0;
 		sdhc0 = &usdhc1;
 	};
@@ -35,7 +34,6 @@
 		zephyr,shell-uart = &lpuart1;
 		zephyr,canbus = &flexcan3;
 		zephyr,display = &lcdif;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	sdram0: memory@80000000 {
@@ -68,6 +66,11 @@
 		};
 	};
 
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+	};
+
 	arduino_header: connector {
 		compatible = "arduino-header-r3";
 		#gpio-cells = <2>;
@@ -195,14 +198,10 @@ arduino_i2c: &lpi2c1 {
 	pinctrl-0 = <&pinmux_lpi2c1>;
 	pinctrl-names = "default";
 
-	ft5336@38 {
+	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 

diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml
@@ -28,7 +28,6 @@ supported:
   - sdhc
   - spi
   - usb_device
-  - kscan:touch
   - dma
   - can
   - watchdog

diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evkb.yaml b/boards/arm/mimxrt1060_evk/mimxrt1060_evkb.yaml
@@ -27,7 +27,6 @@ supported:
   - sdhc
   - spi
   - usb_device
-  - kscan:touch
   - dma
   - can
   - watchdog

diff --git a/boards/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/arm/mimxrt1064_evk/Kconfig.defconfig
@@ -18,11 +18,8 @@ config DEVICE_CONFIGURATION_DATA
 config NXP_IMX_EXTERNAL_SDRAM
 	default y
 
-config KSCAN
-	default y if LVGL
-
 config INPUT
-	default y if KSCAN
+	default y if LVGL
 
 if INPUT
 
@@ -43,9 +40,6 @@ endif # NETWORKING
 
 if LVGL
 
-config LV_Z_POINTER_KSCAN
-	default y
-
 config LV_Z_VDB_SIZE
 	default 16
 

diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts
@@ -19,7 +19,6 @@
 		led0 = &green_led;
 		pwm-led0 = &green_pwm_led;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		watchdog0 = &wdog0;
 		sdhc0 = &usdhc1;
 	};
@@ -35,7 +34,6 @@
 		zephyr,shell-uart = &lpuart1;
 		zephyr,canbus = &flexcan2;
 		zephyr,display = &lcdif;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	sdram0: memory@80000000 {
@@ -69,6 +67,11 @@
 		};
 	};
 
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+	};
+
 	arduino_header: connector {
 		compatible = "arduino-header-r3";
 		#gpio-cells = <2>;
@@ -158,14 +161,10 @@ arduino_i2c: &lpi2c1 {};
 		};
 	};
 
-	ft5336@38 {
+	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 

diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml
@@ -29,7 +29,6 @@ supported:
   - spi
   - usb_device
   - video
-  - kscan:touch
   - can
   - watchdog
   - adc
diff --git a/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.yaml b/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.yaml
@@ -22,7 +22,6 @@ supported:
   - gpio
   - hwinfo
   - i2c
-  - kscan:touch
   - mipi_dsi
   - netif:eth
   - pwm

diff --git a/boards/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.yaml b/boards/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.yaml
@@ -22,7 +22,6 @@ supported:
   - gpio
   - hwinfo
   - i2c
-  - kscan:touch
   - mipi_dsi
   - spi
   - usb_device

diff --git a/boards/arm/pinetime_devkit0/Kconfig.defconfig b/boards/arm/pinetime_devkit0/Kconfig.defconfig
@@ -12,7 +12,7 @@ config BT_CTLR
 	default BT
 
 config INPUT
-	default y if KSCAN
+	default y if LVGL
 
 if FLASH
 

diff --git a/boards/arm/pinetime_devkit0/pinetime_devkit0.dts b/boards/arm/pinetime_devkit0/pinetime_devkit0.dts
@@ -26,7 +26,6 @@
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
 		zephyr,display = &st7789v;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
@@ -35,7 +34,6 @@
 		led2 = &blled2;	/* backlight high */
 		led3 = &statusled;	/* status led, may be not populated */
 		sw0 = &key_in;  /* key in */
-		kscan0 = &kscan_input;
 		watchdog0 = &wdt0;
 	};
 
@@ -68,6 +66,11 @@
 		};
 	};
 
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&cst816s>;
+	};
+
 	vbatt {
 		compatible = "voltage-divider";
 		io-channels = <&adc 7>;
@@ -130,10 +133,6 @@
 		reg = <0x15>;
 		irq-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
 		rst-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 

diff --git a/boards/arm/pinetime_devkit0/pinetime_devkit0.yaml b/boards/arm/pinetime_devkit0/pinetime_devkit0.yaml
@@ -8,5 +8,3 @@ toolchain:
   - xtools
 ram: 64
 flash: 512
-supported:
-  - kscan:touch
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ supported: @@
       - sdhc
       - spi
       - usb_device
-      - kscan:touch
       - dma
       - can
       - watchdog
@@ Expand Down @@