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

Commit 1b3c5cda authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Move PCI nodes to be sibilings with SOC nodes 



Updated the device trees to have the PCI nodes be at the same level as
the SOC node.  This is to make it so that the SOC nodes children address
space is just on chip registers and not other bus memory as well.

Also, for PCIe nodes added a P2P bridge to handle the virtual P2P bridge
that exists in the PHB.

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

arch/powerpc/boot/dts/lite5200.dts

+21 −21
Original line number Diff line number Diff line
@@ -182,27 +182,6 @@ 
			interrupt-parent = <&mpc5200_pic>;

		};



		pci@0d00 {

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			device_type = "pci";

			compatible = "mpc5200-pci";

			reg = <d00 100>;

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

			interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3

			                 c000 0 0 2 &mpc5200_pic 0 0 3

			                 c000 0 0 3 &mpc5200_pic 0 0 3

			                 c000 0 0 4 &mpc5200_pic 0 0 3>;

			clock-frequency = <0>; // From boot loader

			interrupts = <2 8 0 2 9 0 2 a 0>;

			interrupt-parent = <&mpc5200_pic>;

			bus-range = <0 0>;

			ranges = <42000000 0 80000000 80000000 0 20000000

			          02000000 0 a0000000 a0000000 0 10000000

			          01000000 0 00000000 b0000000 0 01000000>;

		};



		spi@f00 {

			device_type = "spi";

			compatible = "mpc5200-spi";
@@ -337,4 +316,25 @@ 
			reg = <8000 4000>;

		};

	};



	pci@f0000d00 {

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		compatible = "mpc5200-pci";

		reg = <f0000d00 100>;

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

		interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3

				 c000 0 0 2 &mpc5200_pic 0 0 3

				 c000 0 0 3 &mpc5200_pic 0 0 3

				 c000 0 0 4 &mpc5200_pic 0 0 3>;

		clock-frequency = <0>; // From boot loader

		interrupts = <2 8 0 2 9 0 2 a 0>;

		interrupt-parent = <&mpc5200_pic>;

		bus-range = <0 0>;

		ranges = <42000000 0 80000000 80000000 0 20000000

			  02000000 0 a0000000 a0000000 0 10000000

			  01000000 0 00000000 b0000000 0 01000000>;

	};

};

arch/powerpc/boot/dts/lite5200b.dts

+26 −26
Original line number Diff line number Diff line
@@ -182,32 +182,6 @@ 
			interrupt-parent = <&mpc5200_pic>;

		};



		pci@0d00 {

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			device_type = "pci";

			compatible = "mpc5200b-pci\0mpc5200-pci";

			reg = <d00 100>;

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

			interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot

			                 c000 0 0 2 &mpc5200_pic 1 1 3

			                 c000 0 0 3 &mpc5200_pic 1 2 3

			                 c000 0 0 4 &mpc5200_pic 1 3 3



			                 c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot

			                 c800 0 0 2 &mpc5200_pic 1 2 3

			                 c800 0 0 3 &mpc5200_pic 1 3 3

			                 c800 0 0 4 &mpc5200_pic 0 0 3>;

			clock-frequency = <0>; // From boot loader

			interrupts = <2 8 0 2 9 0 2 a 0>;

			interrupt-parent = <&mpc5200_pic>;

			bus-range = <0 0>;

			ranges = <42000000 0 80000000 80000000 0 20000000

			          02000000 0 a0000000 a0000000 0 10000000

			          01000000 0 00000000 b0000000 0 01000000>;

		};



		spi@f00 {

			device_type = "spi";

			compatible = "mpc5200b-spi\0mpc5200-spi";
@@ -342,4 +316,30 @@ 
			reg = <8000 4000>;

		};

	};



	pci@f0000d00 {

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		compatible = "mpc5200b-pci\0mpc5200-pci";

		reg = <f0000d00 100>;

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

		interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot

				 c000 0 0 2 &mpc5200_pic 1 1 3

				 c000 0 0 3 &mpc5200_pic 1 2 3

				 c000 0 0 4 &mpc5200_pic 1 3 3



				 c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot

				 c800 0 0 2 &mpc5200_pic 1 2 3

				 c800 0 0 3 &mpc5200_pic 1 3 3

				 c800 0 0 4 &mpc5200_pic 0 0 3>;

		clock-frequency = <0>; // From boot loader

		interrupts = <2 8 0 2 9 0 2 a 0>;

		interrupt-parent = <&mpc5200_pic>;

		bus-range = <0 0>;

		ranges = <42000000 0 80000000 80000000 0 20000000

			  02000000 0 a0000000 a0000000 0 10000000

			  01000000 0 00000000 b0000000 0 01000000>;

	};

};

arch/powerpc/boot/dts/mpc8313erdb.dts

