Commit 8b8673b8 authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/85xx: Rework P2041RDB device tree 



Utilize new split between board & SoC, and new SoC device trees split
into pre & post utilizing 'template' includes for SoC IP blocks.

Other changes include:
* Adding of MPIC timer blocks
* Dropping "fsl,p2041-IP..." from compatibles for standard blocks
* Removed mpic interrupt-parent from dcsr-epu node, just use top level

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 941d71c7

arch/powerpc/boot/dts/fsl/p2041si-post.dtsi

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

 * P2041/P2040 Silicon/SoC Device Tree Source (post include)

 *

 * Copyright 2011 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



&lbc {

	compatible = "fsl,p2041-elbc", "fsl,elbc", "simple-bus";

	interrupts = <25 2 0 0>;

	#address-cells = <2>;

	#size-cells = <1>;

};



/* controller at 0x200000 */

&pci0 {

	compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;

	bus-range = <0x0 0xff>;

	clock-frequency = <33333333>;

	interrupts = <16 2 1 15>;

	pcie@0 {

		reg = <0 0 0 0 0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		interrupts = <16 2 1 15>;

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

		interrupt-map = <

			/* IDSEL 0x0 */

			0000 0 0 1 &mpic 40 1 0 0

			0000 0 0 2 &mpic 1 1 0 0

			0000 0 0 3 &mpic 2 1 0 0

			0000 0 0 4 &mpic 3 1 0 0

			>;

	};

};



/* controller at 0x201000 */

&pci1 {

	compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;

	bus-range = <0 0xff>;

	clock-frequency = <33333333>;

	interrupts = <16 2 1 14>;

	pcie@0 {

		reg = <0 0 0 0 0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		interrupts = <16 2 1 14>;

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

		interrupt-map = <

			/* IDSEL 0x0 */

			0000 0 0 1 &mpic 41 1 0 0

			0000 0 0 2 &mpic 5 1 0 0

			0000 0 0 3 &mpic 6 1 0 0

			0000 0 0 4 &mpic 7 1 0 0

			>;

	};

};



/* controller at 0x202000 */

&pci2 {

	compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";

	device_type = "pci";

	#size-cells = <2>;

	#address-cells = <3>;

	bus-range = <0x0 0xff>;

	clock-frequency = <33333333>;

	interrupts = <16 2 1 13>;

	pcie@0 {

		reg = <0 0 0 0 0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		interrupts = <16 2 1 13>;

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

		interrupt-map = <

			/* IDSEL 0x0 */

			0000 0 0 1 &mpic 42 1 0 0

			0000 0 0 2 &mpic 9 1 0 0

			0000 0 0 3 &mpic 10 1 0 0

			0000 0 0 4 &mpic 11 1 0 0

			>;

	};

};



