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

Commit f991db1c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'agust/merge' into merge 

Anatolij writes:

Please pull two DTS fixes for MPC5125 tower board. Without
them the v3.13-rcX kernels do not boot.
parents 7d4151b5 11daf32b

arch/powerpc/boot/dts/mpc5125twr.dts

+5 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
		compatible = "fsl,mpc5121-immr";

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		ranges = <0x0 0x80000000 0x400000>;

		reg = <0x80000000 0x400000>;

		bus-frequency = <66000000>;	// 66 MHz ips bus
@@ -189,6 +188,10 @@ 
			reg = <0xA000 0x1000>;

		};



		// disable USB1 port

		// TODO:

		// correct pinmux config and fix USB3320 ulpi dependency

		// before re-enabling it

		usb@3000 {

			compatible = "fsl,mpc5121-usb2-dr";

			reg = <0x3000 0x400>;
@@ -197,6 +200,7 @@ 
			interrupts = <43 0x8>;

			dr_mode = "host";

			phy_type = "ulpi";

			status = "disabled";

		};



		// 5125 PSCs are not 52xx or 5121 PSC compatible