mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
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.
This commit is contained in:
commit
f991db1cf1
1 changed files with 5 additions and 1 deletions
|
@ -58,7 +58,6 @@ soc@80000000 {
|
||||||
compatible = "fsl,mpc5121-immr";
|
compatible = "fsl,mpc5121-immr";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
#interrupt-cells = <2>;
|
|
||||||
ranges = <0x0 0x80000000 0x400000>;
|
ranges = <0x0 0x80000000 0x400000>;
|
||||||
reg = <0x80000000 0x400000>;
|
reg = <0x80000000 0x400000>;
|
||||||
bus-frequency = <66000000>; // 66 MHz ips bus
|
bus-frequency = <66000000>; // 66 MHz ips bus
|
||||||
|
@ -189,6 +188,10 @@ ioctl@a000 {
|
||||||
reg = <0xA000 0x1000>;
|
reg = <0xA000 0x1000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// disable USB1 port
|
||||||
|
// TODO:
|
||||||
|
// correct pinmux config and fix USB3320 ulpi dependency
|
||||||
|
// before re-enabling it
|
||||||
usb@3000 {
|
usb@3000 {
|
||||||
compatible = "fsl,mpc5121-usb2-dr";
|
compatible = "fsl,mpc5121-usb2-dr";
|
||||||
reg = <0x3000 0x400>;
|
reg = <0x3000 0x400>;
|
||||||
|
@ -197,6 +200,7 @@ usb@3000 {
|
||||||
interrupts = <43 0x8>;
|
interrupts = <43 0x8>;
|
||||||
dr_mode = "host";
|
dr_mode = "host";
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
// 5125 PSCs are not 52xx or 5121 PSC compatible
|
// 5125 PSCs are not 52xx or 5121 PSC compatible
|
||||||
|
|
Loading…
Reference in a new issue