From 53b5702419b6cda29a8ba625d439b7708eea6e8d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 30 Apr 2024 15:39:25 +0200 Subject: [PATCH] drop dts patch from 5.4 and 5.10 that broke things --- ...ek-mt8183-add-power-domains-properit.patch | 39 ------------------- queue-5.10/series | 1 - ...ek-mt8183-add-power-domains-properit.patch | 39 ------------------- queue-5.4/series | 1 - 4 files changed, 80 deletions(-) delete mode 100644 queue-5.10/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch delete mode 100644 queue-5.4/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch diff --git a/queue-5.10/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch b/queue-5.10/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch deleted file mode 100644 index 39749290e1..0000000000 --- a/queue-5.10/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 668b315af5d96a506a348082cc049698d0e36cc4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Feb 2024 17:11:21 +0800 -Subject: arm64: dts: mediatek: mt8183: Add power-domains properity to mfgcfg - -From: Ikjoon Jang - -[ Upstream commit 1781f2c461804c0123f59afc7350e520a88edffb ] - -mfgcfg clock is under MFG_ASYNC power domain. - -Fixes: e526c9bc11f8 ("arm64: dts: Add Mediatek SoC MT8183 and evaluation board dts and Makefile") -Fixes: 37fb78b9aeb7 ("arm64: dts: mediatek: Add mt8183 power domains controller") -Signed-off-by: Weiyi Lu -Signed-off-by: Ikjoon Jang -Reviewed-by: Enric Balletbo i Serra -Signed-off-by: Chen-Yu Tsai -Link: https://lore.kernel.org/r/20240223091122.2430037-1-wenst@chromium.org -Signed-off-by: AngeloGioacchino Del Regno -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi -index 31bc8bae8cff8..d5c73e5166412 100644 ---- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi -+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi -@@ -765,6 +765,7 @@ - compatible = "mediatek,mt8183-mfgcfg", "syscon"; - reg = <0 0x13000000 0 0x1000>; - #clock-cells = <1>; -+ power-domains = <&spm MT8183_POWER_DOMAIN_MFG_ASYNC>; - }; - - mmsys: syscon@14000000 { --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 7af0abfbcc..fc9abf069a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -72,7 +72,6 @@ nilfs2-fix-oob-in-nilfs_set_de_type.patch arm64-dts-rockchip-fix-alphabetical-ordering-rk3399-.patch arm64-dts-rockchip-enable-internal-pull-up-on-pcie_w.patch arm64-dts-rockchip-remove-unsupported-node-from-the-.patch -arm64-dts-mediatek-mt8183-add-power-domains-properit.patch arm64-dts-mediatek-mt7622-add-support-for-coherent-d.patch arm64-dts-mediatek-mt7622-introduce-nodes-for-wirele.patch arm64-dts-mediatek-mt7622-fix-clock-controllers.patch diff --git a/queue-5.4/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch b/queue-5.4/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch deleted file mode 100644 index e1f3827be0..0000000000 --- a/queue-5.4/arm64-dts-mediatek-mt8183-add-power-domains-properit.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9490ea0442fdc95dcf1faec4d57561222c434535 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Feb 2024 17:11:21 +0800 -Subject: arm64: dts: mediatek: mt8183: Add power-domains properity to mfgcfg - -From: Ikjoon Jang - -[ Upstream commit 1781f2c461804c0123f59afc7350e520a88edffb ] - -mfgcfg clock is under MFG_ASYNC power domain. - -Fixes: e526c9bc11f8 ("arm64: dts: Add Mediatek SoC MT8183 and evaluation board dts and Makefile") -Fixes: 37fb78b9aeb7 ("arm64: dts: mediatek: Add mt8183 power domains controller") -Signed-off-by: Weiyi Lu -Signed-off-by: Ikjoon Jang -Reviewed-by: Enric Balletbo i Serra -Signed-off-by: Chen-Yu Tsai -Link: https://lore.kernel.org/r/20240223091122.2430037-1-wenst@chromium.org -Signed-off-by: AngeloGioacchino Del Regno -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi -index 97f84aa9fc6e1..1c93f41bc0880 100644 ---- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi -+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi -@@ -577,6 +577,7 @@ - compatible = "mediatek,mt8183-mfgcfg", "syscon"; - reg = <0 0x13000000 0 0x1000>; - #clock-cells = <1>; -+ power-domains = <&spm MT8183_POWER_DOMAIN_MFG_ASYNC>; - }; - - mmsys: syscon@14000000 { --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 5c063f1bef..e2eaebf1d4 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -51,7 +51,6 @@ nilfs2-fix-oob-in-nilfs_set_de_type.patch kvm-async_pf-cleanup-kvm_setup_async_pf.patch arm64-dts-rockchip-fix-alphabetical-ordering-rk3399-.patch arm64-dts-rockchip-enable-internal-pull-up-on-pcie_w.patch -arm64-dts-mediatek-mt8183-add-power-domains-properit.patch arm64-dts-mediatek-mt7622-fix-ir-nodename.patch arm64-dts-mediatek-mt7622-fix-ethernet-controller-co.patch arm64-dts-mediatek-mt7622-drop-reset-names-from-ther.patch -- 2.39.5