Merge branch 'CR_2861_vf2_ts_515_changhuang.liang' into 'vf2-515-devel'

CR_2861_vf2_ts_515_changhuang.liang riscv: dts: starfive: Add touchscreen node support

See merge request sbc/linux!52

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
index 99ed2a6..0df37ad 100755 (executable)
--- 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 9f98846..d1c1213 100755 (executable)
--- 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