diff mbox series

ARM: dts: logicpd-som-lv: Fix i2c2 and i2c3 Pin mux

Message ID 20190820121727.3883-1-aford173@gmail.com (mailing list archive)
State New, archived
Headers show
Series ARM: dts: logicpd-som-lv: Fix i2c2 and i2c3 Pin mux | expand

Commit Message

Adam Ford Aug. 20, 2019, 12:17 p.m. UTC 
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: 5fe3c0fa0d54 ("ARM: dts: Add pinmuxing for i2c2 and i2c3
for LogicPD SOM-LV") #4.9+

Signed-off-by: Adam Ford <aford173@gmail.com>

Comments

Adam Ford Aug. 24, 2019, 7:14 p.m. UTC | #1 
On Tue, Aug 20, 2019 at 7:17 AM Adam Ford <aford173@gmail.com> wrote:
>
> 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: 5fe3c0fa0d54 ("ARM: dts: Add pinmuxing for i2c2 and i2c3
> for LogicPD SOM-LV") #4.9+
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
>

Tom,
i noticed this was assigned to Stefano.  I don't know if it matters,
but this board is an omap3 board, and I think he does NXP stuff, so I
am not sure if he's the right custodian.

adam

> diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
> index 5563ee54c960..b56524cc7fe2 100644
> --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
> +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
> @@ -228,6 +228,20 @@
>                 >;
>         };
>
> +       i2c2_pins: pinmux_i2c2_pins {
> +               pinctrl-single,pins = <
> +                       OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)        /* i2c2_scl */
> +                       OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)        /* i2c2_sda */
> +               >;
> +       };
> +
> +       i2c3_pins: pinmux_i2c3_pins {
> +               pinctrl-single,pins = <
> +                       OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)        /* i2c3_scl */
> +                       OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)        /* i2c3_sda */
> +               >;
> +       };
> +
>         tsc2004_pins: pinmux_tsc2004_pins {
>                 pinctrl-single,pins = <
>                         OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4)        /* mcbsp4_dr.gpio_153 */
> @@ -249,18 +263,6 @@
>                         OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)        /* sys_boot1.gpio_3 */
>                 >;
>         };
> -       i2c2_pins: pinmux_i2c2_pins {
> -               pinctrl-single,pins = <
> -                       OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)        /* i2c2_scl */
> -                       OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)        /* i2c2_sda */
> -               >;
> -       };
> -       i2c3_pins: pinmux_i2c3_pins {
> -               pinctrl-single,pins = <
> -                       OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)        /* i2c3_scl */
> -                       OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)        /* i2c3_sda */
> -               >;
> -       };
>  };
>
>  &omap3_pmx_core2 {
> --
> 2.17.1
>
Tom Rini Aug. 26, 2019, 2:56 p.m. UTC | #2 
On Sat, Aug 24, 2019 at 02:14:36PM -0500, Adam Ford wrote:
> On Tue, Aug 20, 2019 at 7:17 AM Adam Ford <aford173@gmail.com> wrote:
> >
> > 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: 5fe3c0fa0d54 ("ARM: dts: Add pinmuxing for i2c2 and i2c3
> > for LogicPD SOM-LV") #4.9+
> >
> > Signed-off-by: Adam Ford <aford173@gmail.com>
> >
> 
> Tom,
> i noticed this was assigned to Stefano.  I don't know if it matters,
> but this board is an omap3 board, and I think he does NXP stuff, so I
> am not sure if he's the right custodian.

Ah, oops, thanks!
Tony Lindgren Sept. 6, 2019, 4:28 p.m. UTC | #3 
* Adam Ford <aford173@gmail.com> [190820 05:18]:
> 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: 5fe3c0fa0d54 ("ARM: dts: Add pinmuxing for i2c2 and i2c3
> for LogicPD SOM-LV") #4.9+

Applying into fixes thanks.

Tony
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
index 5563ee54c960..b56524cc7fe2 100644
--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
@@ -228,6 +228,20 @@ 
 		>;
 	};
 
+	i2c2_pins: pinmux_i2c2_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */
+			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */
+		>;
+	};
+
+	i2c3_pins: pinmux_i2c3_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */
+			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */
+		>;
+	};
+
 	tsc2004_pins: pinmux_tsc2004_pins {
 		pinctrl-single,pins = <
 			OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4)	/* mcbsp4_dr.gpio_153 */
@@ -249,18 +263,6 @@ 
 			OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)	/* sys_boot1.gpio_3 */
 		>;
 	};
-	i2c2_pins: pinmux_i2c2_pins {
-		pinctrl-single,pins = <
-			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */
-			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */
-		>;
-	};
-	i2c3_pins: pinmux_i2c3_pins {
-		pinctrl-single,pins = <
-			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */
-			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */
-		>;
-	};
 };
 
 &omap3_pmx_core2 {