Skip to contentSkip to conversation

Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree

PATCH [email protected] 3 participants 5 messages Mar 19, 2018 – Apr 17, 2018 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 74402055a2d3ec998a1ded599e86185a27d9bbf4 Mon Sep 17 00:00:00 2001

From: Adam Ford <[email protected]>
Date: Thu, 25 Jan 2018 14:10:37 -0600
Subject: ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

From: Adam Ford <[email protected]>

commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream.

The pinmuxing was missing for I2C1 which was causing intermittent issues with the PMIC which is connected to I2C1. The bootloader did not quite configure the I2C1 either, so when running at 2.6MHz, it was generating errors at time.

This correctly sets the I2C1 pinmuxing so it can operate at 2.6MHz

Fixes 687c27676151 ("ARM: dts: Add minimal support for LogicPD Torpedo

DM3730 devkit")

---
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/logicpd-torpedo-som.dtsi +8 -0
@@ -90,6 +90,8 @@
 };
 
 &i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins>;
 	clock-frequency = <2600000>;
 
 	twl: twl@48 {
@@ -137,6 +139,12 @@
 			OMAP3_CORE1_IOPAD(0x218e, PIN_OUTPUT | MUX_MODE4)	/* mcbsp1_fsr.gpio_157 */
 		>;
 	};
+	i2c1_pins: pinmux_i2c1_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */
+			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
+		>;
+	};
 };
 
 &omap3_pmx_core2 {

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch

#1 lore raw
Quoted 8 lines · On Mon, Mar 19, 2018 at 4:27 PM, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 6 lines

The filename of the patch is:
arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

This commit was reverted in 4.4.122:
8d02a5519885 Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"

Is this a mistake that it came back again?

...Juerg

Quoted 56 lines

From 74402055a2d3ec998a1ded599e86185a27d9bbf4 Mon Sep 17 00:00:00 2001
From: Adam Ford <[email protected]>
Date: Thu, 25 Jan 2018 14:10:37 -0600
Subject: ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

From: Adam Ford <[email protected]>

commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream.

The pinmuxing was missing for I2C1 which was causing intermittent issues with the PMIC which is connected to I2C1. The bootloader did not quite configure the I2C1 either, so when running at 2.6MHz, it was generating errors at time.

This correctly sets the I2C1 pinmuxing so it can operate at 2.6MHz

Fixes 687c27676151 ("ARM: dts: Add minimal support for LogicPD Torpedo

DM3730 devkit")

---
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/logicpd-torpedo-som.dtsi +8 -0
@@ -90,6 +90,8 @@
 };
 
 &i2c1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c1_pins>;
        clock-frequency = <2600000>;
 
        twl: twl@48 {
@@ -137,6 +139,12 @@
                        OMAP3_CORE1_IOPAD(0x218e, PIN_OUTPUT | MUX_MODE4)       /* mcbsp1_fsr.gpio_157 */
                >;
        };
+       i2c1_pins: pinmux_i2c1_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */
+                       OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
+               >;
+       };
 };
 
 &omap3_pmx_core2 {

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch

author maintainer
#2 lore raw
Quoted 13 lines · Juerg Haefliger
Quoted 12 lines · On Mon, Mar 19, 2018 at 4:27 PM, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
and it can be found in the queue-4.4 subdirectory.

Quoted 8 lines
Quoted 2 lines

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

This commit was reverted in 4.4.122:
8d02a5519885 Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"

Is this a mistake that it came back again?

It showed up in 4.16-rc4. Should it be reverted again in Linus's tree? If so, please do so and I'll take the revert.

thanks,

greg k-h

A message that is not in the archive (sent off-list or not yet received): CAHCN7xLbRnqfhNKYonj=VZZuNmKdYi8geLJk0Z6=sfNfacAdxQ@mail.gmail.com

#4 lore raw
Quoted 23 lines · Adam Ford
Quoted 19 lines · Greg KH
Quoted 17 lines · Juerg Haefliger
Quoted 14 lines · On Mon, Mar 19, 2018 at 4:27 PM, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

This commit was reverted in 4.4.122:
8d02a5519885 Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"

Is this a mistake that it came back again?

It showed up in 4.16-rc4. Should it be reverted again in Linus's tree? If so, please do so and I'll take the revert.

The first time it went through to 4.4 it was incorrectly associated to omap3_pmx_core2 when it should have been associated to omap3_pmx_core. When it was brought up that the 4.4 backport patch didn't match 4.9 and 4.16, and Greg reverted it. I submitted a second patch with the corrections to specifically fix 4.4.

This looks correct to me for 4.4

adam

Quoted 8 lines
Quoted 6 lines

thanks,

greg k-h

#5 lore raw
Quoted 33 lines · Adam Ford
Quoted 23 lines · Adam Ford
Quoted 19 lines · Greg KH
Quoted 17 lines · Juerg Haefliger
Quoted 14 lines · On Mon, Mar 19, 2018 at 4:27 PM, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

This commit was reverted in 4.4.122:
8d02a5519885 Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"

Is this a mistake that it came back again?

It showed up in 4.16-rc4. Should it be reverted again in Linus's tree? If so, please do so and I'll take the revert.

Quoted 7 lines

The first time it went through to 4.4 it was incorrectly associated to omap3_pmx_core2 when it should have been associated to omap3_pmx_core. When it was brought up that the 4.4 backport patch didn't match 4.9 and 4.16, and Greg reverted it. I submitted a second patch with the corrections to specifically fix 4.4.

This looks correct to me for 4.4

Ah. Thanks for the clarification.

...Juerg

Quoted 9 lines

adam

Quoted 8 lines
Quoted 6 lines

thanks,

greg k-h