diff mbox series

[v7,4/4] ARM: dts: mediatek: Modified MT7629 PCIe node

Message ID 20201029081513.10562-5-chuanjia.liu@mediatek.com (mailing list archive)
State New, archived
Headers show
Series PCI: mediatek: Spilt PCIe node to comply with hardware design | expand

Commit Message

Chuanjia Liu Oct. 29, 2020, 8:15 a.m. UTC 
Remove unused property and add pciecfg node.

Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
---
 arch/arm/boot/dts/mt7629-rfb.dts |  3 ++-
 arch/arm/boot/dts/mt7629.dtsi    | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

Comments

Bjorn Helgaas Nov. 3, 2020, 10:51 p.m. UTC | #1 
This subject line is pointless.

Every patch modifies something.  Give us a hint about what you
modified and why.

And use the present tense verb, i.e., "Modify ...", not "Modified".
Probably "Add" would be better than "Modify".  Or "Update" with some
meaningful description of the update.

On Thu, Oct 29, 2020 at 04:15:13PM +0800, Chuanjia Liu wrote:
> Remove unused property and add pciecfg node.

Apparently this also removes "subsys" from the "reg" property.
And removes an interrupt.  And adds "pcie_irq".

> Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
> Acked-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
>  arch/arm/boot/dts/mt7629-rfb.dts |  3 ++-
>  arch/arm/boot/dts/mt7629.dtsi    | 22 ++++++++++++----------
>  2 files changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts
> index 9980c10c6e29..eb536cbebd9b 100644
> --- a/arch/arm/boot/dts/mt7629-rfb.dts
> +++ b/arch/arm/boot/dts/mt7629-rfb.dts
> @@ -140,9 +140,10 @@
>  	};
>  };
>  
> -&pcie {
> +&pcie1 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pcie_pins>;
> +	status = "okay";
>  };
>  
>  &pciephy1 {
> diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
> index 5cbb3d244c75..6d6397f0c2fc 100644
> --- a/arch/arm/boot/dts/mt7629.dtsi
> +++ b/arch/arm/boot/dts/mt7629.dtsi
> @@ -360,16 +360,20 @@
>  			#reset-cells = <1>;
>  		};
>  
> -		pcie: pcie@1a140000 {
> +		pciecfg: pciecfg@1a140000 {
> +			compatible = "mediatek,generic-pciecfg", "syscon";
> +			reg = <0x1a140000 0x1000>;
> +		};
> +
> +		pcie1: pcie@1a145000 {
>  			compatible = "mediatek,mt7629-pcie";
>  			device_type = "pci";
> -			reg = <0x1a140000 0x1000>,
> -			      <0x1a145000 0x1000>;
> -			reg-names = "subsys","port1";
> +			reg = <0x1a145000 0x1000>;
> +			reg-names = "port1";
>  			#address-cells = <3>;
>  			#size-cells = <2>;
> -			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>,
> -				     <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
> +			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
> +			interrupt-names = "pcie_irq";
>  			clocks = <&pciesys CLK_PCIE_P1_MAC_EN>,
>  				 <&pciesys CLK_PCIE_P0_AHB_EN>,
>  				 <&pciesys CLK_PCIE_P1_AUX_EN>,
> @@ -390,21 +394,19 @@
>  			power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
>  			bus-range = <0x00 0xff>;
>  			ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;
> +			status = "disabled";
>  
> -			pcie1: pcie@1,0 {
> -				device_type = "pci";
> +			slot1: pcie@1,0 {
>  				reg = <0x0800 0 0 0 0>;
>  				#address-cells = <3>;
>  				#size-cells = <2>;
>  				#interrupt-cells = <1>;
>  				ranges;
> -				num-lanes = <1>;
>  				interrupt-map-mask = <0 0 0 7>;
>  				interrupt-map = <0 0 0 1 &pcie_intc1 0>,
>  						<0 0 0 2 &pcie_intc1 1>,
>  						<0 0 0 3 &pcie_intc1 2>,
>  						<0 0 0 4 &pcie_intc1 3>;
> -
>  				pcie_intc1: interrupt-controller {
>  					interrupt-controller;
>  					#address-cells = <0>;
> -- 
> 2.18.0
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Chuanjia Liu Nov. 9, 2020, 2:54 a.m. UTC | #2 
On Tue, 2020-11-03 at 16:51 -0600, Bjorn Helgaas wrote:
> This subject line is pointless.
> 
> Every patch modifies something.  Give us a hint about what you
> modified and why.
> 
> And use the present tense verb, i.e., "Modify ...", not "Modified".
> Probably "Add" would be better than "Modify".  Or "Update" with some
> meaningful description of the update.
> 
> On Thu, Oct 29, 2020 at 04:15:13PM +0800, Chuanjia Liu wrote:
> > Remove unused property and add pciecfg node.
> 
> Apparently this also removes "subsys" from the "reg" property.
> And removes an interrupt.  And adds "pcie_irq".

Thanks for you review，I will update my subject and commit message.

ARM: dts: mediatek: Update MT7629 PCIe node

To match the new DTS Binding, Remove "subsys" and unused interrupt.Add
"pcie_irq" property and pciecfg node.

Is that ok?

> > Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
> > Acked-by: Ryder Lee <ryder.lee@mediatek.com>
> > ---
> >  arch/arm/boot/dts/mt7629-rfb.dts |  3 ++-
> >  arch/arm/boot/dts/mt7629.dtsi    | 22 ++++++++++++----------
> >  2 files changed, 14 insertions(+), 11 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts
> > index 9980c10c6e29..eb536cbebd9b 100644
> > --- a/arch/arm/boot/dts/mt7629-rfb.dts
> > +++ b/arch/arm/boot/dts/mt7629-rfb.dts
> > @@ -140,9 +140,10 @@
> >  	};
> >  };
> >  
> > -&pcie {
> > +&pcie1 {
> >  	pinctrl-names = "default";
> >  	pinctrl-0 = <&pcie_pins>;
> > +	status = "okay";
> >  };
> >  
> >  &pciephy1 {
> > diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
> > index 5cbb3d244c75..6d6397f0c2fc 100644
> > --- a/arch/arm/boot/dts/mt7629.dtsi
> > +++ b/arch/arm/boot/dts/mt7629.dtsi
> > @@ -360,16 +360,20 @@
> >  			#reset-cells = <1>;
> >  		};
> >  
> > -		pcie: pcie@1a140000 {
> > +		pciecfg: pciecfg@1a140000 {
> > +			compatible = "mediatek,generic-pciecfg", "syscon";
> > +			reg = <0x1a140000 0x1000>;
> > +		};
> > +
> > +		pcie1: pcie@1a145000 {
> >  			compatible = "mediatek,mt7629-pcie";
> >  			device_type = "pci";
> > -			reg = <0x1a140000 0x1000>,
> > -			      <0x1a145000 0x1000>;
> > -			reg-names = "subsys","port1";
> > +			reg = <0x1a145000 0x1000>;
> > +			reg-names = "port1";
> >  			#address-cells = <3>;
> >  			#size-cells = <2>;
> > -			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>,
> > -				     <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
> > +			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
> > +			interrupt-names = "pcie_irq";
> >  			clocks = <&pciesys CLK_PCIE_P1_MAC_EN>,
> >  				 <&pciesys CLK_PCIE_P0_AHB_EN>,
> >  				 <&pciesys CLK_PCIE_P1_AUX_EN>,
> > @@ -390,21 +394,19 @@
> >  			power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
> >  			bus-range = <0x00 0xff>;
> >  			ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;
> > +			status = "disabled";
> >  
> > -			pcie1: pcie@1,0 {
> > -				device_type = "pci";
> > +			slot1: pcie@1,0 {
> >  				reg = <0x0800 0 0 0 0>;
> >  				#address-cells = <3>;
> >  				#size-cells = <2>;
> >  				#interrupt-cells = <1>;
> >  				ranges;
> > -				num-lanes = <1>;
> >  				interrupt-map-mask = <0 0 0 7>;
> >  				interrupt-map = <0 0 0 1 &pcie_intc1 0>,
> >  						<0 0 0 2 &pcie_intc1 1>,
> >  						<0 0 0 3 &pcie_intc1 2>,
> >  						<0 0 0 4 &pcie_intc1 3>;
> > -
> >  				pcie_intc1: interrupt-controller {
> >  					interrupt-controller;
> >  					#address-cells = <0>;
> > -- 
> > 2.18.0
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts
index 9980c10c6e29..eb536cbebd9b 100644
--- a/arch/arm/boot/dts/mt7629-rfb.dts
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
@@ -140,9 +140,10 @@ 
 	};
 };
 
-&pcie {
+&pcie1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pcie_pins>;
+	status = "okay";
 };
 
 &pciephy1 {
diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
index 5cbb3d244c75..6d6397f0c2fc 100644
--- a/arch/arm/boot/dts/mt7629.dtsi
+++ b/arch/arm/boot/dts/mt7629.dtsi
@@ -360,16 +360,20 @@ 
 			#reset-cells = <1>;
 		};
 
-		pcie: pcie@1a140000 {
+		pciecfg: pciecfg@1a140000 {
+			compatible = "mediatek,generic-pciecfg", "syscon";
+			reg = <0x1a140000 0x1000>;
+		};
+
+		pcie1: pcie@1a145000 {
 			compatible = "mediatek,mt7629-pcie";
 			device_type = "pci";
-			reg = <0x1a140000 0x1000>,
-			      <0x1a145000 0x1000>;
-			reg-names = "subsys","port1";
+			reg = <0x1a145000 0x1000>;
+			reg-names = "port1";
 			#address-cells = <3>;
 			#size-cells = <2>;
-			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>,
-				     <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
+			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
+			interrupt-names = "pcie_irq";
 			clocks = <&pciesys CLK_PCIE_P1_MAC_EN>,
 				 <&pciesys CLK_PCIE_P0_AHB_EN>,
 				 <&pciesys CLK_PCIE_P1_AUX_EN>,
@@ -390,21 +394,19 @@ 
 			power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
 			bus-range = <0x00 0xff>;
 			ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;
+			status = "disabled";
 
-			pcie1: pcie@1,0 {
-				device_type = "pci";
+			slot1: pcie@1,0 {
 				reg = <0x0800 0 0 0 0>;
 				#address-cells = <3>;
 				#size-cells = <2>;
 				#interrupt-cells = <1>;
 				ranges;
-				num-lanes = <1>;
 				interrupt-map-mask = <0 0 0 7>;
 				interrupt-map = <0 0 0 1 &pcie_intc1 0>,
 						<0 0 0 2 &pcie_intc1 1>,
 						<0 0 0 3 &pcie_intc1 2>,
 						<0 0 0 4 &pcie_intc1 3>;
-
 				pcie_intc1: interrupt-controller {
 					interrupt-controller;
 					#address-cells = <0>;