Skip to content

Commit ea22619

Browse files
yc-hou-0919scorpiochang
authored andcommitted
Add WaveShare 3.2 touch screen
For screen calibration, it also need to modify 40-libinput.conf in /usr/share/X11/xorg.conf.d/ Change-Id: I03274dc76764aa635d862b8c7e8a61f5f4a372b3 Reviewed-on: https://tp-biosrd-v02/gerrit/80156 Reviewed-by: Scorpio Chang(張志賢) <Scorpio_Chang@asus.com> Tested-by: Scorpio Chang(張志賢) <Scorpio_Chang@asus.com>
1 parent 26a39a0 commit ea22619

3 files changed

Lines changed: 71 additions & 26 deletions

File tree

arch/arm/boot/dts/overlays/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
44
hifiberry-dac-amp.dtbo \
55
waveshare35a-tinker.dtbo \
6+
waveshare32b-tinker.dtbo \
67

78
targets += dtbs dtbs_install
89
targets += $(dtbo-y)
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
/ {
5+
compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";
6+
7+
fragment@0 {
8+
target = <&spi2>;
9+
10+
__overlay__ {
11+
status = "okay";
12+
13+
spidev@0 {
14+
status = "disabled";
15+
};
16+
17+
spidev@1 {
18+
status = "disabled";
19+
};
20+
};
21+
};
22+
23+
fragment@1 {
24+
target = <&gpio5>;
25+
26+
__overlay__ {
27+
waveshare32b_pins: waveshare32b_pins {
28+
rockchip,pins = <5 12 0 &pcfg_pull_none>,
29+
<5 14 0 &pcfg_pull_none>,
30+
<5 15 0 &pcfg_pull_none>;
31+
};
32+
};
33+
};
34+
35+
fragment@2 {
36+
target = <&spi2>;
37+
38+
__overlay__ {
39+
#address-cells = <0x1>;
40+
#size-cells = <0x0>;
41+
42+
waveshare32b@0 {
43+
compatible = "ilitek,ili9340";
44+
reg = <0>;
45+
pinctrl-names = "default";
46+
pinctrl-0 = <&waveshare32b_pins>;
47+
spi-max-frequency = <16000000>;
48+
txbuflen = <32768>;
49+
rotate = <270>;
50+
bgr = <0>;
51+
fps = <25>;
52+
buswidth = <8>;
53+
reset-gpios = <&gpio5 14 0>;
54+
dc-gpios = <&gpio5 15 0>;
55+
debug = <0>;
56+
};
57+
58+
waveshare32b-ts@1 {
59+
compatible = "ti,ads7846";
60+
reg = <1>;
61+
spi-max-frequency = <2000000>;
62+
interrupts = <12 2>;
63+
interrupt-parent = <&gpio5>;
64+
pendown-gpio = <&gpio5 12 0>;
65+
ti,x-plate-ohms = /bits/ 16 <60>;/*[00 3c];*/
66+
ti,pressure-max = /bits/ 16 <255>;/*[00 ff];*/
67+
};
68+
};
69+
};
70+
};

arch/arm/configs/miniarm-rk3288_defconfig

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -611,34 +611,8 @@ CONFIG_DMADEVICES=y
611611
CONFIG_PL330_DMA=y
612612
CONFIG_STAGING=y
613613
CONFIG_FB_TFT=y
614-
CONFIG_FB_TFT_AGM1264K_FL=y
615-
CONFIG_FB_TFT_BD663474=y
616-
CONFIG_FB_TFT_HX8340BN=y
617-
CONFIG_FB_TFT_HX8347D=y
618-
CONFIG_FB_TFT_HX8353D=y
619-
CONFIG_FB_TFT_HX8357D=y
620-
CONFIG_FB_TFT_ILI9163=y
621-
CONFIG_FB_TFT_ILI9320=y
622-
CONFIG_FB_TFT_ILI9325=y
623614
CONFIG_FB_TFT_ILI9340=y
624-
CONFIG_FB_TFT_ILI9341=y
625-
CONFIG_FB_TFT_ILI9481=y
626615
CONFIG_FB_TFT_ILI9486=y
627-
CONFIG_FB_TFT_PCD8544=y
628-
CONFIG_FB_TFT_RA8875=y
629-
CONFIG_FB_TFT_S6D02A1=y
630-
CONFIG_FB_TFT_S6D1121=y
631-
CONFIG_FB_TFT_SSD1289=y
632-
CONFIG_FB_TFT_SSD1306=y
633-
CONFIG_FB_TFT_SSD1331=y
634-
CONFIG_FB_TFT_SSD1351=y
635-
CONFIG_FB_TFT_ST7735R=y
636-
CONFIG_FB_TFT_ST7789V=y
637-
CONFIG_FB_TFT_TINYLCD=y
638-
CONFIG_FB_TFT_TLS8204=y
639-
CONFIG_FB_TFT_UC1701=y
640-
CONFIG_FB_TFT_UPD161704=y
641-
CONFIG_FB_TFT_WATTEROTT=y
642616
CONFIG_FB_FLEX=y
643617
CONFIG_FB_TFT_FBTFT_DEVICE=y
644618
CONFIG_SENSORS_ISL29018=y

0 commit comments

Comments
 (0)