diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2022-12-30 17:15:48 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2022-12-30 17:15:48 +0300 |
| commit | 162a9afb0b009393f4f21ee8c20d773131fd6b1e (patch) | |
| tree | 74d7deb3e58b0cff05591cd3675125491bd2de90 | |
| parent | 61474d9f64dc5db0edef4e005c1f8c0810b21240 (diff) | |
| parent | ec9b5352bd66a554c4c94c6cf529fff8ded1cc33 (diff) | |
| download | linux-VF2_v2.6.0.tar.xz | |
Merge branch 'CR_2861_vf2_ts_515_changhuang.liang' into 'vf2-515-devel'VF2_v2.6.0
CR_2861_vf2_ts_515_changhuang.liang riscv: dts: starfive: Add touchscreen node support
See merge request sbc/linux!52
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi | 5 | ||||
| -rwxr-xr-x | arch/riscv/configs/starfive_visionfive2_defconfig | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi index 99ed2a64141c..0df37ad0175c 100755 --- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi @@ -406,6 +406,11 @@ }; }; + tinker_ft5406: tinker_ft5406@38 { + compatible = "tinker_ft5406"; + reg = <0x38>; + }; + panel_radxa@19 { compatible ="starfive_jadard"; reg = <0x19>; diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig index 9f988469b489..d1c121301f1b 100755 --- a/arch/riscv/configs/starfive_visionfive2_defconfig +++ b/arch/riscv/configs/starfive_visionfive2_defconfig @@ -152,6 +152,8 @@ CONFIG_USB_WIFI_ECR6600U=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_TINKER_FT5406=y CONFIG_SERIO_LIBPS2=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y |