From: Greg Kroah-Hartman Date: Sat, 9 Dec 2023 12:51:33 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v6.6.6~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe0af6db8026b1a5765c1b9a1615271b545929f2;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-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 arm64-dts-mediatek-mt8183-kukui-jacuzzi-fix-dsi-unnecessary-cells-properties.patch --- diff --git a/queue-5.15/arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch b/queue-5.15/arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch new file mode 100644 index 00000000000..89489640f28 --- /dev/null +++ b/queue-5.15/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 +Date: Mon, 14 Aug 2023 09:50:42 +0300 +Subject: arm64: dts: mediatek: mt7622: fix memory node warning check + +From: Eugen Hristev + +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 +Reviewed-by: AngeloGioacchino Del Regno +Link: https://lore.kernel.org/r/20230814065042.4973-1-eugen.hristev@collabora.com +Signed-off-by: AngeloGioacchino Del Regno +Signed-off-by: Greg Kroah-Hartman +--- + 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.15/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch b/queue-5.15/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch new file mode 100644 index 00000000000..df66a0b22e9 --- /dev/null +++ b/queue-5.15/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 +Date: Wed, 25 Oct 2023 11:38:15 +0200 +Subject: arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names + +From: AngeloGioacchino Del Regno + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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.15/arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch b/queue-5.15/arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch new file mode 100644 index 00000000000..fc5c7e1a5bb --- /dev/null +++ b/queue-5.15/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 +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 + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -108,7 +108,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.15/arm64-dts-mediatek-mt8183-kukui-jacuzzi-fix-dsi-unnecessary-cells-properties.patch b/queue-5.15/arm64-dts-mediatek-mt8183-kukui-jacuzzi-fix-dsi-unnecessary-cells-properties.patch new file mode 100644 index 00000000000..2c051c05c3e --- /dev/null +++ b/queue-5.15/arm64-dts-mediatek-mt8183-kukui-jacuzzi-fix-dsi-unnecessary-cells-properties.patch @@ -0,0 +1,41 @@ +From 74543b303a9abfe4fa253d1fa215281baa05ff3a Mon Sep 17 00:00:00 2001 +From: Eugen Hristev +Date: Mon, 14 Aug 2023 10:10:53 +0300 +Subject: arm64: dts: mediatek: mt8183-kukui-jacuzzi: fix dsi unnecessary cells properties + +From: Eugen Hristev + +commit 74543b303a9abfe4fa253d1fa215281baa05ff3a upstream. + +dtbs_check throws a warning at the dsi node: +Warning (avoid_unnecessary_addr_size): /soc/dsi@14014000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property + +Other DTS have a panel child node with a reg, so the parent dtsi +must have the address-cells and size-cells, however this specific DT +has the panel removed, but not the cells, hence the warning above. + +If panel is deleted then the cells must also be deleted since they are +tied together, as the child node in this DT does not have a reg. + +Cc: stable@vger.kernel.org +Fixes: cabc71b08eb5 ("arm64: dts: mt8183: Add kukui-jacuzzi-damu board") +Signed-off-by: Eugen Hristev +Reviewed-by: AngeloGioacchino Del Regno +Link: https://lore.kernel.org/r/20230814071053.5459-1-eugen.hristev@collabora.com +Signed-off-by: AngeloGioacchino Del Regno +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi ++++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi +@@ -102,6 +102,8 @@ + + &dsi0 { + status = "okay"; ++ /delete-property/#size-cells; ++ /delete-property/#address-cells; + /delete-node/panel@0; + ports { + port { diff --git a/queue-5.15/series b/queue-5.15/series index 295d47994a3..4a97dd0f52e 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -91,3 +91,7 @@ tracing-fix-a-possible-race-when-disabling-buffered-events.patch packet-move-reference-count-in-packet_sock-to-atomic_long_t.patch regmap-fix-bogus-error-on-regcache_sync-success.patch platform-surface-aggregator-fix-recv_buf-return-value.patch +arm64-dts-mediatek-mt7622-fix-memory-node-warning-check.patch +arm64-dts-mediatek-mt8183-kukui-jacuzzi-fix-dsi-unnecessary-cells-properties.patch +arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-node-names.patch +arm64-dts-mediatek-mt8183-fix-unit-address-for-scp-reserved-memory.patch