Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <1520897374.23626.82.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 13/36] ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux
From:   Ben Hutchings <ben.hutchings@codethink.co.uk>
To:     Adam Ford <aford173@gmail.com>, Tony Lindgren <tony@atomide.com>
Cc:     stable@vger.kernel.org,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        LKML <linux-kernel@vger.kernel.org>
Date:   Mon, 12 Mar 2018 23:29:34 +0000
In-Reply-To: <20180310001807.970379538@linuxfoundation.org>
References: <20180310001807.213987241@linuxfoundation.org>
         <20180310001807.970379538@linuxfoundation.org>
Organization: Codethink Ltd.
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, 2018-03-09 at 16:18 -0800, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> 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 */
> +		>;
> +	};

This is being added under &omap3_pmx_core2, but upstream it was added
under &omap3_pmx_core.  Does that matter?

Ben.

>  };
>  
>  #include "twl4030.dtsi"
> 
> 
> 
-- 
Ben Hutchings
Software Developer, Codethink Ltd.