From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 16 Mar 2018 12:44:50 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v3.18.100~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=079cb596462423062fb7be64e710fe03d9d1c1ca;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

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

diff --git a/queue-4.4/revert-arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch b/queue-4.4/revert-arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
new file mode 100644
index 00000000000..a101ab599d6
--- /dev/null
+++ b/queue-4.4/revert-arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
@@ -0,0 +1,46 @@
+From 669f2dc901fbac917e494d392cfcc0b8db764947 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 16 Mar 2018 13:39:47 +0100
+Subject: Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit c86bfc7b7b01c4b98c29a39bd60e61fa8e337ebf which was
+commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream.
+
+The backport merged incorrectly, so I'm dropping it.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Adam Ford <aford173@gmail.com>
+Cc: 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 deletions(-)
+
+--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
++++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+@@ -90,8 +90,6 @@
+ };
+ 
+ &i2c1 {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&i2c1_pins>;
+ 	clock-frequency = <2600000>;
+ 
+ 	twl: twl@48 {
+@@ -148,12 +146,6 @@
+ 			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"
diff --git a/queue-4.4/series b/queue-4.4/series
index b9a0f7fcd3d..cb67b0da1b9 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -46,3 +46,4 @@ ext4-inplace-xattr-block-update-fails-to-deduplicate-blocks.patch
 ubi-fix-race-condition-between-ubi-volume-creation-and-udev.patch
 scsi-qla2xxx-replace-fcport-alloc-with-qla2x00_alloc_fcport.patch
 nfs-fix-an-incorrect-type-in-struct-nfs_direct_req.patch
+revert-arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch