From: Adam Ford Date: Mon, 7 May 2018 00:56:29 +0000 (-0500) Subject: ARM: dts: logicpd-som-lv: Fix Touchscreen controller X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1f9400c1b2e1b7a6403ee830ccf59dae793c936;p=linux.git ARM: dts: logicpd-som-lv: Fix Touchscreen controller The touchscreen patch did not apply to this branch correctly and inadvertently got placed onto I2C2 when it should be on I2C3. This fixes the issue. Fixes: 121685b14624 ("ARM: dts: logicpd-som-lv: Enable Touchscreen controller") Signed-off-by: Adam Ford Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index 9e49697c7beed..1ec1a1f5696a8 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -100,6 +100,12 @@ pinctrl-names = "default"; pinctrl-0 = <&i2c2_pins>; clock-frequency = <400000>; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c3_pins>; + clock-frequency = <400000>; touchscreen: tsc2004@48 { compatible = "ti,tsc2004"; @@ -121,12 +127,6 @@ }; }; -&i2c3 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c3_pins>; - clock-frequency = <400000>; -}; - &mmc3 { interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>; pinctrl-0 = <&mmc3_pins &wl127x_gpio>;