4.9-stable patches

added patches:
	arm-dts-logicpd-torpedo-fix-camera-pin-mux.patch
	arm-dts-omap3-logicpd-torpedo-37xx-devkit-fix-mmc1-cd-gpio.patch

diff --git a/queue-4.9/arm-dts-logicpd-torpedo-fix-camera-pin-mux.patch b/queue-4.9/arm-dts-logicpd-torpedo-fix-camera-pin-mux.patch
new file mode 100644 (file)
index 0000000..f8d0a01
--- /dev/null
+++ b/queue-4.9/arm-dts-logicpd-torpedo-fix-camera-pin-mux.patch
@@ -0,0 +1,37 @@
+From 56322e123235370f1449c7444e311cce857d12f5 Mon Sep 17 00:00:00 2001
+From: Adam Ford <aford173@gmail.com>
+Date: Thu, 11 May 2017 12:21:19 -0500
+Subject: ARM: dts: LogicPD Torpedo: Fix camera pin mux
+
+From: Adam Ford <aford173@gmail.com>
+
+commit 56322e123235370f1449c7444e311cce857d12f5 upstream.
+
+Fix commit 05c4ffc3a266 ("ARM: dts: LogicPD Torpedo: Add MT9P031 Support")
+In the previous commit, I indicated that the only testing was done by
+showing the camera showed up when probing.  This patch fixes an incorrect
+pin muxing on cam_d0, cam_d1 and cam_d2.
+
+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-37xx-devkit.dts |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
++++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+@@ -249,9 +249,9 @@
+                       OMAP3_CORE1_IOPAD(0x2110, PIN_INPUT | MUX_MODE0)   /* cam_xclka.cam_xclka */
+                       OMAP3_CORE1_IOPAD(0x2112, PIN_INPUT | MUX_MODE0)   /* cam_pclk.cam_pclk */
+ 
+-                      OMAP3_CORE1_IOPAD(0x2114, PIN_INPUT | MUX_MODE0)   /* cam_d0.cam_d0 */
+-                      OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0)   /* cam_d1.cam_d1 */
+-                      OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0)   /* cam_d2.cam_d2 */
++                      OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0)   /* cam_d0.cam_d0 */
++                      OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0)   /* cam_d1.cam_d1 */
++                      OMAP3_CORE1_IOPAD(0x211a, PIN_INPUT | MUX_MODE0)   /* cam_d2.cam_d2 */
+                       OMAP3_CORE1_IOPAD(0x211c, PIN_INPUT | MUX_MODE0)   /* cam_d3.cam_d3 */
+                       OMAP3_CORE1_IOPAD(0x211e, PIN_INPUT | MUX_MODE0)   /* cam_d4.cam_d4 */
+                       OMAP3_CORE1_IOPAD(0x2120, PIN_INPUT | MUX_MODE0)   /* cam_d5.cam_d5 */

diff --git a/queue-4.9/arm-dts-omap3-logicpd-torpedo-37xx-devkit-fix-mmc1-cd-gpio.patch b/queue-4.9/arm-dts-omap3-logicpd-torpedo-37xx-devkit-fix-mmc1-cd-gpio.patch
new file mode 100644 (file)
index 0000000..9d8435e
--- /dev/null
+++ b/queue-4.9/arm-dts-omap3-logicpd-torpedo-37xx-devkit-fix-mmc1-cd-gpio.patch
@@ -0,0 +1,34 @@
+From b7ace5ed8867ca54503727988adec6b20af54eeb Mon Sep 17 00:00:00 2001
+From: Adam Ford <aford173@gmail.com>
+Date: Thu, 17 Aug 2017 06:01:28 -0500
+Subject: ARM: dts: omap3: logicpd-torpedo-37xx-devkit: Fix MMC1 cd-gpio
+
+From: Adam Ford <aford173@gmail.com>
+
+commit b7ace5ed8867ca54503727988adec6b20af54eeb upstream.
+
+Fixes commit 687c27676151 ("ARM: dts: Add minimal support for LogicPD
+Torpedo DM3730 devkit")
+
+This patch corrects an issue where the cd-gpios was improperly setup
+using IRQ_TYPE_LEVEL_LOW instead of GPIO_ACTIVE_LOW.
+
+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-37xx-devkit.dts |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
++++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+@@ -192,7 +192,7 @@
+       interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins &mmc1_cd>;
+-      cd-gpios = <&gpio4 31 IRQ_TYPE_LEVEL_LOW>;              /* gpio127 */
++      cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>;         /* gpio127 */
+       vmmc-supply = <&vmmc1>;
+       bus-width = <4>;
+       cap-power-off-card;

diff --git a/queue-4.9/series b/queue-4.9/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7066743a9541a18d5758d1b60e2e5b6d58e71096 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -0,0 +1,2 @@
+arm-dts-logicpd-torpedo-fix-camera-pin-mux.patch
+arm-dts-omap3-logicpd-torpedo-37xx-devkit-fix-mmc1-cd-gpio.patch