Skip to content

Commit

Permalink
Add WaveShare 3.2 touch screen
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yc hou authored and scorpiochang committed Aug 15, 2017
1 parent 26a39a0 commit ea22619
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 26 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/Makefile
Expand Up @@ -3,6 +3,7 @@
dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
hifiberry-dac-amp.dtbo \
waveshare35a-tinker.dtbo \
waveshare32b-tinker.dtbo \

targets += dtbs dtbs_install
targets += $(dtbo-y)
Expand Down
70 changes: 70 additions & 0 deletions arch/arm/boot/dts/overlays/waveshare32b-tinker-overlay.dts
@@ -0,0 +1,70 @@
/dts-v1/;
/plugin/;

/ {
compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";

fragment@0 {
target = <&spi2>;

__overlay__ {
status = "okay";

spidev@0 {
status = "disabled";
};

spidev@1 {
status = "disabled";
};
};
};

fragment@1 {
target = <&gpio5>;

__overlay__ {
waveshare32b_pins: waveshare32b_pins {
rockchip,pins = <5 12 0 &pcfg_pull_none>,
<5 14 0 &pcfg_pull_none>,
<5 15 0 &pcfg_pull_none>;
};
};
};

fragment@2 {
target = <&spi2>;

__overlay__ {
#address-cells = <0x1>;
#size-cells = <0x0>;

waveshare32b@0 {
compatible = "ilitek,ili9340";
reg = <0>;
pinctrl-names = "default";
pinctrl-0 = <&waveshare32b_pins>;
spi-max-frequency = <16000000>;
txbuflen = <32768>;
rotate = <270>;
bgr = <0>;
fps = <25>;
buswidth = <8>;
reset-gpios = <&gpio5 14 0>;
dc-gpios = <&gpio5 15 0>;
debug = <0>;
};

waveshare32b-ts@1 {
compatible = "ti,ads7846";
reg = <1>;
spi-max-frequency = <2000000>;
interrupts = <12 2>;
interrupt-parent = <&gpio5>;
pendown-gpio = <&gpio5 12 0>;
ti,x-plate-ohms = /bits/ 16 <60>;/*[00 3c];*/
ti,pressure-max = /bits/ 16 <255>;/*[00 ff];*/
};
};
};
};
26 changes: 0 additions & 26 deletions arch/arm/configs/miniarm-rk3288_defconfig
Expand Up @@ -611,34 +611,8 @@ CONFIG_DMADEVICES=y
CONFIG_PL330_DMA=y
CONFIG_STAGING=y
CONFIG_FB_TFT=y
CONFIG_FB_TFT_AGM1264K_FL=y
CONFIG_FB_TFT_BD663474=y
CONFIG_FB_TFT_HX8340BN=y
CONFIG_FB_TFT_HX8347D=y
CONFIG_FB_TFT_HX8353D=y
CONFIG_FB_TFT_HX8357D=y
CONFIG_FB_TFT_ILI9163=y
CONFIG_FB_TFT_ILI9320=y
CONFIG_FB_TFT_ILI9325=y
CONFIG_FB_TFT_ILI9340=y
CONFIG_FB_TFT_ILI9341=y
CONFIG_FB_TFT_ILI9481=y
CONFIG_FB_TFT_ILI9486=y
CONFIG_FB_TFT_PCD8544=y
CONFIG_FB_TFT_RA8875=y
CONFIG_FB_TFT_S6D02A1=y
CONFIG_FB_TFT_S6D1121=y
CONFIG_FB_TFT_SSD1289=y
CONFIG_FB_TFT_SSD1306=y
CONFIG_FB_TFT_SSD1331=y
CONFIG_FB_TFT_SSD1351=y
CONFIG_FB_TFT_ST7735R=y
CONFIG_FB_TFT_ST7789V=y
CONFIG_FB_TFT_TINYLCD=y
CONFIG_FB_TFT_TLS8204=y
CONFIG_FB_TFT_UC1701=y
CONFIG_FB_TFT_UPD161704=y
CONFIG_FB_TFT_WATTEROTT=y
CONFIG_FB_FLEX=y
CONFIG_FB_TFT_FBTFT_DEVICE=y
CONFIG_SENSORS_ISL29018=y
Expand Down

0 comments on commit ea22619

Please sign in to comment.