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

Commit 54986964 authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/85xx: Update SRIO device tree nodes 



Update all dts files that support SRIO controllers to match the new
fsl,srio device tree binding.

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

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

+15 −10
Original line number Diff line number Diff line
@@ -82,18 +82,19 @@ 
};



&rio {

	compatible = "fsl,srio";

	interrupts = <48 2 0 0>;

	#address-cells = <2>;

	#size-cells = <2>;

	compatible = "fsl,mpc8568-rapidio", "fsl,rapidio-delta";

	interrupts = <48 2 0 0 /* error     */

		      49 2 0 0 /* bell_outb */

		      50 2 0 0 /* bell_inb  */

		      53 2 0 0 /* msg1_tx   */

		      54 2 0 0 /* msg1_rx   */

		      55 2 0 0 /* msg2_tx   */

		      56 2 0 0 /* msg2_rx   */>;

	sleep = <&pmc 0x00080000   /* controller */

		 &pmc 0x00040000>; /* message unit */

	fsl,srio-rmu-handle = <&rmu>;

	sleep = <&pmc 0x00080000>;

	ranges;



	port1 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <1>;

	};

};



&soc {
@@ -178,6 +179,10 @@ 
	};



/include/ "pq3-mpic.dtsi"

/include/ "pq3-rmu-0.dtsi"

	rmu@d3000 {

		sleep = <&pmc 0x00040000>;

	};



	global-utilities@e0000 {

		#address-cells = <1>;

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

+20 −8
Original line number Diff line number Diff line
@@ -70,17 +70,25 @@ 
};



&rio {

	compatible = "fsl,srio";

	interrupts = <48 2 0 0>;

	#address-cells = <2>;

	#size-cells = <2>;

	compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta";

	interrupts = <48 2 0 0 /* error     */

		      49 2 0 0 /* bell_outb */

		      50 2 0 0 /* bell_inb  */

		      53 2 0 0 /* msg1_tx   */

		      54 2 0 0 /* msg1_rx   */

		      55 2 0 0 /* msg2_tx   */

		      56 2 0 0 /* msg2_rx   */>;

	fsl,srio-rmu-handle = <&rmu>;

	sleep = <&pmc 0x00080000>;

	ranges;



	port1 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <1>;

	};



	port2 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <2>;

	};

};



&soc {
@@ -159,6 +167,10 @@ 
	};



/include/ "pq3-mpic.dtsi"

/include/ "pq3-rmu-0.dtsi"

	rmu@d3000 {

		sleep = <&pmc 0x00040000>;

	};



	global-utilities@e0000 {

		#address-cells = <1>;

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

+20 −0
Original line number Diff line number Diff line
@@ -120,6 +120,26 @@ 
	};

};



&rio {

	compatible = "fsl,srio";

	interrupts = <16 2 1 11>;

	#address-cells = <2>;

	#size-cells = <2>;

	ranges;



	port1 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <1>;

	};



	port2 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <2>;

	};

};



&dcsr {

	#address-cells = <1>;

	#size-cells = <1>;

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

+20 −0
Original line number Diff line number Diff line
@@ -147,6 +147,26 @@ 
	};

};



&rio {

	compatible = "fsl,srio";

	interrupts = <16 2 1 11>;

	#address-cells = <2>;

	#size-cells = <2>;

	ranges;



	port1 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <1>;

	};



	port2 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <2>;

	};

};



&dcsr {

	#address-cells = <1>;

	#size-cells = <1>;

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

+17 −9
Original line number Diff line number Diff line
@@ -121,17 +121,24 @@ 
};



&rio {

	compatible = "fsl,srio";

	interrupts = <16 2 1 11>;

	#address-cells = <2>;

	#size-cells = <2>;

	compatible = "fsl,rapidio-delta";

	interrupts = <

		16 2 1 11 /* err_irq */

		56 2 0 0  /* bell_outb_irq */

		57 2 0 0  /* bell_inb_irq */

		60 2 0 0  /* msg1_tx_irq */

		61 2 0 0  /* msg1_rx_irq */

		62 2 0 0  /* msg2_tx_irq */

		63 2 0 0>; /* msg2_rx_irq */

	fsl,srio-rmu-handle = <&rmu>;

	ranges;



	port1 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <1>;

	};



	port2 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <2>;

	};

};



&dcsr {
@@ -280,6 +287,7 @@ 
			16 2 1 30>;

	};



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

/include/ "qoriq-mpic.dtsi"



	guts: global-utilities@e0000 {