Commit e80ba461 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt

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

Anatolij Gustschin says:

<<
Please pull a device tree fix for v3.13. The booting on mpc512x
is broken since v3.13-rc1, this patch repairs it.
>>
parents 721cb59e c65ec135
...@@ -77,7 +77,6 @@ soc@80000000 { ...@@ -77,7 +77,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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment