* [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
@ 2007-07-21 22:43 Guennadi Liakhovetski
2007-07-23 1:26 ` David Gibson
0 siblings, 1 reply; 4+ messages in thread
From: Guennadi Liakhovetski @ 2007-07-21 22:43 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Let's fix rtc on linkstation ppc machines again, plus .dts cleanup as
suggested by Segher Boessenkool.
Thanks
Guennadi
---
Guennadi Liakhovetski
Device tree update: 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>
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 */
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 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
interrupt-parent = <&mpic>;
};
- mpic: pic@80040000 {
+ mpic: interrupt-controller@80040000 {
#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 */
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 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
interrupt-parent = <&mpic>;
};
- mpic: pic@80040000 {
- interrupt-parent = <&mpic>;
+ mpic: interrupt-controller@80040000 {
#interrupt-cells = <2>;
#address-cells = <0>;
device_type = "open-pic";
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
2007-07-21 22:43 [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup Guennadi Liakhovetski
@ 2007-07-23 1:26 ` David Gibson
2007-07-23 5:28 ` Guennadi Liakhovetski
0 siblings, 1 reply; 4+ messages in thread
From: David Gibson @ 2007-07-23 1:26 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linuxppc-dev, Paul Mackerras
On Sun, Jul 22, 2007 at 12:43:11AM +0200, Guennadi Liakhovetski wrote:
> Let's fix rtc on linkstation ppc machines again, plus .dts cleanup as
> suggested by Segher Boessenkool.
>
> Thanks
> Guennadi
> ---
> Guennadi Liakhovetski
>
> Device tree update: 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>
>
[snip]
> @@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
> 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>;
Ok, just making sure that rtc at 0x32 (decimal 50) is correct, rather
than at decimal 32.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
2007-07-23 1:26 ` David Gibson
@ 2007-07-23 5:28 ` Guennadi Liakhovetski
2007-07-23 5:30 ` David Gibson
0 siblings, 1 reply; 4+ messages in thread
From: Guennadi Liakhovetski @ 2007-07-23 5:28 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev, Paul Mackerras
On Mon, 23 Jul 2007, David Gibson wrote:
> On Sun, Jul 22, 2007 at 12:43:11AM +0200, Guennadi Liakhovetski wrote:
> [snip]
> > @@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
> > 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>;
>
> Ok, just making sure that rtc at 0x32 (decimal 50) is correct, rather
> than at decimal 32.
Yes, it is. I even tested it:-)
Thanks
Guennadi
---
Guennadi Liakhovetski
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup
2007-07-23 5:28 ` Guennadi Liakhovetski
@ 2007-07-23 5:30 ` David Gibson
0 siblings, 0 replies; 4+ messages in thread
From: David Gibson @ 2007-07-23 5:30 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linuxppc-dev, Paul Mackerras
On Mon, Jul 23, 2007 at 07:28:12AM +0200, Guennadi Liakhovetski wrote:
> On Mon, 23 Jul 2007, David Gibson wrote:
>
> > On Sun, Jul 22, 2007 at 12:43:11AM +0200, Guennadi Liakhovetski wrote:
> > [snip]
> > > @@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
> > > 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>;
> >
> > Ok, just making sure that rtc at 0x32 (decimal 50) is correct, rather
> > than at decimal 32.
>
> Yes, it is. I even tested it:-)
Ok, just making sure, since it's an easy mistake to make.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-07-23 5:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-21 22:43 [PATCH] Update kuroboxH[GD].dts with i2c rtc entries, cleanup Guennadi Liakhovetski
2007-07-23 1:26 ` David Gibson
2007-07-23 5:28 ` Guennadi Liakhovetski
2007-07-23 5:30 ` David Gibson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).