Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

			mode = "cpu";

		};

		dma@82a8 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8313-dma", "fsl,elo-dma";

			reg = <0x82a8 4>;

			ranges = <0 0x8100 0x1a8>;

			interrupt-parent = <&ipic>;

			interrupts = <71 8>;

			cell-index = <0>;

			dma-channel@0 {

				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";

				reg = <0 0x80>;

				cell-index = <0>;

				interrupt-parent = <&ipic>;

				interrupts = <71 8>;

			};

			dma-channel@80 {

				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";

				reg = <0x80 0x80>;

				cell-index = <1>;

				interrupt-parent = <&ipic>;

				interrupts = <71 8>;

			};

			dma-channel@100 {

				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";

				reg = <0x100 0x80>;

				cell-index = <2>;

				interrupt-parent = <&ipic>;

				interrupts = <71 8>;

			};

			dma-channel@180 {

				compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";

				reg = <0x180 0x28>;

				cell-index = <3>;

				interrupt-parent = <&ipic>;

				interrupts = <71 8>;

			};

		};

		/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */

		usb@23000 {

			compatible = "fsl-usb2-dr";