Commit ed2670b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pcie_kw-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc 



From Jason Cooper:
mvebu pcie driver (kirkwood) for v3.11

 - kirkwood
    - enable pcie driver
    - migrate boards over to pcie dt init

depends
 - mvebu/pcie
    - mvebu/of_pci

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

* tag 'pcie_kw-3.11' of git://git.infradead.org/users/jcooper/linux:
  arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree
  arm: kirkwood: convert QNAP TS219 to use DT for the PCIe interface
  arm: kirkwood: convert ZyXEL NSA310 to use DT for the PCIe interface
  arm: kirkwood: convert MPL CEC4 to use DT for the PCIe interface
  arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface
  arm: kirkwood: add SoC-level Device Tree data for PCIe interfaces
  arm: kirkwood: move PCIe window init to legacy driver
  pci: mvebu: enable driver usage on Kirkwood
parents a640874b 0d0632f5

Documentation/devicetree/bindings/pci/mvebu-pci.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Mandatory properties: 
- compatible: one of the following values:

    marvell,armada-370-pcie

    marvell,armada-xp-pcie

    marvell,kirkwood-pcie

- #address-cells, set to <3>

- #size-cells, set to <2>

- #interrupt-cells, set to <1>

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ 
	integratorcp.dtb

dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \

	kirkwood-db-88f6281.dtb \

	kirkwood-db-88f6282.dtb \

	kirkwood-dns320.dtb \

	kirkwood-dns325.dtb \

	kirkwood-dockstar.dtb \

arch/arm/boot/dts/kirkwood-6281.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -40,5 +40,36 @@ 
				marvell,function = "sdio";

			};

		};



		pcie-controller {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";



			#address-cells = <3>;

			#size-cells = <2>;



			bus-range = <0x00 0xff>;



			ranges = <0x82000000 0 0x00040000 0x00040000 0 0x00002000   /* Port 0.0 registers */

				  0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */

			          0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */



			pcie@1,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;

				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

				ranges;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &intc 9>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <0>;

				clocks = <&gate_clk 2>;

				status = "disabled";

			};

		};

	};

};

arch/arm/boot/dts/kirkwood-6282.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -65,5 +65,53 @@ 
			clocks = <&gate_clk 7>;

			status = "disabled";

		};



		pcie-controller {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";



			#address-cells = <3>;

			#size-cells = <2>;



			bus-range = <0x00 0xff>;



			ranges = <0x82000000 0 0x00040000 0x00040000 0 0x00002000   /* Port 0.0 registers */

			          0x82000000 0 0x00044000 0x00044000 0 0x00002000   /* Port 1.0 registers */

				  0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */

			          0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */



			pcie@1,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;

				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

				ranges;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &intc 9>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <0>;

				clocks = <&gate_clk 2>;

				status = "disabled";

			};



			pcie@2,0 {

				device_type = "pci";

				assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

				ranges;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &intc 10>;

				marvell,pcie-port = <1>;

				marvell,pcie-lane = <0>;

				clocks = <&gate_clk 18>;

				status = "disabled";

			};

		};

	};

};

arch/arm/boot/dts/kirkwood-db-88f6281.dts

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Marvell DB-88F6281-BP Development Board Setup

 *

 * Saeed Bishara <saeed@marvell.com>

 * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



/dts-v1/;



/include/ "kirkwood-db.dtsi"

/include/ "kirkwood-6281.dtsi"



/ {

	model = "Marvell DB-88F6281-BP Development Board";

	compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	ocp@f1000000 {

		pcie-controller {

			status = "okay";



			pcie@1,0 {

				status = "okay";

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE