summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorCarl Frederik Werner <frederik@cfbw.eu>2015-09-02 04:07:57 +0300
committerSasha Levin <sasha.levin@oracle.com>2015-10-28 05:13:04 +0300
commitf2895fb34aa0c955bf2590c8d36e22ec9fb0c043 (patch)
tree673cadea711737da125029f1dc5b44c12ca741ee /arch/arm
parent5dbe39d03864ebee88fa608d523c572dda91a9d6 (diff)
downloadlinux-f2895fb34aa0c955bf2590c8d36e22ec9fb0c043.tar.xz
ARM: dts: omap3-beagle: make i2c3, ddc and tfp410 gpio work again
[ Upstream commit 3a2fa775bd1d0579113666c1a2e37654a34018a0 ] Let's fix pinmux address of gpio 170 used by tfp410 powerdown-gpio. According to the OMAP35x Technical Reference Manual CONTROL_PADCONF_I2C3_SDA[15:0] 0x480021C4 mode0: i2c3_sda CONTROL_PADCONF_I2C3_SDA[31:16] 0x480021C4 mode4: gpio_170 the pinmux address of gpio 170 must be 0x480021C6. The former wrong address broke i2c3 (used by hdmi ddc), resulting in kernel message: omap_i2c 48060000.i2c: controller timed out Fixes: 8cecf52befd7 ("ARM: omap3-beagle.dts: add display information") Cc: stable@vger.kernel.org # v3.15+ Signed-off-by: Carl Frederik Werner <frederik@cfbw.eu> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index a9aae88b74f5..bd603aa2cd82 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -176,7 +176,7 @@
tfp410_pins: pinmux_tfp410_pins {
pinctrl-single,pins = <
- 0x194 (PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */
+ 0x196 (PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */
>;
};