5.10-stable patches

added patches:
	arm-dts-spear1340-update-serial-node-properties.patch
	arm-dts-spear13xx-update-spi-dma-properties.patch
	asoc-topology-allow-tlv-control-to-be-either-read-or-write.patch
	um-fix-uml_mconsole-stop-go.patch

diff --git a/queue-5.10/arm-dts-spear1340-update-serial-node-properties.patch b/queue-5.10/arm-dts-spear1340-update-serial-node-properties.patch
new file mode 100644 (file)
index 0000000..4e47315
--- /dev/null
+++ b/queue-5.10/arm-dts-spear1340-update-serial-node-properties.patch
@@ -0,0 +1,37 @@
+From 583d6b0062640def86f3265aa1042ecb6672516e Mon Sep 17 00:00:00 2001
+From: Kuldeep Singh <singh.kuldeep87k@gmail.com>
+Date: Sat, 26 Mar 2022 09:53:10 +0530
+Subject: ARM: dts: spear1340: Update serial node properties
+
+From: Kuldeep Singh <singh.kuldeep87k@gmail.com>
+
+commit 583d6b0062640def86f3265aa1042ecb6672516e upstream.
+
+Reorder dma and dma-names property for serial node to make it compliant
+with bindings.
+
+Fixes: 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
+Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Link: https://lore.kernel.org/r/20220326042313.97862-3-singh.kuldeep87k@gmail.com'
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/spear1340.dtsi |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/spear1340.dtsi
++++ b/arch/arm/boot/dts/spear1340.dtsi
+@@ -136,9 +136,9 @@
+                               reg = <0xb4100000 0x1000>;
+                               interrupts = <0 105 0x4>;
+                               status = "disabled";
+-                              dmas = <&dwdma0 12 0 1>,
+-                                      <&dwdma0 13 1 0>;
+-                              dma-names = "tx", "rx";
++                              dmas = <&dwdma0 13 0 1>,
++                                      <&dwdma0 12 1 0>;
++                              dma-names = "rx", "tx";
+                       };
+ 
+                       thermal@e07008c4 {

diff --git a/queue-5.10/arm-dts-spear13xx-update-spi-dma-properties.patch b/queue-5.10/arm-dts-spear13xx-update-spi-dma-properties.patch
new file mode 100644 (file)
index 0000000..e528d2e
--- /dev/null
+++ b/queue-5.10/arm-dts-spear13xx-update-spi-dma-properties.patch
@@ -0,0 +1,37 @@
+From 31d3687d6017c7ce6061695361598d9cda70807a Mon Sep 17 00:00:00 2001
+From: Kuldeep Singh <singh.kuldeep87k@gmail.com>
+Date: Sat, 26 Mar 2022 09:53:09 +0530
+Subject: ARM: dts: spear13xx: Update SPI dma properties
+
+From: Kuldeep Singh <singh.kuldeep87k@gmail.com>
+
+commit 31d3687d6017c7ce6061695361598d9cda70807a upstream.
+
+Reorder dmas and dma-names property for spi controller node to make it
+compliant with bindings.
+
+Fixes: 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
+Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Link: https://lore.kernel.org/r/20220326042313.97862-2-singh.kuldeep87k@gmail.com'
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/spear13xx.dtsi |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/spear13xx.dtsi
++++ b/arch/arm/boot/dts/spear13xx.dtsi
+@@ -284,9 +284,9 @@
+                               #size-cells = <0>;
+                               interrupts = <0 31 0x4>;
+                               status = "disabled";
+-                              dmas = <&dwdma0 4 0 0>,
+-                                      <&dwdma0 5 0 0>;
+-                              dma-names = "tx", "rx";
++                              dmas = <&dwdma0 5 0 0>,
++                                      <&dwdma0 4 0 0>;
++                              dma-names = "rx", "tx";
+                       };
+ 
+                       rtc@e0580000 {

diff --git a/queue-5.10/asoc-topology-allow-tlv-control-to-be-either-read-or-write.patch b/queue-5.10/asoc-topology-allow-tlv-control-to-be-either-read-or-write.patch
new file mode 100644 (file)
index 0000000..af8cf84
--- /dev/null
+++ b/queue-5.10/asoc-topology-allow-tlv-control-to-be-either-read-or-write.patch
@@ -0,0 +1,44 @@
+From feb00b736af64875560f371fe7f58b0b7f239046 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?=
+ <amadeuszx.slawinski@linux.intel.com>
+Date: Wed, 12 Jan 2022 18:00:29 +0100
+Subject: ASoC: topology: Allow TLV control to be either read or write
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
+
+commit feb00b736af64875560f371fe7f58b0b7f239046 upstream.
+
+There is no reason to force readwrite access on TLV controls. It can be
+either read, write or both. This is further evidenced in code where it
+performs following checks:
+                if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ) && !sbe->get)
+                        return -EINVAL;
+                if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) && !sbe->put)
+                        return -EINVAL;
+
+Fixes: 1a3232d2f61d ("ASoC: topology: Add support for TLV bytes controls")
+Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
+Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
+Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20220112170030.569712-3-amadeuszx.slawinski@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/soc-topology.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/soc/soc-topology.c
++++ b/sound/soc/soc-topology.c
+@@ -578,7 +578,8 @@ static int soc_tplg_kcontrol_bind_io(str
+ 
+       if (le32_to_cpu(hdr->ops.info) == SND_SOC_TPLG_CTL_BYTES
+               && k->iface & SNDRV_CTL_ELEM_IFACE_MIXER
+-              && k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE
++              && (k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ
++                  || k->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
+               && k->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
+               struct soc_bytes_ext *sbe;
+               struct snd_soc_tplg_bytes_control *be;

diff --git a/queue-5.10/series b/queue-5.10/series
index e84176f0308e9fc52d2b66fa6c3f4d2eb462f055..c872a30e8f0ed98e8e5cab1566bbbb58a8e65158 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -583,3 +583,7 @@ dt-bindings-mtd-nand-controller-fix-the-reg-property-description.patch
 dt-bindings-mtd-nand-controller-fix-a-comment-in-the-examples.patch
 dt-bindings-spi-mxic-the-interrupt-property-is-not-mandatory.patch
 ubi-fastmap-return-error-code-if-memory-allocation-fails-in-add_aeb.patch
+asoc-topology-allow-tlv-control-to-be-either-read-or-write.patch
+arm-dts-spear1340-update-serial-node-properties.patch
+arm-dts-spear13xx-update-spi-dma-properties.patch
+um-fix-uml_mconsole-stop-go.patch

diff --git a/queue-5.10/um-fix-uml_mconsole-stop-go.patch b/queue-5.10/um-fix-uml_mconsole-stop-go.patch
new file mode 100644 (file)
index 0000000..1bc4413
--- /dev/null
+++ b/queue-5.10/um-fix-uml_mconsole-stop-go.patch
@@ -0,0 +1,39 @@
+From 1a3a6a2a035bb6c3a7ef4c788d8fd69a7b2d6284 Mon Sep 17 00:00:00 2001
+From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
+Date: Tue, 22 Feb 2022 12:44:10 +0000
+Subject: um: Fix uml_mconsole stop/go
+
+From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
+
+commit 1a3a6a2a035bb6c3a7ef4c788d8fd69a7b2d6284 upstream.
+
+Moving to an EPOLL based IRQ controller broke uml_mconsole stop/go
+commands. This fixes it and restores stop/go functionality.
+
+Fixes: ff6a17989c08 ("Epoll based IRQ controller")
+Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/um/drivers/mconsole_kern.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/um/drivers/mconsole_kern.c
++++ b/arch/um/drivers/mconsole_kern.c
+@@ -223,7 +223,7 @@ void mconsole_go(struct mc_request *req)
+ 
+ void mconsole_stop(struct mc_request *req)
+ {
+-      deactivate_fd(req->originating_fd, MCONSOLE_IRQ);
++      block_signals();
+       os_set_fd_block(req->originating_fd, 1);
+       mconsole_reply(req, "stopped", 0, 0);
+       for (;;) {
+@@ -246,6 +246,7 @@ void mconsole_stop(struct mc_request *re
+       }
+       os_set_fd_block(req->originating_fd, 0);
+       mconsole_reply(req, "", 0, 0);
++      unblock_signals();
+ }
+ 
+ static DEFINE_SPINLOCK(mc_devices_lock);