Skip to content

Commit 9b435bf

Browse files
committed
devicetree: replace 'zephyr,touch' chosen property with DT alias 'touch'
'zephyr,touch' chosen property is currently used only by the subsys/input/draw_touch_events sample and not used by any upstream Zephyr driver, subsystem, or module. Hence it is not justified to have this chosen property as it only creates confusion and leads users to wrongly assume that setting this property produces some effect in Zephyr internals. Signed-off-by: Abderrahmane JARMOUNI <git@jarmouni.me>
1 parent 81ee157 commit 9b435bf

File tree

32 files changed

+75
-37
lines changed

32 files changed

+75
-37
lines changed

boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
zephyr,bt-c2h-uart = &uart0;
1717
zephyr,display = &ili9340;
1818
zephyr,bt-hci = &bt_hci_ipc0;
19-
zephyr,touch = &ft5336;
2019
};
2120

2221
/* Main LEDs and buttons are on an I2C TCA9538 GPIO port expander */
@@ -106,6 +105,7 @@
106105
watchdog0 = &wdt0;
107106
accel0 = &lis3dh;
108107
bbram0 = &extrtc0;
108+
touch = &ft5336;
109109
};
110110

111111
mipi_dbi {

boards/lilygo/twatch_s3/twatch_s3_procpu.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
watchdog0 = &wdt0;
2121
rtc = &pfc8563_rtc;
2222
pwm-led0 = &backlight_pwm;
23+
touch = &ft5336;
2324
};
2425

2526
chosen {
@@ -30,7 +31,6 @@
3031
zephyr,code-partition = &slot0_partition;
3132
zephyr,bt-hci = &esp32_bt_hci;
3233
zephyr,display = &st7789v;
33-
zephyr,touch = &ft5336;
3434
zephyr,ipc_shm = &shm0;
3535
zephyr,ipc = &ipm0;
3636
};

boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
rtc = &pfc8563_rtc;
2626
led0 = &led_pwr;
2727
sdhc0 = &sd0;
28+
touch = &ft5336_touch;
2829
};
2930

3031
chosen {
@@ -36,7 +37,6 @@
3637
zephyr,code-partition = &slot0_partition;
3738
zephyr,rtc = &pfc8563_rtc;
3839
zephyr,bt-hci = &esp32_bt_hci;
39-
zephyr,touch = &ft5336_touch;
4040
};
4141

4242
leds {

boards/m5stack/m5stack_cores3/m5stack_cores3_procpu_common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
zephyr,code-partition = &slot0_partition;
2020
zephyr,rtc = &bm8563_rtc;
2121
zephyr,bt-hci = &esp32_bt_hci;
22-
zephyr,touch = &ft6336_touch;
2322
};
2423

2524
aliases {
@@ -32,6 +31,7 @@
3231
rtc = &bm8563_rtc;
3332
sdhc0 = &sd0;
3433
led0 = &axp2101_led;
34+
touch = &ft6336_touch;
3535
};
3636

3737
lvgl_pointer {

boards/native/native_sim/native_sim.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
zephyr,canbus = &can_loopback0;
2626
zephyr,code-partition = &slot0_partition;
2727
zephyr,bt-hci = &bt_hci_userchan;
28-
zephyr,touch = &input_sdl_touch;
2928
};
3029

3130
aliases {
@@ -34,6 +33,7 @@
3433
spi-0 = &spi0;
3534
led0 = &led0;
3635
rtc = &rtc;
36+
touch = &input_sdl_touch;
3737
};
3838

3939
leds {

boards/nxp/mimxrt1064_evk/mimxrt1064_evk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
watchdog0 = &wdog0;
2222
sdhc0 = &usdhc1;
2323
mcuboot-button0 = &user_button;
24+
touch = &ft5336;
2425
};
2526

2627
chosen {
@@ -34,7 +35,6 @@
3435
zephyr,console = &lpuart1;
3536
zephyr,shell-uart = &lpuart1;
3637
zephyr,canbus = &flexcan2;
37-
zephyr,touch = &ft5336;
3838
};
3939

