From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Mar 2018 15:27:32 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v4.15.12~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=050a8a24eb46445c50688282681d173d6afd4bd2;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
---

diff --git a/queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch b/queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
new file mode 100644
index 00000000000..b7ba67c8dc2
--- /dev/null
+++ b/queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
@@ -0,0 +1,51 @@
+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 {
diff --git a/queue-4.4/series b/queue-4.4/series
index ad421fc7ca6..c81b8a70f18 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -126,3 +126,4 @@ irqchip-gic-v3-its-ensure-nr_ites-nr_lpis.patch
 scsi-sg-fix-sg_dxfer_from_dev-transfers.patch
 scsi-sg-fix-static-checker-warning-in-sg_is_valid_dxfer.patch
 scsi-sg-only-check-for-dxfer_len-greater-than-256m.patch
+arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch