summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-30 14:48:27 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-30 14:48:27 +1100
commitf991db1cf1bdca43675b5d2df0af991719727029 (patch)
tree43d8f579d35a7ebfc90f6846efea68b00cd86c78
parent7d4151b5098fb0bf7f6f8d1156e1ab9d83260580 (diff)
parent11daf32be9a6041a2406c2cbf76b75a9c4a6eaaa (diff)
downloadlinux-f991db1cf1bdca43675b5d2df0af991719727029.tar.bz2
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.
-rw-r--r--arch/powerpc/boot/dts/mpc5125twr.dts6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc5125twr.dts b/arch/powerpc/boot/dts/mpc5125twr.dts
index 4177b62240c2..a618dfc13e4c 100644
--- a/arch/powerpc/boot/dts/mpc5125twr.dts
+++ b/arch/powerpc/boot/dts/mpc5125twr.dts
@@ -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