diff mbox series

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

Message ID 20220413093547.1699535-1-sudeep.holla@arm.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: juno: Fix SCMI power domain IDs for ETF and CS funnel | expand

Commit Message

Sudeep Holla April 13, 2022, 9:35 a.m. UTC
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.

Fixes: 96bb0954860a ("arm64: dts: juno: Add separate SCMI variants")
Reported-by: Mike Leach <Mike.Leach@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-r1-scmi.dts | 4 ++--
 arch/arm64/boot/dts/arm/juno-r2-scmi.dts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Robin Murphy April 13, 2022, 10:07 a.m. UTC | #1
On 2022-04-13 10:35, Sudeep Holla wrote:
> 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.

Indeed, this is my copy-paste bug (annoyingly, from doing something 
inexplicable when I *did* have the correct thing as a starting point...)

Acked-by: Robin Murphy <robin.murphy@arm.com>

> Fixes: 96bb0954860a ("arm64: dts: juno: Add separate SCMI variants")
> Reported-by: Mike Leach <Mike.Leach@arm.com>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>   arch/arm64/boot/dts/arm/juno-r1-scmi.dts | 4 ++--
>   arch/arm64/boot/dts/arm/juno-r2-scmi.dts | 4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> 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>;
>   	};
>   };
>
Sudeep Holla April 25, 2022, 1:28 p.m. UTC | #2
On Wed, 13 Apr 2022 10:35:47 +0100, Sudeep Holla wrote:
> 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.
> 
> 
> [...]

Applied to sudeep.holla/linux (for-next/juno), thanks!

[1/1] arm64: dts: juno: Fix SCMI power domain IDs for ETF and CS funnel
      https://git.kernel.org/sudeep.holla/c/8dd3cdeaf303

--
Regards,
Sudeep
diff mbox series

Patch

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>;
 	};
 };