4040
sdram0: memory@80000000 {

boards/nxp/rd_rw612_bga/dts/goworld_16880_lcm.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/ {
44
chosen {
55
zephyr,display = &st7796s_lcdic;
6-
zephyr,touch = &ft7401;
76
};
87

98
lvgl_pointer {
@@ -12,6 +11,10 @@
1211
swap-xy;
1312
invert-y;
1413
};
14+
15+
aliases {
16+
touch = &ft7401;
17+
};
1518
};
1619

1720
&lcdic {

boards/pine64/pinetime_devkit0/pinetime_devkit0.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
zephyr,flash = &flash0;
2828
zephyr,code-partition = &slot0_partition;
2929
zephyr,display = &st7789v;
30-
zephyr,touch = &cst816s;
3130
};
3231

3332
aliases {
@@ -37,6 +36,7 @@
3736
led3 = &statusled; /* status led, may be not populated */
3837
sw0 = &key_in; /* key in */
3938
watchdog0 = &wdt0;
39+
touch = &cst816s;
4040
};
4141

4242
leds {

boards/renesas/da1469x_dk_pro/dts/da1469x_dk_pro_lcdc.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010
/ {
1111
chosen {
1212
zephyr,display = &lcdc;
13-
zephyr,touch = &display_touch;
1413
};
1514

1615
lvgl_pointer {
1716
input = <&display_touch>;
1817
status = "okay";
1918
swap-xy;
2019
};
20+
21+
aliases {
22+
touch = &display_touch;
23+
};
2124
};
2225

2326
&pinctrl {

boards/renesas/da1469x_dk_pro/dts/da1469x_dk_pro_mipi_dbi.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/ {
1111
chosen {
1212
zephyr,display = &ili9340;
13-
zephyr,touch = &display_touch;
1413
};
1514

1615
lvgl_pointer {
@@ -20,6 +19,10 @@
2019
invert-x;
2120
invert-y;
2221
};
22+
23+
aliases {
24+
touch = &display_touch;
25+
};
2326
};
2427

2528
&i2c2 {

boards/shields/adafruit_2_8_tft_touch_v2/dts/adafruit_2_8_tft_touch_v2.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/ {
1010
chosen {
1111
zephyr,display = &adafruit_2_8_tft_touch_v2_ili9340;
12-
zephyr,touch = &ft5336_adafruit_2_8_tft_touch_v2;
1312
};
1413

1514
lvgl_pointer {
@@ -44,6 +43,10 @@
4443
ngamctrl = [00 0e 14 03 11 07 31 c1 48 08 0f 0c 31 36 0f];
4544
};
4645
};
46+
47+
aliases {
48+
touch = &ft5336_adafruit_2_8_tft_touch_v2;
49+
};
4750
};
4851

4952
&arduino_spi {

boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
aliases {
1616
accel0 = &gt911;
17+
touch = &gt911;
1718
};
1819

1920
chosen {
2021
zephyr,display = &zephyr_lcd_controller;
21-
zephyr,touch = &gt911;
2222
};
2323
};
2424

boards/shields/buydisplay_2_8_tft_touch_arduino/buydisplay_2_8_tft_touch_arduino.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/ {
1010
chosen {
1111
zephyr,display = &ili9340_buydisplay_2_8_tft_touch_arduino;
12-
zephyr,touch = &ft5336_buydisplay_2_8_tft_touch_arduino;
1312
};
1413

1514
lvgl_pointer {
@@ -45,6 +44,10 @@
4544
ngamctrl = [00 0e 14 03 11 07 31 c1 48 08 0f 0c 31 36 0f];
4645
};
4746
};
47+
48+
aliases {
49+
touch = &ft5336_buydisplay_2_8_tft_touch_arduino;
50+
};
4851
};
4952

5053
&arduino_spi {

boards/shields/buydisplay_3_5_tft_touch_arduino/buydisplay_3_5_tft_touch_arduino.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/ {
1010
chosen {
1111
zephyr,display = &ili9488_buydisplay_3_5_tft_touch_arduino;
12-
zephyr,touch = &ft5336_buydisplay_3_5_tft_touch_arduino;
1312
};
1413

1514
lvgl_pointer {
@@ -44,6 +43,10 @@
4443
ngamctrl = [00 16 19 03 0f 05 32 45 46 04 0e 0d 35 37 0f];
4544
};
4645
};
46+
47+
aliases {
48+
touch = &ft5336_buydisplay_3_5_tft_touch_arduino;
49+
};
4750
};
4851

4952
&arduino_spi {

boards/shields/g1120b0mipi/g1120b0mipi.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
/{
88
chosen {
99
zephyr,display = &rm67162_g1120b0mipi;
10-
zephyr,touch = &ft3267_g1120b0mipi;
1110
};
1211

1312
en_mipi_display_g1120b0mipi: enable-mipi-display {
@@ -22,6 +21,10 @@
2221
input = <&ft3267_g1120b0mipi>;
2322
invert-y;
2423
};
24+
25+
aliases {
26+
touch = &ft3267_g1120b0mipi;
27+
};
2528
};
2629

2730
&nxp_mipi_i2c {

boards/shields/lcd_par_s035/lcd_par_s035_8080.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/{
1010
chosen {
1111
zephyr,display = &st7796s;
12-
zephyr,touch = &gt911_lcd_par_s035;
1312
};
1413

1514
lvgl_pointer {
@@ -18,6 +17,10 @@
1817
swap-xy;
1918
invert-y;
2019
};
20+
21+
aliases {
22+
touch = &gt911_lcd_par_s035;
23+
};
2124
};
2225

2326
&nxp_8080_touch_panel_i2c {

boards/shields/lcd_par_s035/lcd_par_s035_spi.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/{
1111
chosen {
1212
zephyr,display = &st7796s;
13-
zephyr,touch = &gt911_lcd_par_s035;
1413
};
1514

1615
lvgl_pointer {
@@ -19,6 +18,10 @@
1918
swap-xy;
2019
invert-y;
2120
};
21+
22+
aliases {
23+
touch = &gt911_lcd_par_s035;
24+
};
2225
};
2326

2427
&nxp_pmod_touch_panel_i2c {

boards/shields/rk043fn02h_ct/rk043fn02h_ct.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
/{
1010
chosen {
1111
zephyr,display = &zephyr_lcdif;
12-
zephyr,touch = &ft5336_rk043fn02h_ct;
1312
};
1413

1514
lvgl_pointer {
1615
compatible = "zephyr,lvgl-pointer-input";
1716
input = <&ft5336_rk043fn02h_ct>;
1817
};
18+
19+
aliases {
20+
touch = &ft5336_rk043fn02h_ct;
21+
};
1922
};
2023

2124
&nxp_touch_i2c {

boards/shields/rk043fn66hs_ctg/rk043fn66hs_ctg.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
/{
1010
chosen {
1111
zephyr,display = &zephyr_lcdif;
12-
zephyr,touch = &gt911_rk043fn66hs_ctg;
1312
};
1413

1514
lvgl_pointer {
1615
compatible = "zephyr,lvgl-pointer-input";
1716
input = <&gt911_rk043fn66hs_ctg>;
1817
};
18+
19+
aliases {
20+
touch = &gt911_rk043fn66hs_ctg;
21+
};
1922
};
2023

2124
&nxp_touch_i2c {

boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/{
1010
chosen {
1111
zephyr,display = &lcdif;
12-
zephyr,touch = &gt911_rk055hdmipi4m;
1312
};
1413

1514
en_mipi_display: enable-mipi-display {
@@ -23,6 +22,10 @@
2322
compatible = "zephyr,lvgl-pointer-input";
2423
input = <&gt911_rk055hdmipi4m>;
2524
};
25+
26+
aliases {
27+
touch = &gt911_rk055hdmipi4m;
28+
};
2629
};
2730

2831
&nxp_mipi_i2c {

boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/{
1010
chosen {
1111
zephyr,display = &lcdif;
12-
zephyr,touch = &gt911_rk055hdmipi4ma0;
1312
};
1413

1514
en_mipi_display_rk055hdmipi4ma0: enable-mipi-display-rk055hdmipi4ma0 {
@@ -23,6 +22,10 @@
2322
compatible = "zephyr,lvgl-pointer-input";
2423
input = <&gt911_rk055hdmipi4ma0>;
2524
};
25+
26+
aliases {
27+
touch = &gt911_rk055hdmipi4ma0;
28+
};
2629
};
2730

2831
&nxp_mipi_i2c {

boards/shields/seeed_xiao_round_display/seeed_xiao_round_display.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/ {
1111
chosen {
1212
zephyr,display = &gc9a01_xiao_round_display;
13-
zephyr,touch = &chsc6x_xiao_round_display;
1413
};
1514

1615
vbatt {
@@ -27,6 +26,7 @@
2726

2827
aliases {
2928
rtc = &pcf8563_xiao_round_display;
29+
touch = &chsc6x_xiao_round_display;
3030
};
3131

3232
xiao_round_display_mipi_dbi {

0 commit comments

Comments
 (0)