mirror of
https://github.com/torvalds/linux
synced 2024-09-27 06:50:51 +00:00
[POWERPC] Fix RTC and device tree on linkstation machines
This fixes the RTC on linkstation ppc machines again, and updates the device tree: add rtc nodes on i2c, remove bogus 0-size cache-line declarations, rename interrupt-controller nodes, remove erroneous interrupt-parent line, accidentally introduced by a recent patch. Signed-off-by: G. Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
d13ae8620d
commit
f2d32db344
|
@ -33,12 +33,10 @@ cpus {
|
|||
PowerPC,603e { /* Really 8241 */
|
||||
device_type = "cpu";
|
||||
reg = <0>;
|
||||
clock-frequency = <bebc200>; /* Fixed by bootwrapper */
|
||||
timebase-frequency = <1743000>; /* Fixed by bootwrapper */
|
||||
bus-frequency = <0>; /* From bootloader */
|
||||
clock-frequency = <bebc200>; /* Fixed by bootloader */
|
||||
timebase-frequency = <1743000>; /* Fixed by bootloader */
|
||||
bus-frequency = <0>; /* Fixed by bootloader */
|
||||
/* Following required by dtc but not used */
|
||||
i-cache-line-size = <0>;
|
||||
d-cache-line-size = <0>;
|
||||
i-cache-size = <4000>;
|
||||
d-cache-size = <4000>;
|
||||
};
|
||||
|
@ -64,11 +62,19 @@ fec00000 fec00000 00300000 /* pci cfg regs */
|
|||
fef00000 fef00000 00100000>; /* pci iack */
|
||||
|
||||
i2c@80003000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
device_type = "i2c";
|
||||
compatible = "fsl-i2c";
|
||||
reg = <80003000 1000>;
|
||||
interrupts = <5 2>;
|
||||
interrupt-parent = <&mpic>;
|
||||
|
||||
rtc@32 {
|
||||
device_type = "rtc";
|
||||
compatible = "ricoh,rs5c372b";
|
||||
reg = <32>;
|
||||
};
|
||||
};
|
||||
|
||||
serial@80004500 {
|
||||
|
@ -91,7 +97,7 @@ serial@80004600 {
|
|||
interrupt-parent = <&mpic>;
|
||||
};
|
||||
|
||||
mpic: pic@80040000 {
|
||||
mpic: interrupt-controller@80040000 {
|
||||
#interrupt-cells = <2>;
|
||||
#address-cells = <0>;
|
||||
device_type = "open-pic";
|
||||
|
|
|
@ -33,12 +33,10 @@ cpus {
|
|||
PowerPC,603e { /* Really 8241 */
|
||||
device_type = "cpu";
|
||||
reg = <0>;
|
||||
clock-frequency = <fdad680>; /* Fixed by bootwrapper */
|
||||
timebase-frequency = <1F04000>; /* Fixed by bootwrapper */
|
||||
bus-frequency = <0>; /* From bootloader */
|
||||
clock-frequency = <fdad680>; /* Fixed by bootloader */
|
||||
timebase-frequency = <1F04000>; /* Fixed by bootloader */
|
||||
bus-frequency = <0>; /* Fixed by bootloader */
|
||||
/* Following required by dtc but not used */
|
||||
i-cache-line-size = <0>;
|
||||
d-cache-line-size = <0>;
|
||||
i-cache-size = <4000>;
|
||||
d-cache-size = <4000>;
|
||||
};
|
||||
|
@ -64,11 +62,19 @@ fec00000 fec00000 00300000 /* pci cfg regs */
|
|||
fef00000 fef00000 00100000>; /* pci iack */
|
||||
|
||||
i2c@80003000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
device_type = "i2c";
|
||||
compatible = "fsl-i2c";
|
||||
reg = <80003000 1000>;
|
||||
interrupts = <5 2>;
|
||||
interrupt-parent = <&mpic>;
|
||||
|
||||
rtc@32 {
|
||||
device_type = "rtc";
|
||||
compatible = "ricoh,rs5c372b";
|
||||
reg = <32>;
|
||||
};
|
||||
};
|
||||
|
||||
serial@80004500 {
|
||||
|
@ -91,8 +97,7 @@ serial@80004600 {
|
|||
interrupt-parent = <&mpic>;
|
||||
};
|
||||
|
||||
mpic: pic@80040000 {
|
||||
interrupt-parent = <&mpic>;
|
||||
mpic: interrupt-controller@80040000 {
|
||||
#interrupt-cells = <2>;
|
||||
#address-cells = <0>;
|
||||
device_type = "open-pic";
|
||||
|
|
Loading…
Reference in a new issue