+30 −30
Original line number Diff line number Diff line
@@ -150,36 +150,6 @@ 
			interrupt-parent = < &ipic >;

		};



		pci@8500 {

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

			interrupt-map = <



					/* IDSEL 0x0E -mini PCI */

					 7000 0 0 1 &ipic 12 8

					 7000 0 0 2 &ipic 12 8

					 7000 0 0 3 &ipic 12 8

					 7000 0 0 4 &ipic 12 8



					/* IDSEL 0x0F - PCI slot */

					 7800 0 0 1 &ipic 11 8

					 7800 0 0 2 &ipic 12 8

					 7800 0 0 3 &ipic 11 8

					 7800 0 0 4 &ipic 12 8>;

			interrupt-parent = < &ipic >;

			interrupts = <42 8>;

			bus-range = <0 0>;

			ranges = <02000000 0 90000000 90000000 0 10000000

			          42000000 0 80000000 80000000 0 10000000

			          01000000 0 00000000 e2000000 0 00100000>;

			clock-frequency = <3f940aa>;

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};



		crypto@30000 {

			device_type = "crypto";

			model = "SEC2";
@@ -208,4 +178,34 @@ 
			device_type = "ipic";

		};

	};



	pci@e0008500 {

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

		interrupt-map = <



				/* IDSEL 0x0E -mini PCI */

				 7000 0 0 1 &ipic 12 8

				 7000 0 0 2 &ipic 12 8

				 7000 0 0 3 &ipic 12 8

				 7000 0 0 4 &ipic 12 8



				/* IDSEL 0x0F - PCI slot */

				 7800 0 0 1 &ipic 11 8

				 7800 0 0 2 &ipic 12 8

				 7800 0 0 3 &ipic 11 8

				 7800 0 0 4 &ipic 12 8>;

		interrupt-parent = < &ipic >;

		interrupts = <42 8>;

		bus-range = <0 0>;

		ranges = <02000000 0 90000000 90000000 0 10000000

			  42000000 0 80000000 80000000 0 10000000

			  01000000 0 00000000 e2000000 0 00100000>;

		clock-frequency = <3f940aa>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <e0008500 100>;

		compatible = "fsl,mpc8349-pci";

		device_type = "pci";

	};

};

arch/powerpc/boot/dts/mpc832x_mds.dts

+59 −59
Original line number Diff line number Diff line
@@ -97,65 +97,6 @@ 
			descriptor-types-mask = <0122003f>;

		};



		pci@8500 {

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

			interrupt-map = <

					/* IDSEL 0x11 AD17 */

					 8800 0 0 1 &ipic 14 8

					 8800 0 0 2 &ipic 15 8

					 8800 0 0 3 &ipic 16 8

					 8800 0 0 4 &ipic 17 8



					/* IDSEL 0x12 AD18 */

					 9000 0 0 1 &ipic 16 8

					 9000 0 0 2 &ipic 17 8

					 9000 0 0 3 &ipic 14 8

					 9000 0 0 4 &ipic 15 8



					/* IDSEL 0x13 AD19 */

					 9800 0 0 1 &ipic 17 8

					 9800 0 0 2 &ipic 14 8

					 9800 0 0 3 &ipic 15 8

					 9800 0 0 4 &ipic 16 8



					/* IDSEL 0x15 AD21*/

					 a800 0 0 1 &ipic 14 8

					 a800 0 0 2 &ipic 15 8

					 a800 0 0 3 &ipic 16 8

					 a800 0 0 4 &ipic 17 8



					/* IDSEL 0x16 AD22*/

					 b000 0 0 1 &ipic 17 8

					 b000 0 0 2 &ipic 14 8

					 b000 0 0 3 &ipic 15 8

					 b000 0 0 4 &ipic 16 8



					/* IDSEL 0x17 AD23*/

					 b800 0 0 1 &ipic 16 8

					 b800 0 0 2 &ipic 17 8

					 b800 0 0 3 &ipic 14 8

					 b800 0 0 4 &ipic 15 8



					/* IDSEL 0x18 AD24*/

					 c000 0 0 1 &ipic 15 8

					 c000 0 0 2 &ipic 16 8

					 c000 0 0 3 &ipic 17 8

					 c000 0 0 4 &ipic 14 8>;

			interrupt-parent = < &ipic >;

			interrupts = <42 8>;

			bus-range = <0 0>;

			ranges = <02000000 0 90000000 90000000 0 10000000

			          42000000 0 80000000 80000000 0 10000000

			          01000000 0 00000000 d0000000 0 00100000>;

			clock-frequency = <0>;

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};



		ipic: pic@700 {

			interrupt-controller;

			#address-cells = <0>;
@@ -335,4 +276,63 @@ 
			interrupt-parent = < &ipic >;

		};

	};



	pci@e0008500 {

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

		interrupt-map = <

				/* IDSEL 0x11 AD17 */

				 8800 0 0 1 &ipic 14 8

				 8800 0 0 2 &ipic 15 8

				 8800 0 0 3 &ipic 16 8

				 8800 0 0 4 &ipic 17 8



				/* IDSEL 0x12 AD18 */

				 9000 0 0 1 &ipic 16 8

				 9000 0 0 2 &ipic 17 8

				 9000 0 0 3 &ipic 14 8

				 9000 0 0 4 &ipic 15 8



				/* IDSEL 0x13 AD19 */

				 9800 0 0 1 &ipic 17 8

				 9800 0 0 2 &ipic 14 8

				 9800 0 0 3 &ipic 15 8

				 9800 0 0 4 &ipic 16 8



				/* IDSEL 0x15 AD21*/

				 a800 0 0 1 &ipic 14 8

				 a800 0 0 2 &ipic 15 8

				 a800 0 0 3 &ipic 16 8

				 a800 0 0 4 &ipic 17 8



				/* IDSEL 0x16 AD22*/

				 b000 0 0 1 &ipic 17 8

				 b000 0 0 2 &ipic 14 8

				 b000 0 0 3 &ipic 15 8

				 b000 0 0 4 &ipic 16 8



				/* IDSEL 0x17 AD23*/

				 b800 0 0 1 &ipic 16 8

				 b800 0 0 2 &ipic 17 8

				 b800 0 0 3 &ipic 14 8

				 b800 0 0 4 &ipic 15 8



				/* IDSEL 0x18 AD24*/

				 c000 0 0 1 &ipic 15 8

				 c000 0 0 2 &ipic 16 8

				 c000 0 0 3 &ipic 17 8

				 c000 0 0 4 &ipic 14 8>;

		interrupt-parent = < &ipic >;

		interrupts = <42 8>;

		bus-range = <0 0>;

		ranges = <02000000 0 90000000 90000000 0 10000000

			  42000000 0 80000000 80000000 0 10000000

			  01000000 0 00000000 d0000000 0 00100000>;

		clock-frequency = <0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <e0008500 100>;

		compatible = "fsl,mpc8349-pci";

		device_type = "pci";

	};

};

