From aec090e3e3369fabefb5879ffb0829b392e76fcb Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Wed, 30 Aug 2023 10:01:39 +0200 Subject: [PATCH 1/4] boards: stop using kscan for LVGL touch input Change boards and shields which enable the LV_Z_POINTER_KSCAN symbol to use the new "zephyr,lvgl-pointer-input" compatible instead. Signed-off-by: Fabian Blatz --- boards/arm/bl5340_dvk/Kconfig.defconfig | 21 ------------------- .../bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi | 10 ++++++++- boards/arm/mimxrt1050_evk/Kconfig.defconfig | 8 +------ boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts | 7 ++++++- boards/arm/mimxrt1060_evk/Kconfig.defconfig | 8 +------ boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts | 7 ++++++- boards/arm/mimxrt1064_evk/Kconfig.defconfig | 8 +------ boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts | 7 ++++++- boards/arm/pinetime_devkit0/Kconfig.defconfig | 2 +- .../arm/pinetime_devkit0/pinetime_devkit0.dts | 5 +++++ boards/arm/stm32f746g_disco/Kconfig.defconfig | 5 +---- .../arm/stm32f746g_disco/stm32f746g_disco.dts | 5 +++++ boards/arm/stm32f7508_dk/Kconfig.defconfig | 5 +---- boards/arm/stm32f7508_dk/stm32f7508_dk.dts | 7 ++++++- boards/arm/stm32f769i_disco/Kconfig.defconfig | 2 +- .../arm/stm32f769i_disco/stm32f769i_disco.dts | 7 ++++++- boards/arm/stm32h7b3i_dk/Kconfig.defconfig | 5 +---- boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts | 5 +++++ boards/posix/native_posix/native_posix.dts | 5 +++++ .../Kconfig.defconfig | 15 ------------- .../dts/adafruit_2_8_tft_touch_v2.dtsi | 10 ++++++++- .../Kconfig.defconfig | 15 ------------- .../buydisplay_2_8_tft_touch_arduino.overlay | 10 ++++++++- .../Kconfig.defconfig | 15 ------------- .../buydisplay_3_5_tft_touch_arduino.overlay | 10 ++++++++- boards/shields/g1120b0mipi/Kconfig.defconfig | 14 ------------- .../shields/g1120b0mipi/g1120b0mipi.overlay | 8 ++++++- .../shields/rk055hdmipi4m/Kconfig.defconfig | 10 +-------- .../rk055hdmipi4m/rk055hdmipi4m.overlay | 7 ++++++- .../shields/rk055hdmipi4ma0/Kconfig.defconfig | 8 +------ .../rk055hdmipi4ma0/rk055hdmipi4ma0.overlay | 7 ++++++- 31 files changed, 115 insertions(+), 143 deletions(-) diff --git a/boards/arm/bl5340_dvk/Kconfig.defconfig b/boards/arm/bl5340_dvk/Kconfig.defconfig index 04e0b1db078bd..38a06c8b91dce 100644 --- 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 index 5e339e6d1ca59..0aa18ed0189c3 100644 --- a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi +++ b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi @@ -74,6 +74,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"; @@ -141,7 +149,7 @@ 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>; diff --git a/boards/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/arm/mimxrt1050_evk/Kconfig.defconfig index f59f3de75c391..104c6d7710012 100644 --- 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 index 666a6c351ecf4..04b8d3d416d19 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts @@ -61,6 +61,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336>; + }; + arduino_header: connector { compatible = "arduino-header-r3"; #gpio-cells = <2>; @@ -219,7 +224,7 @@ 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>; diff --git a/boards/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/arm/mimxrt1060_evk/Kconfig.defconfig index ac7e1e293862a..aef6f37c03b01 100644 --- 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 index 7be0f49b2cd52..b2deed9459006 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts @@ -68,6 +68,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336>; + }; + arduino_header: connector { compatible = "arduino-header-r3"; #gpio-cells = <2>; @@ -195,7 +200,7 @@ 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>; diff --git a/boards/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/arm/mimxrt1064_evk/Kconfig.defconfig index 8a574dc2f0ede..9ebf3eaa71b89 100644 --- 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 index 42c036a959e27..6923d0a478555 100644 --- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts +++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts @@ -69,6 +69,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336>; + }; + arduino_header: connector { compatible = "arduino-header-r3"; #gpio-cells = <2>; @@ -158,7 +163,7 @@ arduino_i2c: &lpi2c1 {}; }; }; - ft5336@38 { + ft5336: ft5336@38 { compatible = "focaltech,ft5336"; reg = <0x38>; int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; diff --git a/boards/arm/pinetime_devkit0/Kconfig.defconfig b/boards/arm/pinetime_devkit0/Kconfig.defconfig index 0edb704b90c44..a90333d54a79f 100644 --- 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 index 009c0fbaaf59a..a5d7eef0e696e 100644 --- a/boards/arm/pinetime_devkit0/pinetime_devkit0.dts +++ b/boards/arm/pinetime_devkit0/pinetime_devkit0.dts @@ -68,6 +68,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&cst816s>; + }; + vbatt { compatible = "voltage-divider"; io-channels = <&adc 7>; diff --git a/boards/arm/stm32f746g_disco/Kconfig.defconfig b/boards/arm/stm32f746g_disco/Kconfig.defconfig index 69ad80e9b6767..cd653cd18c99a 100644 --- a/boards/arm/stm32f746g_disco/Kconfig.defconfig +++ b/boards/arm/stm32f746g_disco/Kconfig.defconfig @@ -16,13 +16,10 @@ config NET_L2_ETHERNET endif # NETWORKING config INPUT - default y if KSCAN + default y if LVGL if DISPLAY -config KSCAN - default y - # MEMC needs to be enabled in order to store # display buffer to external SDRAM connected to FMC config MEMC diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco.dts b/boards/arm/stm32f746g_disco/stm32f746g_disco.dts index eddb70be0ea41..6de9c8eb9bbf2 100644 --- a/boards/arm/stm32f746g_disco/stm32f746g_disco.dts +++ b/boards/arm/stm32f746g_disco/stm32f746g_disco.dts @@ -42,6 +42,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336>; + }; + sdram1: sdram@c0000000 { compatible = "zephyr,memory-region", "mmio-sram"; device_type = "memory"; diff --git a/boards/arm/stm32f7508_dk/Kconfig.defconfig b/boards/arm/stm32f7508_dk/Kconfig.defconfig index a9c02111ffe25..7995c1fbae7d5 100644 --- a/boards/arm/stm32f7508_dk/Kconfig.defconfig +++ b/boards/arm/stm32f7508_dk/Kconfig.defconfig @@ -17,9 +17,6 @@ endif # NETWORKING if DISPLAY -config KSCAN - default y - # MEMC needs to be enabled in order to store # display buffer to external SDRAM connected to FMC config MEMC @@ -28,7 +25,7 @@ config MEMC endif # DISPLAY config INPUT - default y if KSCAN + default y if LVGL if INPUT diff --git a/boards/arm/stm32f7508_dk/stm32f7508_dk.dts b/boards/arm/stm32f7508_dk/stm32f7508_dk.dts index 3b1809db66e2f..07f2206563ed8 100644 --- a/boards/arm/stm32f7508_dk/stm32f7508_dk.dts +++ b/boards/arm/stm32f7508_dk/stm32f7508_dk.dts @@ -43,6 +43,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336>; + }; + sdram1: sdram@c0000000 { compatible = "zephyr,memory-region", "mmio-sram"; device_type = "memory"; @@ -98,7 +103,7 @@ status = "okay"; clock-frequency = ; - ft5336@38 { + ft5336: ft5336@38 { compatible = "focaltech,ft5336"; reg = <0x38>; int-gpios = <&gpioi 13 0>; diff --git a/boards/arm/stm32f769i_disco/Kconfig.defconfig b/boards/arm/stm32f769i_disco/Kconfig.defconfig index 8ea8440dd8bea..8689d03c656a3 100644 --- a/boards/arm/stm32f769i_disco/Kconfig.defconfig +++ b/boards/arm/stm32f769i_disco/Kconfig.defconfig @@ -13,7 +13,7 @@ config SPI_STM32_INTERRUPT depends on SPI config INPUT - default y if KSCAN + default y if LVGL if NETWORKING diff --git a/boards/arm/stm32f769i_disco/stm32f769i_disco.dts b/boards/arm/stm32f769i_disco/stm32f769i_disco.dts index de1ba818d083f..d6b006e31b766 100644 --- a/boards/arm/stm32f769i_disco/stm32f769i_disco.dts +++ b/boards/arm/stm32f769i_disco/stm32f769i_disco.dts @@ -61,6 +61,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft6202>; + }; + aliases { led0 = &red_led_1; led1 = &green_led_2; @@ -125,7 +130,7 @@ arduino_serial: &usart6 {}; status = "okay"; clock-frequency = ; - ft6202@2a { + ft6202: ft6202@2a { compatible = "focaltech,ft5336"; reg = <0x2a>; int-gpios = <&gpioi 13 0>; diff --git a/boards/arm/stm32h7b3i_dk/Kconfig.defconfig b/boards/arm/stm32h7b3i_dk/Kconfig.defconfig index 45d67c67e928f..8a32fb1c68fcb 100644 --- a/boards/arm/stm32h7b3i_dk/Kconfig.defconfig +++ b/boards/arm/stm32h7b3i_dk/Kconfig.defconfig @@ -8,11 +8,8 @@ if BOARD_STM32H7B3I_DK config BOARD default "stm32h7b3i_dk" -config KSCAN - default y if DISPLAY - config INPUT - default y if KSCAN + default y if LVGL config INPUT_FT5336_INTERRUPT default y if INPUT_FT5336 diff --git a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts index 5f8aadd289523..876079660734e 100644 --- a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts +++ b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts @@ -45,6 +45,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336>; + }; + sdram2: sdram@d0000000 { compatible = "zephyr,memory-region", "mmio-sram"; device_type = "memory"; diff --git a/boards/posix/native_posix/native_posix.dts b/boards/posix/native_posix/native_posix.dts index eeadaf8ab8fcd..55b6f6f2b3665 100644 --- a/boards/posix/native_posix/native_posix.dts +++ b/boards/posix/native_posix/native_posix.dts @@ -43,6 +43,11 @@ }; }; + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&input_sdl_touch>; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig b/boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig index fa180f92b4d5f..eb44e86b27141 100644 --- a/boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig +++ b/boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig @@ -25,24 +25,9 @@ choice LV_COLOR_DEPTH default LV_COLOR_DEPTH_32 endchoice -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/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 index e273d39c32bbc..b6ba21654a434 100644 --- 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 @@ -11,6 +11,14 @@ zephyr,display = &ili9340; zephyr,keyboard-scan = &kscan_input; }; + + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336_adafruit_2_8_tft_touch_v2>; + swap-xy; + invert-x; + invert-y; + }; }; &arduino_spi { @@ -49,7 +57,7 @@ }; &arduino_i2c { - ft5336@38 { + ft5336_adafruit_2_8_tft_touch_v2: ft5336@38 { compatible = "focaltech,ft5336"; reg = <0x38>; /* Uncomment if IRQ line is available (requires to solder jumper) */ diff --git a/boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig b/boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig index 7e299c6b37264..2e9c0a6ed8a22 100644 --- a/boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig +++ b/boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig @@ -28,24 +28,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/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 index 1cfd478f05f50..fbc7f610791a1 100644 --- 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 @@ -11,6 +11,14 @@ zephyr,display = &ili9340_buydisplay_2_8_tft_touch_arduino; zephyr,keyboard-scan = &kscan_input; }; + + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336_buydisplay_2_8_tft_touch_arduino>; + swap-xy; + invert-x; + invert-y; + }; }; &arduino_spi { @@ -37,7 +45,7 @@ }; &arduino_i2c { - ft5336@38 { + ft5336_buydisplay_2_8_tft_touch_arduino: ft5336@38 { compatible = "focaltech,ft5336"; reg = <0x38>; /* Uncomment if IRQ line is available (requires to solder jumper) */ diff --git a/boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig b/boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig index b2556e6aa1078..1e95dee988eaa 100644 --- a/boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig +++ b/boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig @@ -25,24 +25,9 @@ choice LV_COLOR_DEPTH default LV_COLOR_DEPTH_16 endchoice -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/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 index 8f63c485160d3..741b8978f250c 100644 --- 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 @@ -11,6 +11,14 @@ zephyr,display = &ili9488_buydisplay_3_5_tft_touch_arduino; zephyr,keyboard-scan = &kscan_input; }; + + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft5336_buydisplay_3_5_tft_touch_arduino>; + swap-xy; + invert-x; + invert-y; + }; }; &arduino_spi { @@ -36,7 +44,7 @@ }; &arduino_i2c { - ft5336@38 { + ft5336_buydisplay_3_5_tft_touch_arduino: ft5336@38 { compatible = "focaltech,ft5336"; reg = <0x38>; /* Uncomment if IRQ line is available (requires to solder jumper) */ diff --git a/boards/shields/g1120b0mipi/Kconfig.defconfig b/boards/shields/g1120b0mipi/Kconfig.defconfig index 18c5e7af45e5c..807183c47421d 100644 --- a/boards/shields/g1120b0mipi/Kconfig.defconfig +++ b/boards/shields/g1120b0mipi/Kconfig.defconfig @@ -11,20 +11,6 @@ config INPUT config INPUT_FT5336_INTERRUPT default y -# KSCAN subsystem must be enabled for KSCAN input shim driver -config KSCAN - default y - -# Configure LVGL to use touchscreen with KSCAN API -config LV_Z_POINTER_KSCAN - default y - -# Y coordinates need to be inverted for this controller. Note that -# the RM67162 display driver also reports the display orientation as rotated -# by 90 degrees, so LVGL will read coordinates correctly. -config LV_Z_POINTER_KSCAN_INVERT_Y - default y - # Swap 16 bit color setting for LVGL, to send high byte first config LV_COLOR_16_SWAP default y diff --git a/boards/shields/g1120b0mipi/g1120b0mipi.overlay b/boards/shields/g1120b0mipi/g1120b0mipi.overlay index a60fac33121cc..1d97b4d0a2501 100644 --- a/boards/shields/g1120b0mipi/g1120b0mipi.overlay +++ b/boards/shields/g1120b0mipi/g1120b0mipi.overlay @@ -20,11 +20,17 @@ enable-gpios = <&nxp_mipi_connector 32 GPIO_ACTIVE_HIGH>; regulator-boot-on; }; + + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <&ft3267_g1120b0mipi>; + invert-y; + }; }; &nxp_mipi_i2c { status = "okay"; - ft3267@38 { + ft3267_g1120b0mipi: ft3267@38 { /* * Note- the actual controller present on this IC is a FT3267, * but the FT35336 driver in Zephyr supports this IC. diff --git a/boards/shields/rk055hdmipi4m/Kconfig.defconfig b/boards/shields/rk055hdmipi4m/Kconfig.defconfig index 32c8cff734e46..c753db8487511 100644 --- a/boards/shields/rk055hdmipi4m/Kconfig.defconfig +++ b/boards/shields/rk055hdmipi4m/Kconfig.defconfig @@ -14,18 +14,10 @@ endif # DISPLAY if LVGL -# Configure LVGL to use touchscreen with KSCAN API - -config KSCAN - default y - config INPUT - default y if KSCAN - -config INPUT_GT911_INTERRUPT default y -config LV_Z_POINTER_KSCAN +config INPUT_GT911_INTERRUPT default y # LVGL should allocate buffers equal to size of display diff --git a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay index ae1c42a52148d..f7cb1a8377bc8 100644 --- a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay +++ b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay @@ -22,11 +22,16 @@ enable-gpios = <&nxp_mipi_connector 32 GPIO_ACTIVE_HIGH>; regulator-boot-on; }; + + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <>911_rk055hdmipi4m>; + }; }; &nxp_mipi_i2c { status = "okay"; - touch_controller: gt911@5d { + gt911_rk055hdmipi4m: gt911@5d { compatible = "goodix,gt911"; reg = <0x5d>; irq-gpios = <&nxp_mipi_connector 29 GPIO_ACTIVE_HIGH>; diff --git a/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig b/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig index f9cd659d455b5..938ebb3b070fd 100644 --- a/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig +++ b/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig @@ -16,16 +16,10 @@ if LVGL # Configure LVGL to use touchscreen with KSCAN API -config KSCAN - default y - config INPUT - default y if KSCAN - -config INPUT_GT911_INTERRUPT default y -config LV_Z_POINTER_KSCAN +config INPUT_GT911_INTERRUPT default y # LVGL should allocate buffers equal to size of display diff --git a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay index c7e5e3966a97e..d3b94ce6e727e 100644 --- a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay +++ b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay @@ -22,11 +22,16 @@ enable-gpios = <&nxp_mipi_connector 32 GPIO_ACTIVE_HIGH>; regulator-boot-on; }; + + lvgl_pointer { + compatible = "zephyr,lvgl-pointer-input"; + input = <>911_rk055hdmipi4ma0>; + }; }; &nxp_mipi_i2c { status = "okay"; - touch_controller_rk055hdmipi4ma0: gt911-rk055hdmipi4ma0@5d { + gt911_rk055hdmipi4ma0: gt911-rk055hdmipi4ma0@5d { compatible = "goodix,gt911"; reg = <0x5d>; irq-gpios = <&nxp_mipi_connector 29 GPIO_ACTIVE_HIGH>; From 29c8b1d20454d14de48bd62c30a30d7d0b08a6eb Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Wed, 30 Aug 2023 11:20:58 +0200 Subject: [PATCH 2/4] samples: subsys: display: lvgl: Remove lvgl-pointer-input in overlays After adding the lvgl pointer device into the board dts the custom overlays are not needed anymore. Signed-off-by: Fabian Blatz --- .../subsys/display/lvgl/boards/native_posix.overlay | 6 ------ .../display/lvgl/boards/stm32f746g_disco.overlay | 12 ------------ .../subsys/display/lvgl/boards/stm32h7b3i_dk.overlay | 12 ------------ .../kscan/kscan_input/boards/native_posix.overlay | 2 +- 4 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 samples/subsys/display/lvgl/boards/stm32f746g_disco.overlay delete mode 100644 samples/subsys/display/lvgl/boards/stm32h7b3i_dk.overlay diff --git a/samples/subsys/display/lvgl/boards/native_posix.overlay b/samples/subsys/display/lvgl/boards/native_posix.overlay index 78e05578be67e..d0cf42da6626c 100644 --- a/samples/subsys/display/lvgl/boards/native_posix.overlay +++ b/samples/subsys/display/lvgl/boards/native_posix.overlay @@ -25,12 +25,6 @@ }; }; - lvgl_pointer_input { - status = "okay"; - compatible = "zephyr,lvgl-pointer-input"; - input = <&input_sdl_touch>; - }; - lvgl_button_input { compatible = "zephyr,lvgl-button-input"; input = <&keys>; diff --git a/samples/subsys/display/lvgl/boards/stm32f746g_disco.overlay b/samples/subsys/display/lvgl/boards/stm32f746g_disco.overlay deleted file mode 100644 index 1463487929e63..0000000000000 --- a/samples/subsys/display/lvgl/boards/stm32f746g_disco.overlay +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2023, Fabian Blatz - * - * 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.overlay b/samples/subsys/display/lvgl/boards/stm32h7b3i_dk.overlay deleted file mode 100644 index 1463487929e63..0000000000000 --- a/samples/subsys/display/lvgl/boards/stm32h7b3i_dk.overlay +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2023, Fabian Blatz - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - lvgl_pointer_input { - compatible = "zephyr,lvgl-pointer-input"; - input = <&ft5336>; - }; -}; diff --git a/tests/drivers/kscan/kscan_input/boards/native_posix.overlay b/tests/drivers/kscan/kscan_input/boards/native_posix.overlay index a88bdf5da9307..4e36164ab6349 100644 --- a/tests/drivers/kscan/kscan_input/boards/native_posix.overlay +++ b/tests/drivers/kscan/kscan_input/boards/native_posix.overlay @@ -5,7 +5,7 @@ */ / { - /delete-node/ input-sdl-touch; + /delete-node/ input_sdl_touch; fake_input_device: fake-device { compatible = "vnd,input-device"; From 0c91b5f59feaa86387d831d8faa18a933e4d4935 Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Wed, 30 Aug 2023 13:04:17 +0200 Subject: [PATCH 3/4] boards: Remove touch input kscan nodes Change boards and shields and remove kscan nodes in favor of the "zephyr,lvgl-pointer-input" compatible. Signed-off-by: Fabian Blatz --- boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi | 6 ------ boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts | 6 ------ boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml | 1 - boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts | 6 ------ boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml | 1 - boards/arm/mimxrt1060_evk/mimxrt1060_evkb.yaml | 1 - boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts | 6 ------ boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml | 1 - boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.yaml | 1 - boards/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.yaml | 1 - boards/arm/pinetime_devkit0/pinetime_devkit0.dts | 6 ------ boards/arm/pinetime_devkit0/pinetime_devkit0.yaml | 2 -- boards/arm/stm32f746g_disco/stm32f746g_disco.dts | 6 ------ boards/arm/stm32f746g_disco/stm32f746g_disco.yaml | 1 - boards/arm/stm32f7508_dk/stm32f7508_dk.dts | 6 ------ boards/arm/stm32f7508_dk/stm32f7508_dk.yaml | 1 - boards/arm/stm32f769i_disco/stm32f769i_disco.dts | 6 ------ boards/arm/stm32f769i_disco/stm32f769i_disco.yaml | 1 - boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts | 6 ------ boards/arm/stm32h7b3i_dk/stm32h7b3i_dk.yaml | 1 - boards/posix/native_posix/native_posix.dts | 5 ----- .../dts/adafruit_2_8_tft_touch_v2.dtsi | 5 ----- .../buydisplay_2_8_tft_touch_arduino.overlay | 5 ----- .../buydisplay_3_5_tft_touch_arduino.overlay | 5 ----- boards/shields/g1120b0mipi/g1120b0mipi.overlay | 8 -------- boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay | 9 --------- boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay | 8 -------- 27 files changed, 111 deletions(-) diff --git a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi index 0aa18ed0189c3..4fd2c3510138a 100644 --- 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 index 04b8d3d416d19..5068bc674e457 100644 --- 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 index 00b358b5f2083..5fe02de586bcb 100644 --- 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 index b2deed9459006..2b2f352d1c351 100644 --- 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 index 181bb8d25d472..7daace5558ec8 100644 --- 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 index 1191d4bbeb695..1e14219497a54 100644 --- 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 index 6923d0a478555..ebd88badcb6b5 100644 --- 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 index a46dfe6b28fa6..1c5a3cbfde1f9 100644 --- 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 index 8d948ad595c46..db9980a083ef5 100644 --- 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 index 5da139df53eeb..9bb5b1d809f07 100644 --- 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 index a5d7eef0e696e..baad177740cbd 100644 --- 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 index cf98faaf53e02..245346b1db893 100644 --- 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 index 6de9c8eb9bbf2..f28c5857cbe46 100644 --- 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 = <dc; - 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 index 9c2d49a17b937..edc6635e0b432 100644 --- 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 index 07f2206563ed8..3969add4e281f 100644 --- 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 = <dc; - 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 index 3a7ae23023bfa..fca291ee3d17c 100644 --- 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 index d6b006e31b766..fcd2197aa9dee 100644 --- 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 index 0377147bf83b6..520d6437ef596 100644 --- 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 index 876079660734e..4183c4912bd3b 100644 --- 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 = <dc; 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 index 22d3f195f5f87..d3c2894fb7434 100644 --- 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 index 55b6f6f2b3665..124cc188967d6 100644 --- a/boards/posix/native_posix/native_posix.dts +++ b/boards/posix/native_posix/native_posix.dts @@ -23,7 +23,6 @@ zephyr,flash-controller = &flashcontroller0; zephyr,display = &sdl_dc; zephyr,canbus = &can_loopback0; - zephyr,keyboard-scan = &kscan_input; }; aliases { @@ -31,7 +30,6 @@ 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 index b6ba21654a434..543d0b86df134 100644 --- 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 index fbc7f610791a1..3cc257e936695 100644 --- 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 index 741b8978f250c..5764c4154607d 100644 --- 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 @@ -9,7 +9,6 @@ / { chosen { zephyr,display = &ili9488_buydisplay_3_5_tft_touch_arduino; - zephyr,keyboard-scan = &kscan_input; }; lvgl_pointer { @@ -49,9 +48,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/g1120b0mipi/g1120b0mipi.overlay b/boards/shields/g1120b0mipi/g1120b0mipi.overlay index 1d97b4d0a2501..e456a7f31c7d4 100644 --- a/boards/shields/g1120b0mipi/g1120b0mipi.overlay +++ b/boards/shields/g1120b0mipi/g1120b0mipi.overlay @@ -5,13 +5,8 @@ */ /{ - aliases { - kscan0 = &kscan_input_g1120b0mipi; - }; - chosen { zephyr,display = &rm67162_g1120b0mipi; - zephyr,keyboard-scan = &kscan_input_g1120b0mipi; }; en_mipi_display_g1120b0mipi: enable-mipi-display { @@ -39,9 +34,6 @@ reg = <0x38>; int-gpios = <&nxp_mipi_connector 29 GPIO_ACTIVE_LOW>; reset-gpios = <&nxp_mipi_connector 28 GPIO_ACTIVE_HIGH>; - kscan_input_g1120b0mipi: kscan-input { - compatible = "zephyr,kscan-input"; - }; }; }; diff --git a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay index f7cb1a8377bc8..079596b60d2a3 100644 --- a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay +++ b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay @@ -7,13 +7,8 @@ #include /{ - aliases { - kscan0 = &kscan_input_gt911; - }; - chosen { zephyr,display = &lcdif; - zephyr,keyboard-scan = &kscan_input_gt911; }; en_mipi_display: enable-mipi-display { @@ -36,10 +31,6 @@ reg = <0x5d>; irq-gpios = <&nxp_mipi_connector 29 GPIO_ACTIVE_HIGH>; reset-gpios = <&nxp_mipi_connector 28 GPIO_ACTIVE_HIGH>; - - kscan_input_gt911: kscan-input { - compatible = "zephyr,kscan-input"; - }; }; }; diff --git a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay index d3b94ce6e727e..29a90ee0b7371 100644 --- a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay +++ b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay @@ -7,13 +7,8 @@ #include /{ - aliases { - kscan0 = &kscan_input_gt911; - }; - chosen { zephyr,display = &lcdif; - zephyr,keyboard-scan = &kscan_input_gt911; }; en_mipi_display_rk055hdmipi4ma0: enable-mipi-display-rk055hdmipi4ma0 { @@ -36,9 +31,6 @@ reg = <0x5d>; irq-gpios = <&nxp_mipi_connector 29 GPIO_ACTIVE_HIGH>; reset-gpios = <&nxp_mipi_connector 28 GPIO_ACTIVE_HIGH>; - kscan_input_gt911: kscan-input { - compatible = "zephyr,kscan-input"; - }; }; }; From a54df10abdcdc7b79e074f26912278548d92277f Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Fri, 1 Sep 2023 10:04:01 +0200 Subject: [PATCH 4/4] tests: misc: check_init_priorities: update output Update the expected output of the init priority checking. Signed-off-by: Fabian Blatz --- .../validate_check_init_priorities_output.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/misc/check_init_priorities/validate_check_init_priorities_output.py b/tests/misc/check_init_priorities/validate_check_init_priorities_output.py index 1e5f92a1921ac..96d98954469bd 100755 --- a/tests/misc/check_init_priorities/validate_check_init_priorities_output.py +++ b/tests/misc/check_init_priorities/validate_check_init_priorities_output.py @@ -8,12 +8,12 @@ import sys REFERENCE_OUTPUT = [ - "INFO: /i2c@11112222/test-i2c-dev@12 PRE_KERNEL_1 51 31 > /gpio@ffff PRE_KERNEL_1 50 27", - "INFO: /i2c@11112222/test-i2c-dev@12 PRE_KERNEL_1 51 31 > /i2c@11112222 PRE_KERNEL_1 50 28", - "ERROR: /i2c@11112222/test-i2c-dev@10 PRE_KERNEL_1 49 29 < /gpio@ffff PRE_KERNEL_1 50 27", - "ERROR: /i2c@11112222/test-i2c-dev@10 PRE_KERNEL_1 49 29 < /i2c@11112222 PRE_KERNEL_1 50 28", - "INFO: /i2c@11112222/test-i2c-dev@11 PRE_KERNEL_1 50 30 > /gpio@ffff PRE_KERNEL_1 50 27", - "INFO: /i2c@11112222/test-i2c-dev@11 PRE_KERNEL_1 50 30 > /i2c@11112222 PRE_KERNEL_1 50 28", + "ERROR: /i2c@11112222/test-i2c-dev@10 PRE_KERNEL_1 49 31 < /gpio@ffff PRE_KERNEL_1 50 29", + "ERROR: /i2c@11112222/test-i2c-dev@10 PRE_KERNEL_1 49 31 < /i2c@11112222 PRE_KERNEL_1 50 30", + "INFO: /i2c@11112222/test-i2c-dev@11 PRE_KERNEL_1 50 32 > /gpio@ffff PRE_KERNEL_1 50 29", + "INFO: /i2c@11112222/test-i2c-dev@11 PRE_KERNEL_1 50 32 > /i2c@11112222 PRE_KERNEL_1 50 30", + "INFO: /i2c@11112222/test-i2c-dev@12 PRE_KERNEL_1 51 33 > /gpio@ffff PRE_KERNEL_1 50 29", + "INFO: /i2c@11112222/test-i2c-dev@12 PRE_KERNEL_1 51 33 > /i2c@11112222 PRE_KERNEL_1 50 30" ] if len(sys.argv) != 2: