From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Make them aligned with both the Venus and clock drivers. The existing
ones seem to have been based on data for the non-final SKU.

Take the liberty to move the opp table subnode to retain alphabetical
order while at it.

Fixes: 137154871cf4 ("arm64: dts: qcom: sdm845: Add OPP tables and power-domains for venus")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 3bc8471c658bda987d6fcff3359d63b367148e89..7d22ecb908cd4dd792a36beaee0ede061c5abd0f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4254,14 +4254,6 @@ venus: video-codec@aa00000 {
 
 			status = "disabled";
 
-			video-core0 {
-				compatible = "venus-decoder";
-			};
-
-			video-core1 {
-				compatible = "venus-encoder";
-			};
-
 			venus_opp_table: opp-table {
 				compatible = "operating-points-v2";
 
@@ -4275,13 +4267,13 @@ opp-200000000 {
 					required-opps = <&rpmhpd_opp_low_svs>;
 				};
 
-				opp-320000000 {
-					opp-hz = /bits/ 64 <320000000>;
+				opp-330000000 {
+					opp-hz = /bits/ 64 <330000000>;
 					required-opps = <&rpmhpd_opp_svs>;
 				};
 
-				opp-380000000 {
-					opp-hz = /bits/ 64 <380000000>;
+				opp-404000000 {
+					opp-hz = /bits/ 64 <404000000>;
 					required-opps = <&rpmhpd_opp_svs_l1>;
 				};
 
@@ -4295,6 +4287,14 @@ opp-533000097 {
 					required-opps = <&rpmhpd_opp_turbo>;
 				};
 			};
+
+			video-core0 {
+				compatible = "venus-decoder";
+			};
+
+			video-core1 {
+				compatible = "venus-encoder";
+			};
 		};
 
 		videocc: clock-controller@ab00000 {

-- 
2.49.0

On Sat, May 31, 2025 at 02:27:23PM +0200, Konrad Dybcio wrote:
> From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> 
> Make them aligned with both the Venus and clock drivers. The existing
> ones seem to have been based on data for the non-final SKU.
> 
> Take the liberty to move the opp table subnode to retain alphabetical
> order while at it.
> 
> Fixes: 137154871cf4 ("arm64: dts: qcom: sdm845: Add OPP tables and power-domains for venus")
> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/sdm845.dtsi | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index 3bc8471c658bda987d6fcff3359d63b367148e89..7d22ecb908cd4dd792a36beaee0ede061c5abd0f 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -4254,14 +4254,6 @@ venus: video-codec@aa00000 {
>  
>  			status = "disabled";
>  
> -			video-core0 {
> -				compatible = "venus-decoder";
> -			};
> -
> -			video-core1 {
> -				compatible = "venus-encoder";
> -			};
> -
>  			venus_opp_table: opp-table {
>  				compatible = "operating-points-v2";
>  
> @@ -4275,13 +4267,13 @@ opp-200000000 {
>  					required-opps = <&rpmhpd_opp_low_svs>;
>  				};
>  
> -				opp-320000000 {
> -					opp-hz = /bits/ 64 <320000000>;
> +				opp-330000000 {
> +					opp-hz = /bits/ 64 <330000000>;
>  					required-opps = <&rpmhpd_opp_svs>;
>  				};
>  
> -				opp-380000000 {
> -					opp-hz = /bits/ 64 <380000000>;
> +				opp-404000000 {
> +					opp-hz = /bits/ 64 <404000000>;
>  					required-opps = <&rpmhpd_opp_svs_l1>;
>  				};
>  
> @@ -4295,6 +4287,14 @@ opp-533000097 {
>  					required-opps = <&rpmhpd_opp_turbo>;
>  				};
>  			};
> +
> +			video-core0 {
> +				compatible = "venus-decoder";
> +			};
> +
> +			video-core1 {
> +				compatible = "venus-encoder";
> +			};

We don't need these nodes anymore. Please split into two patches: one
fixing the OPP table and another one, removing subnodes.

>  		};
>  
>  		videocc: clock-controller@ab00000 {
> 
> -- 
> 2.49.0
> 

-- 
With best wishes
Dmitry