&dcsr {

	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "fsl,dcsr", "simple-bus";



	dcsr-epu@0 {

		compatible = "fsl,dcsr-epu";

		interrupts = <52 2 0 0

			      84 2 0 0

			      85 2 0 0>;

		reg = <0x0 0x1000>;

	};

	dcsr-npc {

		compatible = "fsl,dcsr-npc";

		reg = <0x1000 0x1000 0x1000000 0x8000>;

	};

	dcsr-nxc@2000 {

		compatible = "fsl,dcsr-nxc";

		reg = <0x2000 0x1000>;

	};

	dcsr-corenet {

		compatible = "fsl,dcsr-corenet";

		reg = <0x8000 0x1000 0xB0000 0x1000>;

	};

	dcsr-dpaa@9000 {

		compatible = "fsl,p2041-dcsr-dpaa", "fsl,dcsr-dpaa";

		reg = <0x9000 0x1000>;

	};

	dcsr-ocn@11000 {

		compatible = "fsl,p2041-dcsr-ocn", "fsl,dcsr-ocn";

		reg = <0x11000 0x1000>;

	};

	dcsr-ddr@12000 {

		compatible = "fsl,dcsr-ddr";

		dev-handle = <&ddr1>;

		reg = <0x12000 0x1000>;

	};

	dcsr-nal@18000 {

		compatible = "fsl,p2041-dcsr-nal", "fsl,dcsr-nal";

		reg = <0x18000 0x1000>;

	};

	dcsr-rcpm@22000 {

		compatible = "fsl,p2041-dcsr-rcpm", "fsl,dcsr-rcpm";

		reg = <0x22000 0x1000>;

	};

	dcsr-cpu-sb-proxy@40000 {

		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";

		cpu-handle = <&cpu0>;

		reg = <0x40000 0x1000>;

	};

	dcsr-cpu-sb-proxy@41000 {

		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";

		cpu-handle = <&cpu1>;

		reg = <0x41000 0x1000>;

	};

	dcsr-cpu-sb-proxy@42000 {

		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";

		cpu-handle = <&cpu2>;

		reg = <0x42000 0x1000>;

	};

	dcsr-cpu-sb-proxy@43000 {

		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";

		cpu-handle = <&cpu3>;

		reg = <0x43000 0x1000>;

	};

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;

	device_type = "soc";

	compatible = "simple-bus";



	soc-sram-error {

		compatible = "fsl,soc-sram-error";

		interrupts = <16 2 1 29>;

	};



	corenet-law@0 {

		compatible = "fsl,corenet-law";

		reg = <0x0 0x1000>;

		fsl,num-laws = <32>;

	};



	ddr1: memory-controller@8000 {

		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";

		reg = <0x8000 0x1000>;

		interrupts = <16 2 1 23>;

	};



	cpc: l3-cache-controller@10000 {

		compatible = "fsl,p2041-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";

		reg = <0x10000 0x1000>;

		interrupts = <16 2 1 27>;

	};



	corenet-cf@18000 {

		compatible = "fsl,corenet-cf";

		reg = <0x18000 0x1000>;

		interrupts = <16 2 1 31>;

		fsl,ccf-num-csdids = <32>;

		fsl,ccf-num-snoopids = <32>;

	};



	iommu@20000 {

		compatible = "fsl,pamu-v1.0", "fsl,pamu";

		reg = <0x20000 0x4000>;

		interrupts = <

			24 2 0 0

			16 2 1 30>;

	};



/include/ "qoriq-mpic.dtsi"



	guts: global-utilities@e0000 {

		compatible = "fsl,qoriq-device-config-1.0";

		reg = <0xe0000 0xe00>;

		fsl,has-rstcr;

		#sleep-cells = <1>;

		fsl,liodn-bits = <12>;

	};



	pins: global-utilities@e0e00 {

		compatible = "fsl,qoriq-pin-control-1.0";

		reg = <0xe0e00 0x200>;

		#sleep-cells = <2>;

	};



	clockgen: global-utilities@e1000 {

		compatible = "fsl,p2041-clockgen", "fsl,qoriq-clockgen-1.0";

		reg = <0xe1000 0x1000>;

		clock-frequency = <0>;

	};



	rcpm: global-utilities@e2000 {

		compatible = "fsl,qoriq-rcpm-1.0";

		reg = <0xe2000 0x1000>;

		#sleep-cells = <1>;

	};



	sfp: sfp@e8000 {

		compatible = "fsl,p2041-sfp", "fsl,qoriq-sfp-1.0";

		reg	   = <0xe8000 0x1000>;

	};



	serdes: serdes@ea000 {

		compatible = "fsl,p2041-serdes";

		reg	   = <0xea000 0x1000>;

	};



/include/ "qoriq-dma-0.dtsi"

/include/ "qoriq-dma-1.dtsi"

/include/ "qoriq-espi-0.dtsi"

	spi@110000 {

		fsl,espi-num-chipselects = <4>;

	};



/include/ "qoriq-esdhc-0.dtsi"

	sdhc@114000 {

		sdhci,auto-cmd12;

	};



/include/ "qoriq-i2c-0.dtsi"

/include/ "qoriq-i2c-1.dtsi"

/include/ "qoriq-duart-0.dtsi"

/include/ "qoriq-duart-1.dtsi"

/include/ "qoriq-gpio-0.dtsi"

/include/ "qoriq-usb2-mph-0.dtsi"

		usb0: usb@210000 {

			phy_type = "utmi";

			port0;

		};



/include/ "qoriq-usb2-dr-0.dtsi"

		usb1: usb@211000 {

			dr_mode = "host";

			phy_type = "utmi";

		};



/include/ "qoriq-sata2-0.dtsi"

/include/ "qoriq-sata2-1.dtsi"

/include/ "qoriq-sec4.2-0.dtsi"

};

arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi

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

 * P2041 Silicon/SoC Device Tree Source (pre include)

 *

 * Copyright 2011 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



/dts-v1/;

/ {

	compatible = "fsl,P2041";

	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	aliases {

		ccsr = &soc;

		dcsr = &dcsr;



		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

		pci0 = &pci0;

		pci1 = &pci1;

		pci2 = &pci2;

		usb0 = &usb0;

		usb1 = &usb1;

		dma0 = &dma0;

		dma1 = &dma1;

		sdhc = &sdhc;

		msi0 = &msi0;

		msi1 = &msi1;

		msi2 = &msi2;



		crypto = &crypto;

		sec_jr0 = &sec_jr0;

		sec_jr1 = &sec_jr1;

		sec_jr2 = &sec_jr2;

		sec_jr3 = &sec_jr3;

		rtic_a = &rtic_a;

		rtic_b = &rtic_b;

		rtic_c = &rtic_c;

		rtic_d = &rtic_d;

		sec_mon = &sec_mon;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: PowerPC,e500mc@0 {

			device_type = "cpu";

			reg = <0>;

			next-level-cache = <&L2_0>;

			L2_0: l2-cache {

				next-level-cache = <&cpc>;

			};

		};

		cpu1: PowerPC,e500mc@1 {

			device_type = "cpu";

			reg = <1>;

			next-level-cache = <&L2_1>;

			L2_1: l2-cache {

				next-level-cache = <&cpc>;

			};

		};

		cpu2: PowerPC,e500mc@2 {

			device_type = "cpu";

			reg = <2>;

			next-level-cache = <&L2_2>;

			L2_2: l2-cache {

				next-level-cache = <&cpc>;

			};

		};

		cpu3: PowerPC,e500mc@3 {

			device_type = "cpu";

			reg = <3>;

			next-level-cache = <&L2_3>;

			L2_3: l2-cache {

				next-level-cache = <&cpc>;

			};

		};

	};

};

arch/powerpc/boot/dts/p2041rdb.dts

+9 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



/include/ "p2041si.dtsi"

/include/ "fsl/p2041si-pre.dtsi"



/ {

	model = "fsl,P2041RDB";
@@ -50,6 +50,8 @@ 
	};



	soc: soc@ffe000000 {

		ranges = <0x00000000 0xf 0xfe000000 0x1000000>;

		reg = <0xf 0xfe000000 0 0x00001000>;

		spi@110000 {

			flash@0 {

				#address-cells = <1>;
@@ -106,7 +108,7 @@ 
		};

	};



	localbus@ffe124000 {

	lbc: localbus@ffe124000 {

		reg = <0xf 0xfe124000 0 0x1000>;

		ranges = <0 0 0xf 0xe8000000 0x08000000>;
@@ -122,6 +124,7 @@ 
		reg = <0xf 0xfe200000 0 0x1000>;

		ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000

			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>;

		fsl,msi = <&msi0>;

		pcie@0 {

			ranges = <0x02000000 0 0xe0000000

				  0x02000000 0 0xe0000000
@@ -137,6 +140,7 @@ 
		reg = <0xf 0xfe201000 0 0x1000>;

		ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000

			  0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>;

		fsl,msi = <&msi1>;

		pcie@0 {

			ranges = <0x02000000 0 0xe0000000

				  0x02000000 0 0xe0000000
@@ -152,6 +156,7 @@ 
		reg = <0xf 0xfe202000 0 0x1000>;

		ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000

			  0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>;

		fsl,msi = <&msi2>;

		pcie@0 {

			ranges = <0x02000000 0 0xe0000000

				  0x02000000 0 0xe0000000
@@ -163,3 +168,5 @@ 
		};

	};

};



/include/ "fsl/p2041si-post.dtsi"

arch/powerpc/boot/dts/p2041si.dtsi

deleted100644 → 0
+0 −692

File deleted.

Preview size limit exceeded, changes collapsed.