Skip to content

Commit fb9e69f

Browse files
aford173kelmously
authored andcommitted
ARM: dts: logicpd-som-lv: Fix i2c2 and i2c3 Pin mux
BugLink: https://bugs.launchpad.net/bugs/1864060 [ Upstream commit a932b77 ] When the pinmux configuration was added, it was accidentally placed into the omap3_pmx_wkup node when it should have been placed into the omap3_pmx_core. This error was accidentally propagated to stable by me when I blindly requested the pull after seeing I2C issues without actually reviewing the content of the pinout. Since the bootloader previously muxed these correctly in the past, was a hidden error. This patch moves the i2c2_pins and i2c3_pins to the correct node which should eliminate i2c bus errors and timeouts due to the fact the bootloader uses the save device tree that no longer properly assigns these pins. Fixes: 5fe3c0f ("ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV") #4.9+ Signed-off-by: Adam Ford <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Khalid Elmously <[email protected]>
1 parent 06b9f82 commit fb9e69f

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

arch/arm/boot/dts/logicpd-som-lv.dtsi

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,20 @@
228228
>;
229229
};
230230

231+
i2c2_pins: pinmux_i2c2_pins {
232+
pinctrl-single,pins = <
233+
OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */
234+
OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */
235+
>;
236+
};
237+
238+
i2c3_pins: pinmux_i2c3_pins {
239+
pinctrl-single,pins = <
240+
OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */
241+
OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */
242+
>;
243+
};
244+
231245
tsc2004_pins: pinmux_tsc2004_pins {
232246
pinctrl-single,pins = <
233247
OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4) /* mcbsp4_dr.gpio_153 */
@@ -249,18 +263,6 @@
249263
OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
250264
>;
251265
};
252-
i2c2_pins: pinmux_i2c2_pins {
253-
pinctrl-single,pins = <
254-
OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */
255-
OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */
256-
>;
257-
};
258-
i2c3_pins: pinmux_i2c3_pins {
259-
pinctrl-single,pins = <
260-
OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */
261-
OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */
262-
>;
263-
};
264266
};
265267

266268
&omap3_pmx_core2 {

0 commit comments

Comments
 (0)