Commit b428648f authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: ux500: Move Synaptics to right include 



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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2c276eab

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

+29 −0
Original line number Diff line number Diff line
@@ -65,7 +65,25 @@ lis331dl@1c { 
		};

		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 @@ panel { 
				};

			};

		};

		pinctrl {

			synaptics {

				synaptics_tvk_mode: synaptics_tvk {

					/* Touchscreen uses GPIO 84 */

					tvk_cfg1 {

						pins = "GPIO84_C2";

						ste,config = <&gpio_in_pu>;

					};

				};

			};

		};

	};

};

arch/arm/boot/dts/ste-href-tvk1281618.dtsi

+0 −34
Original line number Diff line number Diff line
@@ -125,31 +125,6 @@ lsp001wm@5c { 
			};

		};



		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 @@ tvk_cfg2 { 
					};

				};

			};

			synaptics {

				synaptics_tvk_mode: synaptics_tvk {

					/* Touchscreen uses GPIO 84 */

					tvk_cfg1 {

						pins = "GPIO84_C2";

						ste,config = <&gpio_in_pu>;

					};

				};

			};

		};

	};

};