Patch "arm64: dts: juno: Fix SCMI power domain IDs for ETF and CS funnel" has been added to the 5.18-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 5.18-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-dts-juno-fix-scmi-power-domain-ids-for-etf-and.patch
and it can be found in the queue-5.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e1cb4718a918e5300b8d50e4450f9ca11e6e3e01
Author: Sudeep Holla <sudeep.holla@xxxxxxx>
Date:   Wed Apr 13 10:35:47 2022 +0100

    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@xxxxxxx
    Fixes: 96bb0954860a ("arm64: dts: juno: Add separate SCMI variants")
    Cc: Robin Murphy <robin.murphy@xxxxxxx>
    Reported-by: Mike Leach <Mike.Leach@xxxxxxx>
    Acked-by: Robin Murphy <robin.murphy@xxxxxxx>
    Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/arm/juno-r1-scmi.dts b/arch/arm64/boot/dts/arm/juno-r1-scmi.dts
index 190a0fba4ad6..fd1f0d26d751 100644
--- 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 dbf13770084f..35e6d4762c46 100644
--- 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>;
 	};
 };