arch/powerpc/boot/dts/mpc832x_rdb.dts

+33 −33
Original line number Diff line number Diff line
@@ -92,39 +92,6 @@ 
			descriptor-types-mask = <0122003f>;

		};



		pci@8500 {

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

			interrupt-map = <

					/* IDSEL 0x10 AD16 (USB) */

					 8000 0 0 1 &pic 11 8



					/* IDSEL 0x11 AD17 (Mini1)*/

					 8800 0 0 1 &pic 12 8

					 8800 0 0 2 &pic 13 8

					 8800 0 0 3 &pic 14 8

					 8800 0 0 4 &pic 30 8



					/* IDSEL 0x12 AD18 (PCI/Mini2) */

					 9000 0 0 1 &pic 13 8

					 9000 0 0 2 &pic 14 8

					 9000 0 0 3 &pic 30 8

					 9000 0 0 4 &pic 11 8>;



			interrupt-parent = <&pic>;

			interrupts = <42 8>;

			bus-range = <0 0>;

			ranges = <42000000 0 80000000 80000000 0 10000000

			          02000000 0 90000000 90000000 0 10000000

			          01000000 0 d0000000 d0000000 0 04000000>;

			clock-frequency = <0>;

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};



		pic:pic@700 {

			interrupt-controller;

			#address-cells = <0>;
@@ -294,4 +261,37 @@ 
			interrupt-parent = <&pic>;

		};

	};



	pci@e0008500 {

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

		interrupt-map = <

				/* IDSEL 0x10 AD16 (USB) */

				 8000 0 0 1 &pic 11 8



				/* IDSEL 0x11 AD17 (Mini1)*/

				 8800 0 0 1 &pic 12 8

				 8800 0 0 2 &pic 13 8

				 8800 0 0 3 &pic 14 8

				 8800 0 0 4 &pic 30 8



				/* IDSEL 0x12 AD18 (PCI/Mini2) */

				 9000 0 0 1 &pic 13 8

				 9000 0 0 2 &pic 14 8

				 9000 0 0 3 &pic 30 8

				 9000 0 0 4 &pic 11 8>;



		interrupt-parent = <&pic>;

		interrupts = <42 8>;

		bus-range = <0 0>;

		ranges = <42000000 0 80000000 80000000 0 10000000

			  02000000 0 90000000 90000000 0 10000000

			  01000000 0 d0000000 d0000000 0 04000000>;

		clock-frequency = <0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <e0008500 100>;

		compatible = "fsl,mpc8349-pci";

		device_type = "pci";

	};

};