Skip to content

Commit 9bfc1f5

Browse files
author
Waveshare_Team
committed
ARM: dts: overlays: waveshare-panel-v2: Add 6.25-DSI-TOUCH-A overlay
Add device tree overlay entries for the Waveshare 6.25-DSI-TOUCH-A display in both 2-lane and 4-lane configurations. The 6.25-DSI-TOUCH-A uses the Sitronix ST7123 touchscreen controller at I2C address 0x55, replacing the default Goodix touch configuration. Rename the touch node from "goodix@5d" to "touch@5d" to reflect that different panels may use different touch controllers. Enable CONFIG_TOUCHSCREEN_ST7123=m in bcm2712_defconfig. Signed-off-by: Waveshare_Team <support@waveshare.com>
1 parent 5796f7d commit 9bfc1f5

5 files changed

Lines changed: 11 additions & 0 deletions

File tree

arch/arm/boot/dts/overlays/README

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5964,6 +5964,8 @@ Params: 3_4_inch_c 3.4" 800x800 2lane
59645964
4_0_inch_c 4.0" 720x720 2lane
59655965
5_0_inch_a 5.0" 720x1280 2lane
59665966
5_5_inch_a 5.5" 720x1280 2lane
5967+
6_25_inch_a 6.25" 720x1560 2lane
5968+
6_25_inch_a_4lane 6.25" 720x1560 4lane
59675969
7_0_inch_a 7.0" A 720x1280 2lane
59685970
7_0_inch_b 7.0" B 720x1280 2lane
59695971
7_0_inch_c 7.0" C 1024x600 2lane

arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-v2-overlay.dts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@
8282
4_0_inch_c = <&dsi_panel>, "compatible=waveshare,4.0-dsi-touch-c";
8383
5_0_inch_a = <&dsi_panel>, "compatible=waveshare,5.0-dsi-touch-a";
8484
5_5_inch_a = <&dsi_panel>, "compatible=waveshare,5.5-dsi-touch-a";
85+
6_25_inch_a = <&dsi_panel>, "compatible=waveshare,6.25-dsi-touch-a",
86+
<&touch>, "compatible=sitronix_ts,st7123",
87+
<&touch>, "reg:0=0x55";
88+
6_25_inch_a_4lane = <&dsi_panel>, "compatible=waveshare,6.25-dsi-touch-a,4lane",
89+
<&touch>, "compatible=sitronix_ts,st7123",
90+
<&touch>, "reg:0=0x55";
8591
7_0_inch_a = <&dsi_panel>, "compatible=waveshare,7.0-dsi-touch-a";
8692
7_0_inch_b = <&dsi_panel>, "compatible=waveshare,7.0-dsi-touch-b";
8793
7_0_inch_c = <&dsi_panel>, "compatible=waveshare,7.0-dsi-touch-c";

arch/arm64/configs/bcm2711_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
707707
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
708708
CONFIG_TOUCHSCREEN_TSC2007=m
709709
CONFIG_TOUCHSCREEN_TSC2007_IIO=y
710+
CONFIG_TOUCHSCREEN_ST7123=m
710711
CONFIG_TOUCHSCREEN_STMPE=m
711712
CONFIG_TOUCHSCREEN_IQS5XX=m
712713
CONFIG_INPUT_MISC=y

arch/arm64/configs/bcm2711_rt_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
706706
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
707707
CONFIG_TOUCHSCREEN_TSC2007=m
708708
CONFIG_TOUCHSCREEN_TSC2007_IIO=y
709+
CONFIG_TOUCHSCREEN_ST7123=m
709710
CONFIG_TOUCHSCREEN_STMPE=m
710711
CONFIG_TOUCHSCREEN_IQS5XX=m
711712
CONFIG_INPUT_MISC=y

arch/arm64/configs/bcm2712_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
710710
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
711711
CONFIG_TOUCHSCREEN_TSC2007=m
712712
CONFIG_TOUCHSCREEN_TSC2007_IIO=y
713+
CONFIG_TOUCHSCREEN_ST7123=m
713714
CONFIG_TOUCHSCREEN_STMPE=m
714715
CONFIG_TOUCHSCREEN_IQS5XX=m
715716
CONFIG_INPUT_MISC=y

0 commit comments

Comments
 (0)