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

Commit 84dfcb4b authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'kumar/kumar-for-2.6.28'

parents 34d81f85 672e806e

Documentation/powerpc/booting-without-of.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -1917,6 +1917,8 @@ platforms are moved over to use the flattened-device-tree model. 
			inverse clock polarity (CPOL) mode

			inverse clock polarity (CPOL) mode

    - spi-cpha        - (optional) Empty property indicating device requires

    - spi-cpha        - (optional) Empty property indicating device requires

			shifted clock phase (CPHA) mode

			shifted clock phase (CPHA) mode

    - spi-cs-high     - (optional) Empty property indicating device requires

			chip select active high





    SPI example for an MPC5200 SPI bus:

    SPI example for an MPC5200 SPI bus:

		spi@f00 {

		spi@f00 {

Documentation/powerpc/dts-bindings/fsl/board.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -2,13 +2,13 @@ 




Required properties:

Required properties:





 - device_type : Should be "board-control"

 - compatible : Should be "fsl,<board>-bcsr"

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

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





Example:

Example:





	bcsr@f8000000 {

	bcsr@f8000000 {

		device_type = "board-control";

		compatible = "fsl,mpc8360mds-bcsr";

		reg = <f8000000 8000>;

		reg = <f8000000 8000>;

	};

	};

arch/powerpc/boot/dts/mpc8315erdb.dts

+8 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,14 @@ 
				compatible = "dallas,ds1339";

				compatible = "dallas,ds1339";

				reg = <0x68>;

				reg = <0x68>;

			};

			};



			mcu_pio: mcu@a {

				#gpio-cells = <2>;

				compatible = "fsl,mc9s08qg8-mpc8315erdb",

					     "fsl,mcu-mpc8349emitx";

				reg = <0x0a>;

				gpio-controller;

			};

		};

		};





		spi@7000 {

		spi@7000 {

arch/powerpc/boot/dts/mpc832x_mds.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ 
	};

	};





	bcsr@f8000000 {

	bcsr@f8000000 {

		device_type = "board-control";

		compatible = "fsl,mpc8323mds-bcsr";

		reg = <0xf8000000 0x8000>;

		reg = <0xf8000000 0x8000>;

	};

	};

arch/powerpc/boot/dts/mpc8349emitx.dts

+16 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,14 @@ 
			interrupts = <15 0x8>;

			interrupts = <15 0x8>;

			interrupt-parent = <&ipic>;

			interrupt-parent = <&ipic>;

			dfsrr;

			dfsrr;



			rtc@68 {

				device_type = "rtc";

				compatible = "dallas,ds1339";

				reg = <0x68>;

				interrupts = <18 0x8>;

				interrupt-parent = <&ipic>;

			};

		};

		};





		spi@7000 {

		spi@7000 {
@@ -131,6 +139,14 @@ 
				interrupt-parent = <&ipic>;

				interrupt-parent = <&ipic>;

				interrupts = <71 8>;

				interrupts = <71 8>;

			};

			};



			mcu_pio: mcu@a {

				#gpio-cells = <2>;

				compatible = "fsl,mc9s08qg8-mpc8349emitx",

					     "fsl,mcu-mpc8349emitx";

				reg = <0x0a>;

				gpio-controller;

			};

		};

		};





		usb@22000 {

		usb@22000 {