projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b0038e
)
ARM: dts: logicpd-som-lv: Fix Touchscreen controller
author
Adam Ford
<aford173@gmail.com>
Mon, 7 May 2018 00:56:29 +0000
(19:56 -0500)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 15 May 2018 18:33:45 +0000
(11:33 -0700)
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 <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/logicpd-som-lv.dtsi
patch
|
blob
|
blame
|
history
diff --git
a/arch/arm/boot/dts/logicpd-som-lv.dtsi
b/arch/arm/boot/dts/logicpd-som-lv.dtsi
index 9e49697c7beed804b03b2d98c178bdacc9ac8848..1ec1a1f5696a8221699766bdb18411e4e1f0deb9 100644
(file)
--- 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>;