All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shawn Guo <shawnguo@kernel.org>
To: Li Yang <leoyang.li@nxp.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Subject: Re: [PATCH v2 05/10] arm64: dts: lx2160a: update PCIe nodes to match rev2 silicon
Date: Tue, 14 Dec 2021 13:39:46 +0800	[thread overview]
Message-ID: <20211214053945.GF10916@dragon> (raw)
In-Reply-To: <20211203235446.8266-6-leoyang.li@nxp.com>

On Fri, Dec 03, 2021 at 05:54:41PM -0600, Li Yang wrote:
> The original dts was created based on the non-production rev1 silicon
> which was only used for evaluation.  Update the PCIe nodes to align with
> the different controller used in production rev2 silicon.
> 
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> Reviewed-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  .../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 96 +++++++++----------
>  1 file changed, 48 insertions(+), 48 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> index fcde09f36018..de680521e1d1 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> @@ -1088,10 +1088,10 @@ sata3: sata@3230000 {
>  		};
>  
>  		pcie1: pcie@3400000 {
> -			compatible = "fsl,lx2160a-pcie";

Drop lx2160a specific compatible for lx2160a SoC?

Shawn

> -			reg = <0x00 0x03400000 0x0 0x00100000>, /* controller registers */
> -			      <0x80 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
> +			       0x80 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1100,26 +1100,26 @@ pcie1: pcie@3400000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie2: pcie@3500000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03500000 0x0 0x00100000>, /* controller registers */
> -			      <0x88 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
> +			       0x88 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1128,26 +1128,26 @@ pcie2: pcie@3500000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x88 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie3: pcie@3600000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03600000 0x0 0x00100000>, /* controller registers */
> -			      <0x90 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
> +			       0x90 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1156,26 +1156,26 @@ pcie3: pcie@3600000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <256>;
> -			ppio-wins = <24>;
> +			num-viewport = <256>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x90 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x90 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x90 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie4: pcie@3700000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03700000 0x0 0x00100000>, /* controller registers */
> -			      <0x98 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03700000 0x0 0x00100000   /* controller registers */
> +			       0x98 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1184,26 +1184,26 @@ pcie4: pcie@3700000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x98 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x98 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x98 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie5: pcie@3800000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03800000 0x0 0x00100000>, /* controller registers */
> -			      <0xa0 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03800000 0x0 0x00100000   /* controller registers */
> +			       0xa0 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1212,26 +1212,26 @@ pcie5: pcie@3800000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <256>;
> -			ppio-wins = <24>;
> +			num-viewport = <256>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0xa0 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0xa0 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0xa0 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie6: pcie@3900000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03900000 0x0 0x00100000>, /* controller registers */
> -			      <0xa8 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03900000 0x0 0x00100000   /* controller registers */
> +			       0xa8 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1240,18 +1240,18 @@ pcie6: pcie@3900000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0xa8 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0xa8 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0xa8 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
> -- 
> 2.25.1
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Shawn Guo <shawnguo@kernel.org>
To: Li Yang <leoyang.li@nxp.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Subject: Re: [PATCH v2 05/10] arm64: dts: lx2160a: update PCIe nodes to match rev2 silicon
Date: Tue, 14 Dec 2021 13:39:46 +0800	[thread overview]
Message-ID: <20211214053945.GF10916@dragon> (raw)
In-Reply-To: <20211203235446.8266-6-leoyang.li@nxp.com>

On Fri, Dec 03, 2021 at 05:54:41PM -0600, Li Yang wrote:
> The original dts was created based on the non-production rev1 silicon
> which was only used for evaluation.  Update the PCIe nodes to align with
> the different controller used in production rev2 silicon.
> 
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> Reviewed-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  .../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 96 +++++++++----------
>  1 file changed, 48 insertions(+), 48 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> index fcde09f36018..de680521e1d1 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> @@ -1088,10 +1088,10 @@ sata3: sata@3230000 {
>  		};
>  
>  		pcie1: pcie@3400000 {
> -			compatible = "fsl,lx2160a-pcie";

Drop lx2160a specific compatible for lx2160a SoC?

Shawn

> -			reg = <0x00 0x03400000 0x0 0x00100000>, /* controller registers */
> -			      <0x80 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
> +			       0x80 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1100,26 +1100,26 @@ pcie1: pcie@3400000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie2: pcie@3500000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03500000 0x0 0x00100000>, /* controller registers */
> -			      <0x88 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
> +			       0x88 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1128,26 +1128,26 @@ pcie2: pcie@3500000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x88 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie3: pcie@3600000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03600000 0x0 0x00100000>, /* controller registers */
> -			      <0x90 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
> +			       0x90 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1156,26 +1156,26 @@ pcie3: pcie@3600000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <256>;
> -			ppio-wins = <24>;
> +			num-viewport = <256>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x90 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x90 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x90 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie4: pcie@3700000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03700000 0x0 0x00100000>, /* controller registers */
> -			      <0x98 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03700000 0x0 0x00100000   /* controller registers */
> +			       0x98 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1184,26 +1184,26 @@ pcie4: pcie@3700000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0x98 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0x98 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0x98 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie5: pcie@3800000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03800000 0x0 0x00100000>, /* controller registers */
> -			      <0xa0 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03800000 0x0 0x00100000   /* controller registers */
> +			       0xa0 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1212,26 +1212,26 @@ pcie5: pcie@3800000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <256>;
> -			ppio-wins = <24>;
> +			num-viewport = <256>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0xa0 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0xa0 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0xa0 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
>  		pcie6: pcie@3900000 {
> -			compatible = "fsl,lx2160a-pcie";
> -			reg = <0x00 0x03900000 0x0 0x00100000>, /* controller registers */
> -			      <0xa8 0x00000000 0x0 0x00002000>; /* configuration space */
> -			reg-names = "csr_axi_slave", "config_axi_slave";
> +			compatible = "fsl,ls2088a-pcie";
> +			reg = <0x00 0x03900000 0x0 0x00100000   /* controller registers */
> +			       0xa8 0x00000000 0x0 0x00002000>; /* configuration space */
> +			reg-names = "regs", "config";
>  			interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
>  				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
>  				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1240,18 +1240,18 @@ pcie6: pcie@3900000 {
>  			#size-cells = <2>;
>  			device_type = "pci";
>  			dma-coherent;
> -			apio-wins = <8>;
> -			ppio-wins = <8>;
> +			num-viewport = <8>;
>  			bus-range = <0x0 0xff>;
> -			ranges = <0x82000000 0x0 0x40000000 0xa8 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> +			ranges = <0x81000000 0x0 0x00000000 0xa8 0x00010000 0x0 0x00010000
> +				  0x82000000 0x0 0x40000000 0xa8 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>  			msi-parent = <&its>;
> +			iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
>  			#interrupt-cells = <1>;
>  			interrupt-map-mask = <0 0 0 7>;
>  			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 2 &gic 0 0 GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 3 &gic 0 0 GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
>  					<0000 0 0 4 &gic 0 0 GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
> -			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
>  			status = "disabled";
>  		};
>  
> -- 
> 2.25.1
> 

  reply	other threads:[~2021-12-14  5:41 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03 23:54 [PATCH v2 00/10] lx216x DTS updates Li Yang
2021-12-03 23:54 ` Li Yang
2021-12-03 23:54 ` [PATCH v2 01/10] arm64: dts: lx2160a: fix scl-gpios property name Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-14  5:33   ` Shawn Guo
2021-12-14  5:33     ` Shawn Guo
2021-12-03 23:54 ` [PATCH v2 02/10] arm64: dts: lx2160a-rdb: Add Inphi PHY node Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-03 23:54 ` [PATCH v2 03/10] arm64: dts: lx2160a: add optee-tz node Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-03 23:54 ` [PATCH v2 04/10] arm64: dts: lx2160a-qds: Add mdio mux nodes Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-03 23:54 ` [PATCH v2 05/10] arm64: dts: lx2160a: update PCIe nodes to match rev2 silicon Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-14  5:39   ` Shawn Guo [this message]
2021-12-14  5:39     ` Shawn Guo
2021-12-14  6:14     ` Leo Li
2021-12-14  6:14       ` Leo Li
2021-12-03 23:54 ` [PATCH v2 06/10] arm64: dts: lx2160a: add pcie EP mode nodes Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-14  5:40   ` Shawn Guo
2021-12-14  5:40     ` Shawn Guo
2021-12-03 23:54 ` [PATCH v2 07/10] arm64: dts: lx2160a: enable usb3-lpm-capable for usb3 nodes Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-03 23:54 ` [PATCH v2 08/10] arm64: dts: lx2162a-qds: support SD UHS-I and eMMC HS400 modes Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-03 23:54 ` [PATCH v2 09/10] arm64: dts: lx2162a-qds: add interrupt line for RTC node Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-03 23:54 ` [PATCH v2 10/10] arm64: dts: lx2162a-qds: enable CAN nodes Li Yang
2021-12-03 23:54   ` Li Yang
2021-12-06  5:58   ` Kuldeep Singh
2021-12-06  5:58     ` Kuldeep Singh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211214053945.GF10916@dragon \
    --to=shawnguo@kernel.org \
    --cc=Zhiqiang.Hou@nxp.com \
    --cc=leoyang.li@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.