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

Commit a66639d4 authored by Alessio Igor Bogani's avatar Alessio Igor Bogani Committed by Scott Wood
Browse files

powerpc/86xx: Move pci1 definition to the include file 



Signed-off-by: default avatarAlessio Igor Bogani <alessio.bogani@elettra.eu>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 4680c9d5

arch/powerpc/boot/dts/fsl/gef_ppc9a.dts

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ 
				  0x0 0x00400000>;

		};

	};



	pci1: pcie@fef09000 {

		status = "disabled";

	};

};



/include/ "mpc8641si-post.dtsi"

arch/powerpc/boot/dts/fsl/gef_sbc310.dts

+0 −22
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 
	model = "GEF_SBC310";

	compatible = "gef,sbc310";



	aliases {

		pci1 = &pci1;

	};



	memory {

		device_type = "memory";

		reg = <0x0 0x40000000>;	// set by uboot
@@ -223,29 +219,11 @@ 
	};



	pci1: pcie@fef09000 {

		compatible = "fsl,mpc8641-pcie";

		device_type = "pci";

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <0xfef09000 0x1000>;

		bus-range = <0x0 0xff>;

		ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000

			  0x01000000 0x0 0x00000000 0xfe400000 0x0 0x00400000>;

		clock-frequency = <100000000>;

		interrupts = <0x19 0x2 0 0>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			0x0000 0x0 0x0 0x1 &mpic 0x4 0x2

			0x0000 0x0 0x0 0x2 &mpic 0x5 0x2

			0x0000 0x0 0x0 0x3 &mpic 0x6 0x2

			0x0000 0x0 0x0 0x4 &mpic 0x7 0x2

			>;



		pcie@0 {

			reg = <0 0 0 0 0>;

			#size-cells = <2>;

			#address-cells = <3>;

			device_type = "pci";

			ranges = <0x02000000 0x0 0xc0000000

				  0x02000000 0x0 0xc0000000

				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/gef_sbc610.dts

+4 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ 
				  0x0 0x00400000>;

		};

	};



	pci1: pcie@fef09000 {

		status = "disabled";

	};

};



/include/ "mpc8641si-post.dtsi"

arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts

+1 −23
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
	model = "MPC8641HPCN";

	compatible = "fsl,mpc8641hpcn";



	aliases {

		pci1 = &pci1;

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>;	// 1G at 0x0
@@ -359,29 +355,11 @@ 
	};



	pci1: pcie@ffe09000 {

		compatible = "fsl,mpc8641-pcie";

		device_type = "pci";

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <0xffe09000 0x1000>;

		bus-range = <0 0xff>;

		ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000

			  0x01000000 0x0 0x00000000 0xffc10000 0x0 0x00010000>;

		clock-frequency = <100000000>;

		interrupts = <25 2 0 0>;

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

		interrupt-map = <

			/* IDSEL 0x0 */

			0x0000 0 0 1 &mpic 4 1

			0x0000 0 0 2 &mpic 5 1

			0x0000 0 0 3 &mpic 6 1

			0x0000 0 0 4 &mpic 7 1

			>;



		pcie@0 {

			reg = <0 0 0 0 0>;

			#size-cells = <2>;

			#address-cells = <3>;

			device_type = "pci";

			ranges = <0x02000000 0x0 0xa0000000

				  0x02000000 0x0 0xa0000000

				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts

+1 −23
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		pci1 = &pci1;

	};



	memory {

		device_type = "memory";

		reg = <0x0 0x00000000 0x0 0x40000000>;	// 1G at 0x0
@@ -326,29 +322,11 @@ 
	};



	pci1: pcie@fffe09000 {

		compatible = "fsl,mpc8641-pcie";

		device_type = "pci";

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <0x0f 0xffe09000 0x0 0x1000>;

		bus-range = <0x0 0xff>;

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

			  0x01000000 0x0 0x00000000 0x0f 0xffc10000 0x0 0x00010000>;

		clock-frequency = <100000000>;

		interrupts = <25 2 0 0>;

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

		interrupt-map = <

			/* IDSEL 0x0 */

			0x0000 0 0 1 &mpic 4 1

			0x0000 0 0 2 &mpic 5 1

			0x0000 0 0 3 &mpic 6 1

			0x0000 0 0 4 &mpic 7 1

			>;



		pcie@0 {

			reg = <0 0 0 0 0>;

			#size-cells = <2>;

			#address-cells = <3>;

			device_type = "pci";

			ranges = <0x02000000 0x0 0xe0000000

				  0x02000000 0x0 0xe0000000

				  0x0 0x20000000