[PATCH 1/6] arm64: dts: qcom: msm8996: add missing DSI clock assignments

[PATCH 1/6] arm64: dts: qcom: msm8996: add missing DSI clock assignments

[Dmitry Baryshkov]

Add missing DSI clock assignments to properly use DSI PHY clocks as DSI
byte and pixel clock parents.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 25d6b26fab60..50f7f89655b3 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -880,6 +880,8 @@ dsi0: dsi@994000 {
 					      "core_mmss",
 					      "pixel",
 					      "core";
+				assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>;
+				assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
 
 				phys = <&dsi0_phy>;
 				phy-names = "dsi";
@@ -946,6 +948,8 @@ dsi1: dsi@996000 {
 					      "core_mmss",
 					      "pixel",
 					      "core";
+				assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>;
+				assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
 
 				phys = <&dsi1_phy>;
 				phy-names = "dsi";
-- 
2.35.1

[PATCH 2/6] arm64: dts: qcom: sc7280: use constants for gpucc clocks and power-domains

[Dmitry Baryshkov]

To ease merging of bindings and dts files, the constants were replaced
with numeric values. Change them back to defined constants.
While we are at it, fix the indentation of these clocks properties to
follow established guidelines.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc7280.dtsi | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 40e700cebe56..a3def1022ea2 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -2405,13 +2405,13 @@ gmu: gmu@3d6a000 {
 			interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
 					<GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "hfi", "gmu";
-			clocks = <&gpucc 5>,
-					<&gpucc 8>,
-					<&gcc GCC_DDRSS_GPU_AXI_CLK>,
-					<&gcc GCC_GPU_MEMNOC_GFX_CLK>,
-					<&gpucc 2>,
-					<&gpucc 15>,
-					<&gpucc 11>;
+			clocks = <&gpucc GPU_CC_CX_GMU_CLK>,
+				 <&gpucc GPU_CC_CXO_CLK>,
+				 <&gcc GCC_DDRSS_GPU_AXI_CLK>,
+				 <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+				 <&gpucc GPU_CC_AHB_CLK>,
+				 <&gpucc GPU_CC_HUB_CX_INT_CLK>,
+				 <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>;
 			clock-names = "gmu",
 				      "cxo",
 				      "axi",
@@ -2419,8 +2419,8 @@ gmu: gmu@3d6a000 {
 				      "ahb",
 				      "hub",
 				      "smmu_vote";
-			power-domains = <&gpucc 0>,
-					<&gpucc 1>;
+			power-domains = <&gpucc GPU_CC_CX_GDSC>,
+					<&gpucc GPU_CC_GX_GDSC>;
 			power-domain-names = "cx",
 					     "gx";
 			iommus = <&adreno_smmu 5 0x400>;
@@ -2469,12 +2469,12 @@ adreno_smmu: iommu@3da0000 {
 					<GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>;
 
 			clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
-					<&gcc GCC_GPU_SNOC_DVM_GFX_CLK>,
-					<&gpucc 2>,
-					<&gpucc 11>,
-					<&gpucc 5>,
-					<&gpucc 15>,
-					<&gpucc 13>;
+				 <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>,
+				 <&gpucc GPU_CC_AHB_CLK>,
+				 <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>,
+				 <&gpucc GPU_CC_CX_GMU_CLK>,
+				 <&gpucc GPU_CC_HUB_CX_INT_CLK>,
+				 <&gpucc GPU_CC_HUB_AON_CLK>;
 			clock-names = "gcc_gpu_memnoc_gfx_clk",
 					"gcc_gpu_snoc_dvm_gfx_clk",
 					"gpu_cc_ahb_clk",
@@ -2483,7 +2483,7 @@ adreno_smmu: iommu@3da0000 {
 					"gpu_cc_hub_cx_int_clk",
 					"gpu_cc_hub_aon_clk";
 
-			power-domains = <&gpucc 0>;
+			power-domains = <&gpucc GPU_CC_CX_GDSC>;
 		};
 
 		remoteproc_mpss: remoteproc@4080000 {
-- 
2.35.1

[PATCH 3/6] arm64: dts: qcom: sc7180-idp: add vdds supply to the DSI PHY

[Dmitry Baryshkov]

Add the (required) vdss-supply property to the DSI PHY node.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 2d84bc400196..9dee131b1e24 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -330,6 +330,7 @@ endpoint {
 
 &dsi_phy {
 	status = "okay";
+	vdds-supply = <&vreg_l4a_0p8>;
 };
 
 &mdp {
-- 
2.35.1

[PATCH 4/6] arm: dts: qcom: apq8064: rename DSI PHY iface clock

[Dmitry Baryshkov]

Follow the usual scheme and use name 'iface' rather than 'iface_clk' for
the interface clock. The DSI PHY driver can cope with both of them, so
there is no breakage.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 91adcbd54b17..4b264cf7eccc 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1299,7 +1299,7 @@ dsi0_phy: dsi-phy@4700200 {
 				<0x04700300 0x200>,
 				<0x04700500 0x5c>;
 			reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";
-			clock-names = "iface_clk", "ref";
+			clock-names = "iface", "ref";
 			clocks = <&mmcc DSI_M_AHB_CLK>,
 				 <&pxo_board>;
 		};
-- 
2.35.1

[PATCH 5/6] arm: dts: qcom: apq8064: disable DSI and DSI PHY by default

[Dmitry Baryshkov]

Disable DSI and DSI PHY devices by default. The only actual user,
Nexus 7, already contains `status = "okay"` property in the respective
devices nodes.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 4b264cf7eccc..34c5843de278 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1271,6 +1271,8 @@ dsi0: dsi@4700000 {
 			syscon-sfpb = <&mmss_sfpb>;
 			phys = <&dsi0_phy>;
 			phy-names = "dsi";
+			status = "disabled";
+
 			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1302,6 +1304,7 @@ dsi0_phy: dsi-phy@4700200 {
 			clock-names = "iface", "ref";
 			clocks = <&mmcc DSI_M_AHB_CLK>,
 				 <&pxo_board>;
+			status = "disabled";
 		};
 
 
-- 
2.35.1

[PATCH 6/6] arm: dts: qcom-msm8974: rename GPU's OPP table node

[Dmitry Baryshkov]

Rename the GPU's opp table node to make it follow the
display/msm/gpu.yaml schema.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 11b4206036e6..2c323d20a1a2 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1634,7 +1634,7 @@ gpu: adreno@fdb00000 {
 
 			status = "disabled";
 
-			gpu_opp_table: opp_table {
+			gpu_opp_table: opp-table {
 				compatible = "operating-points-v2";
 
 				opp-320000000 {
-- 
2.35.1

Re: [PATCH 2/6] arm64: dts: qcom: sc7280: use constants for gpucc clocks and power-domains

[Krzysztof Kozlowski]

On 06/07/2022 16:54, Dmitry Baryshkov wrote:
> To ease merging of bindings and dts files, the constants were replaced

In the future I recommend just adding defines in top part of DTSI (under
ifdef not defined). Then when time comes, you drop this entire piece of
defines which makes it extra readable and easy to review. Nice clean
patchset.

To review this approach, I would need to check every define if it
matches the previous number.

Best regards,
Krzysztof

Re: [PATCH 2/6] arm64: dts: qcom: sc7280: use constants for gpucc clocks and power-domains

[Bjorn Andersson]

On Wed 06 Jul 10:43 CDT 2022, Krzysztof Kozlowski wrote:

> On 06/07/2022 16:54, Dmitry Baryshkov wrote:
> > To ease merging of bindings and dts files, the constants were replaced
> 
> In the future I recommend just adding defines in top part of DTSI (under
> ifdef not defined). Then when time comes, you drop this entire piece of
> defines which makes it extra readable and easy to review. Nice clean
> patchset.
> 

I worked out the underlying issue with the clock maintainer, so we
should just use the dt-bindings defines directly from the beginning.

Regards,
Bjorn

> To review this approach, I would need to check every define if it
> matches the previous number.
> 
> Best regards,
> Krzysztof

Re: (subset) [PATCH 1/6] arm64: dts: qcom: msm8996: add missing DSI clock assignments

[Bjorn Andersson]

On Wed, 6 Jul 2022 17:54:07 +0300, Dmitry Baryshkov wrote:
> Add missing DSI clock assignments to properly use DSI PHY clocks as DSI
> byte and pixel clock parents.
> 
> 

Applied, thanks!

[4/6] arm: dts: qcom: apq8064: rename DSI PHY iface clock
      commit: 9c10bb43db82bc9289af50c39cc940aff79b7aed
[5/6] arm: dts: qcom: apq8064: disable DSI and DSI PHY by default
      commit: d8e51f13c31c585caf6a9497627ecad14e78211b
[6/6] arm: dts: qcom-msm8974: rename GPU's OPP table node
      commit: 864cfdeb76735909a9afcc314416ccaa1ce82a1a

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>