3.18-stable patches

added patches:
	revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
	revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
	revert-pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch

diff --git a/queue-3.18/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch b/queue-3.18/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
new file mode 100644 (file)
index 0000000..abba576
--- /dev/null
+++ b/queue-3.18/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
@@ -0,0 +1,33 @@
+From foo@baz Fri Apr  6 10:38:31 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 08:44:12 +0200
+Subject: Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 2d8c5aa6dc436f6fc1c8b6c0feaee4b0f60cdf38 which was
+comit e153db03c6b7a035c797bcdf35262586f003ee93 upstream.
+
+It requires a driver that was not merged until 4.16, so remove it from
+this stable tree as it is pointless.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Andrew F. Davis <afd@ti.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/am335x-pepper.dts |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/am335x-pepper.dts
++++ b/arch/arm/boot/dts/am335x-pepper.dts
+@@ -138,7 +138,7 @@
+ &audio_codec {
+       status = "okay";
+ 
+-      reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
++      gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;
+       AVDD-supply = <&ldo3_reg>;
+       IOVDD-supply = <&ldo3_reg>;
+       DRVDD-supply = <&ldo3_reg>;

diff --git a/queue-3.18/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch b/queue-3.18/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
new file mode 100644 (file)
index 0000000..8138a3e
--- /dev/null
+++ b/queue-3.18/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
@@ -0,0 +1,42 @@
+From foo@baz Fri Apr  6 10:38:31 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 08:57:42 +0200
+Subject: Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 9d8df5594467b6c73c3833b462abe5811fe7295b which was
+commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream.
+
+It requires a driver that was not merged until 4.16, so remove it from
+this stable tree as it is pointless.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Andrew F. Davis <afd@ti.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/omap3-n900.dts |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/omap3-n900.dts
++++ b/arch/arm/boot/dts/omap3-n900.dts
+@@ -435,7 +435,7 @@
+       tlv320aic3x: tlv320aic3x@18 {
+               compatible = "ti,tlv320aic3x";
+               reg = <0x18>;
+-              reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
++              gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
+               ai3x-gpio-func = <
+                       0 /* AIC3X_GPIO1_FUNC_DISABLED */
+                       5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */
+@@ -452,7 +452,7 @@
+       tlv320aic3x_aux: tlv320aic3x@19 {
+               compatible = "ti,tlv320aic3x";
+               reg = <0x19>;
+-              reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
++              gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
+ 
+               AVDD-supply = <&vmmc2>;
+               DRVDD-supply = <&vmmc2>;

diff --git a/queue-3.18/revert-pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch b/queue-3.18/revert-pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch
new file mode 100644 (file)
index 0000000..bfdbc56
--- /dev/null
+++ b/queue-3.18/revert-pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch
@@ -0,0 +1,39 @@
+From foo@baz Fri Apr  6 10:38:31 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 4 Apr 2018 17:26:27 +0200
+Subject: Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 058645e2f0647c85f2bfd577771546d198739fd2 which was
+commit fda78d7a0ead144f4b2cdb582dcba47911f4952c upstream.
+
+The dependancy tree is just too messy here, just drop it from this
+kernel as it's not really needed here.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Prarit Bhargava <prarit@redhat.com>
+Cc: Bjorn Helgaas <bhelgaas@google.com>
+Cc: Alex Williamson <alex.williamson@redhat.com>
+Cc: David Arcari <darcari@redhat.com>
+Cc: Myron Stowe <mstowe@redhat.com>
+Cc: Lukas Wunner <lukas@wunner.de>
+Cc: Keith Busch <keith.busch@intel.com>
+Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pci/pci-driver.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/pci/pci-driver.c
++++ b/drivers/pci/pci-driver.c
+@@ -450,6 +450,8 @@ static void pci_device_shutdown(struct d
+ 
+       if (drv && drv->shutdown)
+               drv->shutdown(pci_dev);
++      pci_msi_shutdown(pci_dev);
++      pci_msix_shutdown(pci_dev);
+ 
+ #ifdef CONFIG_KEXEC
+       /*

diff --git a/queue-3.18/series b/queue-3.18/series
index c05ae94d8f41cd7574a5053fe3a9dda07d612b4c..2ab625ad1b980519a3e8f8654e084062ff3417ef 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -88,3 +88,6 @@ vt-change-sgr-21-to-follow-the-standards.patch
 documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch
 arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch
 md-raid10-reset-the-first-at-the-end-of-loop.patch
+revert-pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch
+revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
+revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch