shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: ux500: Move Synaptics to right include

Browse Source 
The Synaptics RMI4 touchscreen is a property of the
TVK1281618 R2 UIB, so move it into that file instead
of the main TVK1281618 main include so we can define
another touchscreen for the R3 UIB.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2021-03-22 22:33:14 +01:00
parent 2c276eaba3
commit b428648f60
2 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
View File

@@ -65,7 +65,25 @@
};
i2c@80110000 {
synaptics@4b {
/* Synaptics RMI4 TM1217 touchscreen */
compatible = "syna,rmi4-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x4b>;
vdd-supply = <&ab8500_ldo_aux1_reg>;
vddio-supply = <&db8500_vsmps2_reg>;
pinctrl-names = "default";
pinctrl-0 = <&synaptics_tvk_mode>;
interrupt-parent = <&gpio2>;
interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
rmi4-f01@1 {
reg = <0x1>;
syna,nosleep = <1>;
};
rmi4-f11@11 {
reg = <0x11>;
syna,sensor-type = <1>;
/* This is a landscape display */
touchscreen-swapped-x-y;
};
@@ -83,5 +101,16 @@
};
};
};
pinctrl {
synaptics {
synaptics_tvk_mode: synaptics_tvk {
/* Touchscreen uses GPIO 84 */
tvk_cfg1 {
pins = "GPIO84_C2";
ste,config = <&gpio_in_pu>;
};
};
};
};
};
};

34
arch/arm/boot/dts/ste-href-tvk1281618.dtsi
View File

@@ -125,31 +125,6 @@
};
};
i2c@80110000 {
synaptics@4b {
/* Synaptics RMI4 TM1217 touchscreen */
compatible = "syna,rmi4-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x4b>;
vdd-supply = <&ab8500_ldo_aux1_reg>;
vddio-supply = <&db8500_vsmps2_reg>;
pinctrl-names = "default";
pinctrl-0 = <&synaptics_tvk_mode>;
interrupt-parent = <&gpio2>;
interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
rmi4-f01@1 {
reg = <0x1>;
syna,nosleep = <1>;
};
rmi4-f11@11 {
reg = <0x11>;
syna,sensor-type = <1>;
};
};
};
pinctrl {
/* Pull up this GPIO pin */
tc35893 {
@@ -203,15 +178,6 @@
};
};
};
synaptics {
synaptics_tvk_mode: synaptics_tvk {
/* Touchscreen uses GPIO 84 */
tvk_cfg1 {
pins = "GPIO84_C2";
ste,config = <&gpio_in_pu>;
};
};
};
};
};
};