Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f2d32db3443157e8f50c7c86b8ff1477c27d6e3e
Commit: f2d32db3443157e8f50c7c86b8ff1477c27d6e3e
Parent: d13ae8620dfdedfa7e9ab6d1eec294adc0516065
Author: Guennadi Liakhovetski <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 22 08:43:11 2007 +1000
Committer: Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Jul 26 16:12:17 2007 +1000
[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 <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
arch/powerpc/boot/dts/kuroboxHD.dts | 18 ++++++++++++------
arch/powerpc/boot/dts/kuroboxHG.dts | 19 ++++++++++++-------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts
b/arch/powerpc/boot/dts/kuroboxHD.dts
index a983680..1225374 100644
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -33,12 +33,10 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16
kuroboxHD.dts"
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 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16
kuroboxHD.dts"
fef00000 fef00000 00100000>; /* pci iack */
[EMAIL PROTECTED] {
+ #address-cells = <1>;
+ #size-cells = <0>;
device_type = "i2c";
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
interrupt-parent = <&mpic>;
+
+ [EMAIL PROTECTED] {
+ device_type = "rtc";
+ compatible = "ricoh,rs5c372b";
+ reg = <32>;
+ };
};
[EMAIL PROTECTED] {
@@ -91,7 +97,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16
kuroboxHD.dts"
interrupt-parent = <&mpic>;
};
- mpic: [EMAIL PROTECTED] {
+ mpic: [EMAIL PROTECTED] {
#interrupt-cells = <2>;
#address-cells = <0>;
device_type = "open-pic";
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts
b/arch/powerpc/boot/dts/kuroboxHG.dts
index 5cf42dc..579aa8b 100644
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -33,12 +33,10 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16
kuroboxHG.dts"
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 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16
kuroboxHG.dts"
fef00000 fef00000 00100000>; /* pci iack */
[EMAIL PROTECTED] {
+ #address-cells = <1>;
+ #size-cells = <0>;
device_type = "i2c";
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
interrupt-parent = <&mpic>;
+
+ [EMAIL PROTECTED] {
+ device_type = "rtc";
+ compatible = "ricoh,rs5c372b";
+ reg = <32>;
+ };
};
[EMAIL PROTECTED] {
@@ -91,8 +97,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16
kuroboxHG.dts"
interrupt-parent = <&mpic>;
};
- mpic: [EMAIL PROTECTED] {
- interrupt-parent = <&mpic>;
+ mpic: [EMAIL PROTECTED] {
#interrupt-cells = <2>;
#address-cells = <0>;
device_type = "open-pic";
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
