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

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

[POWERPC] QE: get rid of most device_types and model 



Now we're searching for "fsl,qe", "fsl,qe-muram", "fsl,qe-muram-data"
and "fsl,qe-ic".

Unfortunately it's still impossible to remove device_type = "qe"
from the existing device trees because older u-boots are looking for it.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent f67be814

Documentation/powerpc/booting-without-of.txt

+6 −5
Original line number Diff line number Diff line
@@ -1543,7 +1543,7 @@ platforms are moved over to use the flattened-device-tree model. 
   i) Root QE device



   Required properties:

   - device_type : should be "qe";

   - compatible : should be "fsl,qe";

   - model : precise model of the QE, Can be "QE", "CPM", or "CPM2"

   - reg : offset and length of the device registers.

   - bus-frequency : the clock frequency for QUICC Engine.
@@ -1557,8 +1557,7 @@ platforms are moved over to use the flattened-device-tree model. 
		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		device_type = "qe";

		model = "QE";

		compatible = "fsl,qe";

		ranges = <0 e0100000 00100000>;

		reg = <e0100000 480>;

		brg-frequency = <0>;
@@ -1781,7 +1780,7 @@ platforms are moved over to use the flattened-device-tree model. 
   vii) Multi-User RAM (MURAM)



   Required properties:

   - device_type : should be "muram".

   - compatible : should be "fsl,qe-muram", "fsl,cpm-muram".

   - mode : the could be "host" or "slave".

   - ranges : Should be defined as specified in 1) to describe the

      translation of MURAM addresses.
@@ -1791,10 +1790,12 @@ platforms are moved over to use the flattened-device-tree model. 
   Example:



	muram@10000 {

		device_type = "muram";

		compatible = "fsl,qe-muram", "fsl,cpm-muram";

		ranges = <0 00010000 0000c000>;



		data-only@0{

			compatible = "fsl,qe-muram-data",

				     "fsl,cpm-muram-data";

			reg = <0 c000>;

		};

	};

arch/powerpc/boot/dts/mpc832x_mds.dts

+5 −4
Original line number Diff line number Diff line
@@ -206,17 +206,18 @@ 
		#size-cells = <1>;

		device_type = "qe";

		compatible = "fsl,qe";

		model = "QE";

		ranges = <0 e0100000 00100000>;

		reg = <e0100000 480>;

		brg-frequency = <0>;

		bus-frequency = <BCD3D80>;



		muram@10000 {

			device_type = "muram";

			compatible = "fsl,qe-muram", "fsl,cpm-muram";

			ranges = <0 00010000 00004000>;



			data-only@0 {

				compatible = "fsl,qe-muram-data",

					     "fsl,cpm-muram-data";

				reg = <0 4000>;

			};

		};
@@ -320,9 +321,9 @@ 
			};

		};



		qeic: qeic@80 {

		qeic: interrupt-controller@80 {

			interrupt-controller;

			device_type = "qeic";

			compatible = "fsl,qe-ic";

			#address-cells = <0>;

			#interrupt-cells = <1>;

			reg = <80 80>;

arch/powerpc/boot/dts/mpc832x_rdb.dts

+6 −4
Original line number Diff line number Diff line
@@ -166,17 +166,19 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "qe";

		model = "QE";

		compatible = "fsl,qe";

		ranges = <0 e0100000 00100000>;

		reg = <e0100000 480>;

		brg-frequency = <0>;

		bus-frequency = <BCD3D80>;



		muram@10000 {

			device_type = "muram";

			compatible = "fsl,qe-muram", "fsl,cpm-muram";

			ranges = <0 00010000 00004000>;



			data-only@0 {

				compatible = "fsl,qe-muram-data",

					     "fsl,cpm-muram-data";

				reg = <0 4000>;

			};

		};
@@ -252,9 +254,9 @@ 
			};

		};



		qeic:qeic@80 {

		qeic:interrupt-controller@80 {

			interrupt-controller;

			device_type = "qeic";

			compatible = "fsl,qe-ic";

			#address-cells = <0>;

			#interrupt-cells = <1>;

			reg = <80 80>;

arch/powerpc/boot/dts/mpc836x_mds.dts

+6 −4
Original line number Diff line number Diff line
@@ -207,17 +207,19 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "qe";

		model = "QE";

		compatible = "fsl,qe";

		ranges = <0 e0100000 00100000>;

		reg = <e0100000 480>;

		brg-frequency = <0>;

		bus-frequency = <179A7B00>;



		muram@10000 {

			device_type = "muram";

			compatible = "fsl,qe-muram", "fsl,cpm-muram";

			ranges = <0 00010000 0000c000>;



			data-only@0{

				compatible = "fsl,qe-muram-data",

					     "fsl,cpm-muram-data";

				reg = <0 c000>;

			};

		};
@@ -303,9 +305,9 @@ 
			};

		};



		qeic: qeic@80 {

		qeic: interrupt-controller@80 {

			interrupt-controller;

			device_type = "qeic";

			compatible = "fsl,qe-ic";

			#address-cells = <0>;

			#interrupt-cells = <1>;

			reg = <80 80>;

arch/powerpc/boot/dts/mpc8568mds.dts

+6 −4
Original line number Diff line number Diff line
@@ -284,17 +284,19 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "qe";

		model = "QE";

		compatible = "fsl,qe";

		ranges = <0 e0080000 00040000>;

		reg = <e0080000 480>;

		brg-frequency = <0>;

		bus-frequency = <179A7B00>;



		muram@10000 {

			device_type = "muram";

			compatible = "fsl,qe-muram", "fsl,cpm-muram";

			ranges = <0 00010000 0000c000>;



			data-only@0{

				compatible = "fsl,qe-muram-data",

					     "fsl,cpm-muram-data";

				reg = <0 c000>;

			};

		};
@@ -385,9 +387,9 @@ 
			};

		};



		qeic: qeic@80 {

		qeic: interrupt-controller@80 {

			interrupt-controller;

			device_type = "qeic";

			compatible = "fsl,qe-ic";

			#address-cells = <0>;

			#interrupt-cells = <1>;

			reg = <80 80>;