Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b83e445d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/dwc' 

  - Make kirin_dw_pcie_ops constant (Nishka Dasgupta)

  - Make DesignWare "num-lanes" property optional and remove from relevant
    DTs (Hou Zhiqiang)

* remotes/lorenzo/pci/dwc:
  arm64: dts: fsl: Remove num-lanes property from PCIe nodes
  ARM: dts: ls1021a: Remove num-lanes property from PCIe nodes
  PCI: dwc: Return directly when num-lanes is not found
  dt-bindings: PCI: designware: Remove the num-lanes from Required properties
  PCI: kirin: Make structure kirin_dw_pcie_ops constant
parents af47f25f 4035ff36

Documentation/devicetree/bindings/pci/designware-pcie.txt

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ Required properties: 
	     the ATU address space.

    (The old way of getting the configuration address space from "ranges"

    is deprecated and should be avoided.)

- num-lanes: number of lanes to use

RC mode:

- #address-cells: set to <3>

- #size-cells: set to <2>

arch/arm/boot/dts/ls1021a.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -874,7 +874,6 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			num-lanes = <4>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -899,7 +898,6 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			num-lanes = <4>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */

arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			num-lanes = <4>;

			num-viewport = <2>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */

arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ 
			#size-cells = <2>;

			device_type = "pci";

			dma-coherent;

			num-lanes = <4>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -704,7 +703,6 @@ 
			#size-cells = <2>;

			device_type = "pci";

			dma-coherent;

			num-lanes = <2>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -731,7 +729,6 @@ 
			#size-cells = <2>;

			device_type = "pci";

			dma-coherent;

			num-lanes = <2>;

			num-viewport = <6>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000   /* downstream I/O */

arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -649,7 +649,6 @@ 
			#size-cells = <2>;

			device_type = "pci";

			dma-coherent;

			num-lanes = <4>;

			num-viewport = <8>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -671,7 +670,6 @@ 
			reg-names = "regs", "addr_space";

			num-ib-windows = <6>;

			num-ob-windows = <8>;

			num-lanes = <2>;

			status = "disabled";

		};
@@ -687,7 +685,6 @@ 
			#size-cells = <2>;

			device_type = "pci";

			dma-coherent;

			num-lanes = <2>;

			num-viewport = <8>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -709,7 +706,6 @@ 
			reg-names = "regs", "addr_space";

			num-ib-windows = <6>;

			num-ob-windows = <8>;

			num-lanes = <2>;

			status = "disabled";

		};
@@ -725,7 +721,6 @@ 
			#size-cells = <2>;

			device_type = "pci";

			dma-coherent;

			num-lanes = <2>;

			num-viewport = <8>;

			bus-range = <0x0 0xff>;

			ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -747,7 +742,6 @@ 
			reg-names = "regs", "addr_space";

			num-ib-windows = <6>;

			num-ob-windows = <8>;

			num-lanes = <2>;

			status = "disabled";

		};