Skip to content

Commit aec090e

Browse files
faxe1008faxe1008
committed
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 <[email protected]>
1 parent a15e7d2 commit aec090e

31 files changed

+115
-143
lines changed

‎boards/arm/bl5340_dvk/Kconfig.defconfig‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,9 @@ config BT_HCI_VS
104104
# https://www.buydisplay.com/2-8-inch-tft-touch-shield-for-arduino-w-capacitive-touch-screen-module
105105
if DISPLAY
106106

107-
if KSCAN
108-
109-
config INPUT_FT5336
110-
default y
111-
112107
config INPUT_FT5336_INTERRUPT
113108
default y
114109

115-
endif # KSCAN
116110

117111
if LVGL
118112

@@ -129,24 +123,9 @@ endchoice
129123
config LV_COLOR_16_SWAP
130124
default y
131125

132-
config KSCAN
133-
default y
134-
135126
config INPUT
136127
default y
137128

138-
config LV_Z_POINTER_KSCAN
139-
default y
140-
141-
config LV_Z_POINTER_KSCAN_SWAP_XY
142-
default y
143-
144-
config LV_Z_POINTER_KSCAN_INVERT_X
145-
default y
146-
147-
config LV_Z_POINTER_KSCAN_INVERT_Y
148-
default y
149-
150129
endif # LVGL
151130

152131
endif # DISPLAY

‎boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dtsi‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@
7474
};
7575
};
7676

77+
lvgl_pointer {
78+
compatible = "zephyr,lvgl-pointer-input";
79+
input = <&ft5336>;
80+
swap-xy;
81+
invert-x;
82+
invert-y;
83+
};
84+
7785
gpio_fwd: nrf-gpio-forwarder {
7886
compatible = "nordic,nrf-gpio-forwarder";
7987
status = "okay";
@@ -141,7 +149,7 @@
141149
irq-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>, <&gpio0 24 GPIO_ACTIVE_HIGH>;
142150
};
143151

144-
ft5336@38 {
152+
ft5336: ft5336@38 {
145153
compatible = "focaltech,ft5336";
146154
reg = <0x38>;
147155
int-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;

‎boards/arm/mimxrt1050_evk/Kconfig.defconfig‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ config FLASH_MCUX_FLEXSPI_NOR
3131

3232
endif #FLASH
3333

34-
config KSCAN
35-
default y if LVGL
36-
3734
config INPUT
38-
default y if KSCAN
35+
default y if LVGL
3936

4037
if INPUT
4138

@@ -56,9 +53,6 @@ endif # NETWORKING
5653

5754
if LVGL
5855

59-
config LV_Z_POINTER_KSCAN
60-
default y
61-
6256
config LV_Z_VDB_SIZE
6357
default 16
6458

‎boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@
6161
};
6262
};
6363

64+
lvgl_pointer {
65+
compatible = "zephyr,lvgl-pointer-input";
66+
input = <&ft5336>;
67+
};
68+
6469
arduino_header: connector {
6570
compatible = "arduino-header-r3";
6671
#gpio-cells = <2>;
@@ -219,7 +224,7 @@ arduino_serial: &lpuart3 {
219224
int2-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
220225
};
221226

222-
ft5336@38 {
227+
ft5336: ft5336@38 {
223228
compatible = "focaltech,ft5336";
224229
reg = <0x38>;
225230
int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;

‎boards/arm/mimxrt1060_evk/Kconfig.defconfig‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ config FLASH_MCUX_FLEXSPI_HYPERFLASH
3434

3535
endif #FLASH
3636

37-
config KSCAN
38-
default y if LVGL
39-
4037
config INPUT
41-
default y if KSCAN
38+
default y if LVGL
4239

4340
if INPUT
4441

@@ -59,9 +56,6 @@ endif # NETWORKING
5956

6057
if LVGL
6158

62-
config LV_Z_POINTER_KSCAN
63-
default y
64-
6559
# LVGL should allocate buffers equal to size of display
6660
config LV_Z_VDB_SIZE
6761
default 100

‎boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
};
6969
};
7070

71+
lvgl_pointer {
72+
compatible = "zephyr,lvgl-pointer-input";
73+
input = <&ft5336>;
74+
};
75+
7176
arduino_header: connector {
7277
compatible = "arduino-header-r3";
7378
#gpio-cells = <2>;
@@ -195,7 +200,7 @@ arduino_i2c: &lpi2c1 {
195200
pinctrl-0 = <&pinmux_lpi2c1>;
196201
pinctrl-names = "default";
197202

198-
ft5336@38 {
203+
ft5336: ft5336@38 {
199204
compatible = "focaltech,ft5336";
200205
reg = <0x38>;
201206
int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;

‎boards/arm/mimxrt1064_evk/Kconfig.defconfig‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ config DEVICE_CONFIGURATION_DATA
1818
config NXP_IMX_EXTERNAL_SDRAM
1919
default y
2020

21-
config KSCAN
22-
default y if LVGL
23-
2421
config INPUT
25-
default y if KSCAN
22+
default y if LVGL
2623

2724
if INPUT
2825

@@ -43,9 +40,6 @@ endif # NETWORKING
4340

4441
if LVGL
4542

46-
config LV_Z_POINTER_KSCAN
47-
default y
48-
4943
config LV_Z_VDB_SIZE
5044
default 16
5145

‎boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
};
7070
};
7171

72+
lvgl_pointer {
73+
compatible = "zephyr,lvgl-pointer-input";
74+
input = <&ft5336>;
75+
};
76+
7277
arduino_header: connector {
7378
compatible = "arduino-header-r3";
7479
#gpio-cells = <2>;
@@ -158,7 +163,7 @@ arduino_i2c: &lpi2c1 {};
158163
};
159164
};
160165

161-
ft5336@38 {
166+
ft5336: ft5336@38 {
162167
compatible = "focaltech,ft5336";
163168
reg = <0x38>;
164169
int-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;

‎boards/arm/pinetime_devkit0/Kconfig.defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config BT_CTLR
1212
default BT
1313

1414
config INPUT
15-
default y if KSCAN
15+
default y if LVGL
1616

1717
if FLASH
1818

‎boards/arm/pinetime_devkit0/pinetime_devkit0.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
};
6969
};
7070

71+
lvgl_pointer {
72+
compatible = "zephyr,lvgl-pointer-input";
73+
input = <&cst816s>;
74+
};
75+
7176
vbatt {
7277
compatible = "voltage-divider";
7378
io-channels = <&adc 7>;

0 commit comments

Comments
 (0)