diff mbox series

[1/2] ARM: dts: qcom: sdx55: Move reset and wake gpios to board dts

Message ID 20230331145915.11653-1-manivannan.sadhasivam@linaro.org
State Accepted
Commit a6d1d862638b51f2a874948f75fd7284d066f900
Headers show
Series [1/2] ARM: dts: qcom: sdx55: Move reset and wake gpios to board dts | expand

Commit Message

Manivannan Sadhasivam March 31, 2023, 2:59 p.m. UTC
The reset and wake properties in the PCIe EP node belong to the board dts
as they can be customized per board design. So let's move them from SoC
dtsi.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 3 +++
 arch/arm/boot/dts/qcom-sdx55.dtsi                | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Konrad Dybcio March 31, 2023, 7:42 p.m. UTC | #1
On 31.03.2023 16:59, Manivannan Sadhasivam wrote:
> To align with rest of the devicetree files, let's move the "status"
> property to the end of the nodes.
> 
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  .../boot/dts/qcom-sdx55-telit-fn980-tlb.dts   | 20 ++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
> index b73b707342af..91d13c40496c 100644
> --- a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
> +++ b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
> @@ -243,21 +243,21 @@ &ipa {
>  };
>  
>  &pcie_phy {
> -	status = "okay";
> -
>  	vdda-phy-supply = <&vreg_l1e_bb_1p2>;
>  	vdda-pll-supply = <&vreg_l4e_bb_0p875>;
> -};
>  
> -&pcie_ep {
>  	status = "okay";
> +};
>  
> +&pcie_ep {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pcie_ep_clkreq_default &pcie_ep_perst_default
>  		     &pcie_ep_wake_default>;
>  
>  	reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
>  	wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
> +
> +	status = "okay";
>  };
>  
>  &qpic_bam {
> @@ -265,8 +265,6 @@ &qpic_bam {
>  };
>  
>  &qpic_nand {
> -	status = "okay";
> -
>  	nand@0 {
>  		reg = <0>;
>  
> @@ -277,11 +275,13 @@ nand@0 {
>  		secure-regions = /bits/ 64 <0x500000 0x500000
>  					    0xa00000 0xb00000>;
>  	};
> +
> +	status = "okay";
Did you compiletest this?

Konrad
>  };
>  
>  &remoteproc_mpss {
> -	status = "okay";
>  	memory-region = <&mpss_adsp_mem>;
> +	status = "okay";
>  };
>  
>  &tlmm {
> @@ -308,16 +308,18 @@ pcie_ep_wake_default: pcie-ep-wake-default-state {
>  };
>  
>  &usb_hsphy {
> -	status = "okay";
>  	vdda-pll-supply = <&vreg_l4e_bb_0p875>;
>  	vdda33-supply = <&vreg_l10e_3p1>;
>  	vdda18-supply = <&vreg_l5e_bb_1p7>;
> +
> +	status = "okay";
>  };
>  
>  &usb_qmpphy {
> -	status = "okay";
>  	vdda-phy-supply = <&vreg_l4e_bb_0p875>;
>  	vdda-pll-supply = <&vreg_l1e_bb_1p2>;
> +
> +	status = "okay";
>  };
>  
>  &usb {
Krzysztof Kozlowski March 31, 2023, 8:26 p.m. UTC | #2
On 31/03/2023 16:59, Manivannan Sadhasivam wrote:
> To align with rest of the devicetree files, let's move the "status"
> property to the end of the nodes.
> 
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  .../boot/dts/qcom-sdx55-telit-fn980-tlb.dts   | 20 ++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)

These are cosmetic changes, so we should not do it board-per-board (see
recent Alex's commit).

Either two commits (one for entire arm32 and one for arm64) or per SoCs.
But not per-boards.

Best regards,
Krzysztof
Bjorn Andersson April 7, 2023, 11:40 p.m. UTC | #3
On Fri, 31 Mar 2023 20:29:14 +0530, Manivannan Sadhasivam wrote:
> The reset and wake properties in the PCIe EP node belong to the board dts
> as they can be customized per board design. So let's move them from SoC
> dtsi.
> 
> 

Applied, thanks!

[1/2] ARM: dts: qcom: sdx55: Move reset and wake gpios to board dts
      commit: a6d1d862638b51f2a874948f75fd7284d066f900
[2/2] ARM: dts: qcom: sdx55-fn980: Move "status" property to the end of node
      commit: 23fbf5339d4b18858bcd38811c0eb96df00e8289

Best regards,
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
index 81f33eba39e5..b73b707342af 100644
--- a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
+++ b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
@@ -255,6 +255,9 @@  &pcie_ep {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pcie_ep_clkreq_default &pcie_ep_perst_default
 		     &pcie_ep_wake_default>;
+
+	reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
+	wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
 };
 
 &qpic_bam {
diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi
index 286fa92da428..bc310ed01b40 100644
--- a/arch/arm/boot/dts/qcom-sdx55.dtsi
+++ b/arch/arm/boot/dts/qcom-sdx55.dtsi
@@ -421,8 +421,6 @@  pcie_ep: pcie-ep@1c00000 {
 				     <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "global",
 					  "doorbell";
-			reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
-			wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
 			resets = <&gcc GCC_PCIE_BCR>;
 			reset-names = "core";
 			power-domains = <&gcc PCIE_GDSC>;