5.10-stable patches

added patches:
	arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch
	arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch
	arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch

diff --git a/queue-5.10/arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch b/queue-5.10/arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch
new file mode 100644 (file)
index 0000000..8948964
--- /dev/null
+++ b/queue-5.10/arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch
@@ -0,0 +1,48 @@
+From 8e6ecbfd44b5542a7598c1c5fc9c6dcb5d367f2a Mon Sep 17 00:00:00 2001
+From: Eugen Hristev <eugen.hristev@collabora.com>
+Date: Mon, 14 Aug 2023 09:50:42 +0300
+Subject: arm64: dts: mediatek: mt7622: fix memory node warning check
+
+From: Eugen Hristev <eugen.hristev@collabora.com>
+
+commit 8e6ecbfd44b5542a7598c1c5fc9c6dcb5d367f2a upstream.
+
+dtbs_check throws a warning at the memory node:
+Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name
+
+fix by adding the address into the node name.
+
+Cc: stable@vger.kernel.org
+Fixes: 0b6286dd96c0 ("arm64: dts: mt7622: add bananapi BPI-R64 board")
+Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Link: https://lore.kernel.org/r/20230814065042.4973-1-eugen.hristev@collabora.com
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts |    2 +-
+ arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts             |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+@@ -69,7 +69,7 @@
+               };
+       };
+ 
+-      memory {
++      memory@40000000 {
+               reg = <0 0x40000000 0 0x40000000>;
+       };
+ 
+--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+@@ -55,7 +55,7 @@
+               };
+       };
+ 
+-      memory {
++      memory@40000000 {
+               reg = <0 0x40000000 0 0x20000000>;
+       };
+ 

diff --git a/queue-5.10/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch b/queue-5.10/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch
new file mode 100644 (file)
index 0000000..df66a0b
--- /dev/null
+++ b/queue-5.10/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch
@@ -0,0 +1,42 @@
+From 24165c5dad7ba7c7624d05575a5e0cc851396c71 Mon Sep 17 00:00:00 2001
+From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Date: Wed, 25 Oct 2023 11:38:15 +0200
+Subject: arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names
+
+From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+
+commit 24165c5dad7ba7c7624d05575a5e0cc851396c71 upstream.
+
+Fix a unit_address_vs_reg warning for the USB VBUS fixed regulators
+by renaming the regulator nodes from regulator@{0,1} to regulator-usb-p0
+and regulator-usb-p1.
+
+Cc: stable@vger.kernel.org
+Fixes: c0891284a74a ("arm64: dts: mediatek: add USB3 DRD driver")
+Link: https://lore.kernel.org/r/20231025093816.44327-8-angelogioacchino.delregno@collabora.com
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/mediatek/mt8173-evb.dts |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
++++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+@@ -43,7 +43,7 @@
+               id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
+       };
+ 
+-      usb_p1_vbus: regulator@0 {
++      usb_p1_vbus: regulator-usb-p1 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb_vbus";
+               regulator-min-microvolt = <5000000>;
+@@ -52,7 +52,7 @@
+               enable-active-high;
+       };
+ 
+-      usb_p0_vbus: regulator@1 {
++      usb_p0_vbus: regulator-usb-p0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vbus";
+               regulator-min-microvolt = <5000000>;

diff --git a/queue-5.10/arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch b/queue-5.10/arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch
new file mode 100644 (file)
index 0000000..83726c7
--- /dev/null
+++ b/queue-5.10/arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch
@@ -0,0 +1,45 @@
+From 19cba9a6c071db57888dc6b2ec1d9bf8996ea681 Mon Sep 17 00:00:00 2001
+From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Date: Wed, 25 Oct 2023 11:38:13 +0200
+Subject: arm64: dts: mediatek: mt8183: Fix unit address for scp reserved memory
+
+From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+
+commit 19cba9a6c071db57888dc6b2ec1d9bf8996ea681 upstream.
+
+The reserved memory for scp had node name "scp_mem_region" and also
+without unit-address: change the name to "memory@(address)".
+This fixes a unit_address_vs_reg warning.
+
+Cc: stable@vger.kernel.org
+Fixes: 1652dbf7363a ("arm64: dts: mt8183: add scp node")
+Link: https://lore.kernel.org/r/20231025093816.44327-6-angelogioacchino.delregno@collabora.com
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/mediatek/mt8183-evb.dts    |    2 +-
+ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
++++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
+@@ -30,7 +30,7 @@
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+-              scp_mem_reserved: scp_mem_region {
++              scp_mem_reserved: memory@50000000 {
+                       compatible = "shared-dma-pool";
+                       reg = <0 0x50000000 0 0x2900000>;
+                       no-map;
+--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+@@ -95,7 +95,7 @@
+               #size-cells = <2>;
+               ranges;
+ 
+-              scp_mem_reserved: scp_mem_region {
++              scp_mem_reserved: memory@50000000 {
+                       compatible = "shared-dma-pool";
+                       reg = <0 0x50000000 0 0x2900000>;
+                       no-map;

diff --git a/queue-5.10/series b/queue-5.10/series
index c49579295423345926b80c965686a0892950592d..4ff25d8d0483455d99441fbc9aaf6740bbfe7eb0 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -54,3 +54,6 @@ tracing-disable-snapshot-buffer-when-stopping-instance-tracers.patch
 tracing-fix-incomplete-locking-when-disabling-buffered-events.patch
 tracing-fix-a-possible-race-when-disabling-buffered-events.patch
 packet-move-reference-count-in-packet_sock-to-atomic_long_t.patch
+arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch
+arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch
+arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch