]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 May 2022 15:10:49 +0000 (17:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 May 2022 15:10:49 +0000 (17:10 +0200)
added patches:
dt-bindings-pinctrl-aspeed-g6-remove-fwqspid-group.patch

queue-5.10/dt-bindings-pinctrl-aspeed-g6-remove-fwqspid-group.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/dt-bindings-pinctrl-aspeed-g6-remove-fwqspid-group.patch b/queue-5.10/dt-bindings-pinctrl-aspeed-g6-remove-fwqspid-group.patch
new file mode 100644 (file)
index 0000000..84ec096
--- /dev/null
@@ -0,0 +1,33 @@
+From a29c96a4053dc3c1d39353b61089882f81c6b23d Mon Sep 17 00:00:00 2001
+From: Jae Hyun Yoo <quic_jaehyoo@quicinc.com>
+Date: Tue, 29 Mar 2022 10:39:28 -0700
+Subject: dt-bindings: pinctrl: aspeed-g6: remove FWQSPID group
+
+From: Jae Hyun Yoo <quic_jaehyoo@quicinc.com>
+
+commit a29c96a4053dc3c1d39353b61089882f81c6b23d upstream.
+
+FWQSPID is not a group of FWSPID so remove it.
+
+Fixes: 7488838f2315 ("dt-bindings: pinctrl: aspeed: Document AST2600 pinmux")
+Signed-off-by: Jae Hyun Yoo <quic_jaehyoo@quicinc.com>
+Acked-by: Rob Herring <robh@kernel.org>
+Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
+Link: https://lore.kernel.org/r/20220329173932.2588289-4-quic_jaehyoo@quicinc.com
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml
++++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml
+@@ -58,7 +58,7 @@ patternProperties:
+           $ref: "/schemas/types.yaml#/definitions/string"
+           enum: [ ADC0, ADC1, ADC10, ADC11, ADC12, ADC13, ADC14, ADC15, ADC2,
+                   ADC3, ADC4, ADC5, ADC6, ADC7, ADC8, ADC9, BMCINT, EMMCG1, EMMCG4,
+-                  EMMCG8, ESPI, ESPIALT, FSI1, FSI2, FWSPIABR, FWSPID, FWQSPID, FWSPIWP,
++                  EMMCG8, ESPI, ESPIALT, FSI1, FSI2, FWSPIABR, FWSPID, FWSPIWP,
+                   GPIT0, GPIT1, GPIT2, GPIT3, GPIT4, GPIT5, GPIT6, GPIT7, GPIU0, GPIU1,
+                   GPIU2, GPIU3, GPIU4, GPIU5, GPIU6, GPIU7, HVI3C3, HVI3C4, I2C1, I2C10,
+                   I2C11, I2C12, I2C13, I2C14, I2C15, I2C16, I2C2, I2C3, I2C4, I2C5,
index 74fe9099473b3c3b1e4ab1e7102f79495773ee6f..8366a5c6215f221cda41612d8ac74ffec7b4566c 100644 (file)
@@ -89,5 +89,6 @@ net-atlantic-add-check-for-max_skb_frags.patch
 net-atlantic-verify-hw_head_-lies-within-tx-buffer-r.patch
 arm64-enable-repeat-tlbi-workaround-on-kryo4xx-gold-.patch
 input-ili210x-fix-reset-timing.patch
+dt-bindings-pinctrl-aspeed-g6-remove-fwqspid-group.patch
 i2c-mt7621-fix-missing-clk_disable_unprepare-on-erro.patch
 afs-fix-afs_getattr-to-refetch-file-status-if-callba.patch