boards: Remove touch input kscan nodes

faxe1008 · carlescufi · commit ccdb6670689a · 2023-09-05T10:05:50.000+02:00
Change boards and shields and remove kscan nodes in favor of the
"zephyr,lvgl-pointer-input" compatible.

Signed-off-by: Fabian Blatz &lt;fabianblatz@gmail.com&gt;
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 */
@@ -107,7 +106,6 @@
 		accel0 = &lis3dh;
 		bbram0 = &extrtc0;
 		spi-flash0 = &mx25r64;
-		kscan0 = &touch_controller;
 	};
 };
 
@@ -153,10 +151,6 @@
 		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/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 {
@@ -228,10 +226,6 @@ arduino_serial: &lpuart3 {
 		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/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 {
@@ -204,10 +202,6 @@ arduino_i2c: &lpi2c1 {
 		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/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 {
@@ -167,10 +165,6 @@ arduino_i2c: &lpi2c1 {};
 		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/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;
 	};
 
@@ -135,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
diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco.dts b/boards/arm/stm32f746g_disco/stm32f746g_disco.dts
@@ -22,7 +22,6 @@
 		zephyr,dtcm = &dtcm;
 		zephyr,flash-controller = &n25q128a1;
 		zephyr,display = &ltdc;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	leds {
@@ -58,7 +57,6 @@
 	aliases {
 		led0 = &green_led_1;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		spi-flash0 = &n25q128a1;
 	};
 };
@@ -106,10 +104,6 @@
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpioi 13 0>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 
diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco.yaml b/boards/arm/stm32f746g_disco/stm32f746g_disco.yaml
@@ -18,6 +18,5 @@ supported:
   - counter
   - sdhc
   - usb_device
-  - kscan:touch
   - display
   - memc
diff --git a/boards/arm/stm32f7508_dk/stm32f7508_dk.dts b/boards/arm/stm32f7508_dk/stm32f7508_dk.dts
@@ -23,7 +23,6 @@
 		zephyr,dtcm = &dtcm;
 		zephyr,flash-controller = &n25q128a1;
 		zephyr,display = &ltdc;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	leds {
@@ -59,7 +58,6 @@
 	aliases {
 		led0 = &green_led_1;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		spi-flash0 = &n25q128a1;
 	};
 };
@@ -107,10 +105,6 @@
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpioi 13 0>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 
diff --git a/boards/arm/stm32f7508_dk/stm32f7508_dk.yaml b/boards/arm/stm32f7508_dk/stm32f7508_dk.yaml
@@ -21,6 +21,5 @@ supported:
   - counter
   - sdhc
   - usb_device
-  - kscan:touch
   - display
   - memc
diff --git a/boards/arm/stm32f769i_disco/stm32f769i_disco.dts b/boards/arm/stm32f769i_disco/stm32f769i_disco.dts
@@ -21,7 +21,6 @@
 		zephyr,flash = &flash0;
 		zephyr,dtcm = &dtcm;
 		zephyr,flash-controller = &mx25l51245g;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	sdram1: sdram@c0000000 {
@@ -72,7 +71,6 @@
 		led2 = &green_led_3;
 		led3 = &red_led_4;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		spi-flash0 = &mx25l51245g;
 	};
 };
@@ -134,10 +132,6 @@ arduino_serial: &usart6 {};
 		compatible = "focaltech,ft5336";
 		reg = <0x2a>;
 		int-gpios = <&gpioi 13 0>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 
diff --git a/boards/arm/stm32f769i_disco/stm32f769i_disco.yaml b/boards/arm/stm32f769i_disco/stm32f769i_disco.yaml
@@ -17,4 +17,3 @@ supported:
   - arduino_gpio
   - netif:eth
   - memc
-  - kscan:touch
diff --git a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts
@@ -21,7 +21,6 @@
 		zephyr,flash = &flash0;
 		zephyr,display = &ltdc;
 		zephyr,canbus = &fdcan1;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	leds {
@@ -69,7 +68,6 @@
 		led0 = &blue_led;
 		led1 = &red_led;
 		sw0 = &user_button;
-		kscan0 = &kscan_input;
 		spi-flash0 = &mx25lm51245;
 	};
 };
@@ -140,10 +138,6 @@
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		int-gpios = <&gpioh 2 0>;
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
 
diff --git a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.yaml b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.yaml
@@ -13,7 +13,6 @@ supported:
   - uart
   - gpio
   - i2c
-  - kscan:touch
   - memc
   - backup_sram
   - display
diff --git a/boards/posix/native_posix/native_posix.dts b/boards/posix/native_posix/native_posix.dts
@@ -23,15 +23,13 @@
 		zephyr,flash-controller = &flashcontroller0;
 		zephyr,display = &sdl_dc;
 		zephyr,canbus = &can_loopback0;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
 		eeprom-0 = &eeprom0;
 		i2c-0 = &i2c0;
 		spi-0 = &spi0;
 		led0 = &led0;
-		kscan0 = &kscan_input;
 		rtc = &rtc;
 	};
 
@@ -186,9 +184,6 @@
 
 	input_sdl_touch: input-sdl-touch {
 		compatible = "zephyr,input-sdl-touch";
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 
 	can_loopback0: can_loopback0 {
diff --git a/boards/shields/adafruit_2_8_tft_touch_v2/dts/adafruit_2_8_tft_touch_v2.dtsi b/boards/shields/adafruit_2_8_tft_touch_v2/dts/adafruit_2_8_tft_touch_v2.dtsi
@@ -9,7 +9,6 @@
 / {
 	chosen {
 		zephyr,display = &ili9340;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	lvgl_pointer {
@@ -62,9 +61,5 @@
 		reg = <0x38>;
 		/* Uncomment if IRQ line is available (requires to solder jumper) */
 		/* int-gpios = <&arduino_header 13 GPIO_ACTIVE_LOW>; */ /* D7 */
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
diff --git a/boards/shields/buydisplay_2_8_tft_touch_arduino/buydisplay_2_8_tft_touch_arduino.overlay b/boards/shields/buydisplay_2_8_tft_touch_arduino/buydisplay_2_8_tft_touch_arduino.overlay
@@ -9,7 +9,6 @@
 / {
 	chosen {
 		zephyr,display = &ili9340_buydisplay_2_8_tft_touch_arduino;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	lvgl_pointer {
@@ -50,9 +49,5 @@
 		reg = <0x38>;
 		/* Uncomment if IRQ line is available (requires to solder jumper) */
 		/* int-gpios = <&arduino_header 11 GPIO_ACTIVE_LOW>; */ /* D5 */
-
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
diff --git a/boards/shields/buydisplay_3_5_tft_touch_arduino/buydisplay_3_5_tft_touch_arduino.overlay b/boards/shields/buydisplay_3_5_tft_touch_arduino/buydisplay_3_5_tft_touch_arduino.overlay
diff --git a/boards/shields/g1120b0mipi/g1120b0mipi.overlay b/boards/shields/g1120b0mipi/g1120b0mipi.overlay
diff --git a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay
diff --git a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay
