stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree
@ 2018-03-19 15:27 gregkh
  2018-04-17  8:52 ` Juerg Haefliger
  0 siblings, 1 reply; 6+ messages in thread
From: gregkh @ 2018-03-19 15:27 UTC (permalink / raw)
  To: aford173, gregkh, tony; +Cc: stable, stable-commits


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 <stable@vger.kernel.org> know about it.


>From 74402055a2d3ec998a1ded599e86185a27d9bbf4 Mon Sep 17 00:00:00 2001
From: Adam Ford <aford173@gmail.com>
Date: Thu, 25 Jan 2018 14:10:37 -0600
Subject: ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

From: Adam Ford <aford173@gmail.com>

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")

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -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 aford173@gmail.com are

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree
  2018-03-19 15:27 Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree gregkh
@ 2018-04-17  8:52 ` Juerg Haefliger
  2018-04-17 10:24   ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Juerg Haefliger @ 2018-04-17  8:52 UTC (permalink / raw)
  To: gregkh; +Cc: aford173, tony, stable, stable-commits

On Mon, Mar 19, 2018 at 4:27 PM,  <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org> 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



> From 74402055a2d3ec998a1ded599e86185a27d9bbf4 Mon Sep 17 00:00:00 2001
> From: Adam Ford <aford173@gmail.com>
> Date: Thu, 25 Jan 2018 14:10:37 -0600
> Subject: ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux
>
> From: Adam Ford <aford173@gmail.com>
>
> 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")
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>  arch/arm/boot/dts/logicpd-torpedo-som.dtsi |    8 ++++++++
>  1 file changed, 8 insertions(+)
>
> --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
> +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
> @@ -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 aford173@gmail.com are
>
> queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree
  2018-04-17  8:52 ` Juerg Haefliger
@ 2018-04-17 10:24   ` Greg KH
       [not found]     ` <CAHCN7xLbRnqfhNKYonj=VZZuNmKdYi8geLJk0Z6=sfNfacAdxQ@mail.gmail.com>
  0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2018-04-17 10:24 UTC (permalink / raw)
  To: Juerg Haefliger; +Cc: aford173, tony, stable, stable-commits

On Tue, Apr 17, 2018 at 10:52:34AM +0200, Juerg Haefliger wrote:
> On Mon, Mar 19, 2018 at 4:27 PM,  <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree
       [not found]     ` <CAHCN7xLbRnqfhNKYonj=VZZuNmKdYi8geLJk0Z6=sfNfacAdxQ@mail.gmail.com>
@ 2018-04-17 11:27       ` Adam Ford
  2018-04-17 11:51         ` Juerg Haefliger
  0 siblings, 1 reply; 6+ messages in thread
From: Adam Ford @ 2018-04-17 11:27 UTC (permalink / raw)
  To: Greg KH; +Cc: Juerg Haefliger, Tony Lindgren, stable, stable-commits

On Tue, Apr 17, 2018 at 6:25 AM, Adam Ford <aford173@gmail.com> wrote:
>
>
>
> On Tue, Apr 17, 2018 at 5:24 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
>>
>> On Tue, Apr 17, 2018 at 10:52:34AM +0200, Juerg Haefliger wrote:
>> > On Mon, Mar 19, 2018 at 4:27 PM,  <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org> 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.
>>

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
>
>
>>
>> thanks,
>>
>> greg k-h
>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree
  2018-04-17 11:27       ` Adam Ford
@ 2018-04-17 11:51         ` Juerg Haefliger
  0 siblings, 0 replies; 6+ messages in thread
From: Juerg Haefliger @ 2018-04-17 11:51 UTC (permalink / raw)
  To: Adam Ford; +Cc: Greg KH, Tony Lindgren, stable, stable-commits

On Tue, Apr 17, 2018 at 1:27 PM, Adam Ford <aford173@gmail.com> wrote:
> On Tue, Apr 17, 2018 at 6:25 AM, Adam Ford <aford173@gmail.com> wrote:
>>
>>
>>
>> On Tue, Apr 17, 2018 at 5:24 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
>>>
>>> On Tue, Apr 17, 2018 at 10:52:34AM +0200, Juerg Haefliger wrote:
>>> > On Mon, Mar 19, 2018 at 4:27 PM,  <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org> 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.
>>>
>
> 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


> adam
>>
>>
>>>
>>> thanks,
>>>
>>> greg k-h
>>
>>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree
@ 2018-03-07 17:36 gregkh
  0 siblings, 0 replies; 6+ messages in thread
From: gregkh @ 2018-03-07 17:36 UTC (permalink / raw)
  To: aford173, gregkh, tony; +Cc: stable, stable-commits


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 <stable@vger.kernel.org> know about it.


>From 74402055a2d3ec998a1ded599e86185a27d9bbf4 Mon Sep 17 00:00:00 2001
From: Adam Ford <aford173@gmail.com>
Date: Thu, 25 Jan 2018 14:10:37 -0600
Subject: ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux

From: Adam Ford <aford173@gmail.com>

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")

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -90,6 +90,8 @@
 };
 
 &i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins>;
 	clock-frequency = <2600000>;
 
 	twl: twl@48 {
@@ -146,6 +148,12 @@
 			OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | MUX_MODE2)   /* etk_ctl.sdmmc3_cmd */
 		>;
 	};
+	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 */
+		>;
+	};
 };
 
 #include "twl4030.dtsi"


Patches currently in stable-queue which might be from aford173@gmail.com are

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-04-17 11:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-19 15:27 Patch "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" has been added to the 4.4-stable tree gregkh
2018-04-17  8:52 ` Juerg Haefliger
2018-04-17 10:24   ` Greg KH
     [not found]     ` <CAHCN7xLbRnqfhNKYonj=VZZuNmKdYi8geLJk0Z6=sfNfacAdxQ@mail.gmail.com>
2018-04-17 11:27       ` Adam Ford
2018-04-17 11:51         ` Juerg Haefliger
  -- strict thread matches above, loose matches on Subject: below --
2018-03-07 17:36 gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).