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

Commit 56626f33 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

[POWERPC] QE: UCC nodes cleanup 



- get rid of `model = "UCC"' in the ucc nodes
  It isn't used anywhere, so remove it. If we'll ever need something
  like this, we'll use compatible property instead.
- replace last occurrences of device-id with cell-index.
  Drivers are modified for backward compatibility's sake.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent e24e788a

Documentation/powerpc/booting-without-of.txt

+2 −4
Original line number Diff line number Diff line
@@ -1645,8 +1645,7 @@ platforms are moved over to use the flattened-device-tree model. 
   - device_type : should be "network", "hldc", "uart", "transparent"

     "bisync", "atm", or "serial".

   - compatible : could be "ucc_geth" or "fsl_atm" and so on.

   - model : should be "UCC".

   - device-id : the ucc number(1-8), corresponding to UCCx in UM.

   - cell-index : the ucc number(1-8), corresponding to UCCx in UM.

   - reg : Offset and length of the register set for the device

   - interrupts : <a b> where a is the interrupt number and b is a

     field that represents an encoding of the sense and level
@@ -1699,8 +1698,7 @@ platforms are moved over to use the flattened-device-tree model. 
	ucc@2000 {

		device_type = "network";

		compatible = "ucc_geth";

		model = "UCC";

		device-id = <1>;

		cell-index = <1>;

		reg = <2000 200>;

		interrupts = <a0 0>;

		interrupt-parent = <700>;

arch/powerpc/boot/dts/mpc832x_mds.dts

+1 −6
Original line number Diff line number Diff line
@@ -255,9 +255,7 @@ 
		enet0: ucc@2200 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <3>;

			device-id = <3>;

			reg = <0x2200 0x200>;

			interrupts = <34>;

			interrupt-parent = <&qeic>;
@@ -271,9 +269,7 @@ 
		enet1: ucc@3200 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <4>;

			device-id = <4>;

			reg = <0x3200 0x200>;

			interrupts = <35>;

			interrupt-parent = <&qeic>;
@@ -287,8 +283,7 @@ 
		ucc@2400 {

			device_type = "serial";

			compatible = "ucc_uart";

			model = "UCC";

			device-id = <5>;	/* The UCC number, 1-7*/

			cell-index = <5>;	/* The UCC number, 1-7*/

			port-number = <0>;	/* Which ttyQEx device */

			soft-uart;		/* We need Soft-UART */

			reg = <0x2400 0x200>;

arch/powerpc/boot/dts/mpc832x_rdb.dts

+0 −4
Original line number Diff line number Diff line
@@ -208,9 +208,7 @@ 
		enet0: ucc@3000 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <2>;

			device-id = <2>;

			reg = <0x3000 0x200>;

			interrupts = <33>;

			interrupt-parent = <&qeic>;
@@ -224,9 +222,7 @@ 
		enet1: ucc@2200 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <3>;

			device-id = <3>;

			reg = <0x2200 0x200>;

			interrupts = <34>;

			interrupt-parent = <&qeic>;

arch/powerpc/boot/dts/mpc836x_mds.dts

+0 −4
Original line number Diff line number Diff line
@@ -257,9 +257,7 @@ 
		enet0: ucc@2000 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <1>;

			device-id = <1>;

			reg = <0x2000 0x200>;

			interrupts = <32>;

			interrupt-parent = <&qeic>;
@@ -274,9 +272,7 @@ 
		enet1: ucc@3000 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <2>;

			device-id = <2>;

			reg = <0x3000 0x200>;

			interrupts = <33>;

			interrupt-parent = <&qeic>;

arch/powerpc/boot/dts/mpc8568mds.dts

+0 −4
Original line number Diff line number Diff line
@@ -324,9 +324,7 @@ 
		enet2: ucc@2000 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <1>;

			device-id = <1>;

			reg = <2000 200>;

			interrupts = <20>;

			interrupt-parent = <&qeic>;
@@ -341,9 +339,7 @@ 
		enet3: ucc@3000 {

			device_type = "network";

			compatible = "ucc_geth";

			model = "UCC";

			cell-index = <2>;

			device-id = <2>;

			reg = <3000 200>;

			interrupts = <21>;

			interrupt-parent = <&qeic>;