arm64: dts: juno: Fix SCMI power domain IDs for ETF and CS funnel

[ Upstream commit 8dd3cdeaf3032728e30a7ec5e79ca780fc86cf7a ]

The SCMI power domain ID for all the coresight components is 8 while
the previous/older SCPI domain was 0. When adding SCMI variant, couple
of instances retained SCPI domain ID by mistake.

Fix the same by using the correct SCMI power domain ID of 8.

Link: https://lore.kernel.org/r/20220413093547.1699535-1-sudeep.holla@arm.com
Fixes: 96bb0954860a ("arm64: dts: juno: Add separate SCMI variants")
Cc: Robin Murphy <robin.murphy@arm.com>
Reported-by: Mike Leach <Mike.Leach@arm.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/arm/juno-r1-scmi.dts b/arch/arm64/boot/dts/arm/juno-r1-scmi.dts
index 190a0fba4ad68a145e2d0f3c1c50c03037bf39b4..fd1f0d26d751a26a6ad72181345542f41fc1b33c 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r1-scmi.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1-scmi.dts
@@ -7,11 +7,11 @@ funnel@20130000 {
        };
 
        etf@20140000 {
-               power-domains = <&scmi_devpd 0>;
+               power-domains = <&scmi_devpd 8>;
        };
 
        funnel@20150000 {
-               power-domains = <&scmi_devpd 0>;
+               power-domains = <&scmi_devpd 8>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/arm/juno-r2-scmi.dts b/arch/arm64/boot/dts/arm/juno-r2-scmi.dts
index dbf13770084f5fa4c04e544cc28ba4d3aa490f47..35e6d4762c46355a823b775c5c08b7c5aaa8748b 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r2-scmi.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2-scmi.dts
@@ -7,11 +7,11 @@ funnel@20130000 {
        };
 
        etf@20140000 {
-               power-domains = <&scmi_devpd 0>;
+               power-domains = <&scmi_devpd 8>;
        };
 
        funnel@20150000 {
-               power-domains = <&scmi_devpd 0>;
+               power-domains = <&scmi_devpd 8>;
        };
 };