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

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

[POWERPC] fsl_spi: stop using device_type = "spi" 



Also:
- rename "fsl_spi" to "fsl,spi";
- add and use cell-index property, if found;
- split probing code out of fsl_spi_init, thus we can call
  it for legacy device_type probing and new "compatible" probing.

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

Documentation/powerpc/booting-without-of.txt

+4 −4
Original line number Diff line number Diff line
@@ -1568,8 +1568,8 @@ platforms are moved over to use the flattened-device-tree model. 
   ii) SPI (Serial Peripheral Interface)



   Required properties:

   - device_type : should be "spi".

   - compatible : should be "fsl_spi".

   - cell-index : SPI controller index.

   - compatible : should be "fsl,spi".

   - mode : the SPI operation mode, it can be "cpu" or "cpu-qe".

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

   - interrupts : <a b> where a is the interrupt number and b is a
@@ -1582,8 +1582,8 @@ platforms are moved over to use the flattened-device-tree model. 


   Example:

	spi@4c0 {

		device_type = "spi";

		compatible = "fsl_spi";

		cell-index = <0>;

		compatible = "fsl,spi";

		reg = <4c0 40>;

		interrupts = <82 0>;

		interrupt-parent = <700>;

arch/powerpc/boot/dts/mpc8313erdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ 
		};



		spi@7000 {

			device_type = "spi";

			compatible = "fsl_spi";

			cell-index = <0>;

			compatible = "fsl,spi";

			reg = <7000 1000>;

			interrupts = <10 8>;

			interrupt-parent = < &ipic >;

arch/powerpc/boot/dts/mpc832x_mds.dts

+4 −4
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ 
		};



		spi@4c0 {

			device_type = "spi";

			compatible = "fsl_spi";

			cell-index = <0>;

			compatible = "fsl,spi";

			reg = <4c0 40>;

			interrupts = <2>;

			interrupt-parent = < &qeic >;
@@ -232,8 +232,8 @@ 
		};



		spi@500 {

			device_type = "spi";

			compatible = "fsl_spi";

			cell-index = <1>;

			compatible = "fsl,spi";

			reg = <500 40>;

			interrupts = <1>;

			interrupt-parent = < &qeic >;

arch/powerpc/boot/dts/mpc832x_rdb.dts

+4 −4
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ 
		};



		spi@4c0 {

			device_type = "spi";

			compatible = "fsl_spi";

			cell-index = <0>;

			compatible = "fsl,spi";

			reg = <4c0 40>;

			interrupts = <2>;

			interrupt-parent = <&qeic>;
@@ -193,8 +193,8 @@ 
		};



		spi@500 {

			device_type = "spi";

			compatible = "fsl_spi";

			cell-index = <1>;

			compatible = "fsl,spi";

			reg = <500 40>;

			interrupts = <1>;

			interrupt-parent = <&qeic>;

arch/powerpc/boot/dts/mpc8349emitx.dts

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ 
		};



		spi@7000 {

			device_type = "spi";

			compatible = "fsl_spi";

			cell-index = <0>;

			compatible = "fsl,spi";

			reg = <7000 1000>;

			interrupts = <10 8>;

			interrupt-parent = < &ipic >;