Changeset 3207

Timestamp:

Aug 20, 2012 11:55:40 PM (9 months ago)

Author:

wmb

Message:

OLPC ARM - sorted out confusion about which of the two RTC nodes (internal vs. external) gets which device tree properties.

Location:

cpu/arm

Files:

• mmp2/rtc.fth (modified) (1 diff)
• mmp2/twsi.fth (modified) (2 diffs)
• olpc/rtc.fth (modified) (2 diffs)

cpu/arm/mmp2/rtc.fth

@@ -1 +1 @@
 \ See license at end of file
 purpose: Driver for MMP2 internal RTC
+
+0 0  " d4010000"  " /" begin-package
+   " rtc" name
+   " mrvl,mmp-rtc" +compatible
+   my-address my-space  h# 1000 reg
+
+   d# 1 encode-int  0 encode-int encode+ " interrupts" property
+   " /interrupt-controller/interrupt-controller@154" encode-phandle " interrupt-parent" property
+
+   " rtc 1Hz" encode-string " rtc alarm" encode-string  encode+ " interrupt-names" property
+         
+   " /apbc" encode-phandle 0 encode-int encode+ " clocks" property
+end-package
 
 \ Interrupt 5 combines two interrupt inputs, RTC INT (bit 1) and RTC ALARM (bit 0)

cpu/arm/mmp2/twsi.fth

@@ -196 +196 @@
 
 
-0 0  " 1a" " /i2c@d4011000" begin-package  \ TWSI1
-   " audio-codec" name
-   " realtek,alc5631" +compatible
-   " realtek,rt5631" +compatible
-   my-address my-space 1 reg
-end-package
-
 [ifdef] soon-olpc-cl2  \ this breaks cl4-a1 boards, which ofw calls cl2.
 0 0  " 30" " /i2c@d4033000" begin-package  \ TWSI4
@@ -224 +217 @@
    " accelerometer" name
    " lis3lv02d" +compatible
-   my-address my-space 1 reg
-end-package
-
-0 0  " 68" " /i2c@d4031000" begin-package  \ TWSI2
-   " rtc" name
-   " idt,idt1338-rtc" +compatible
    my-address my-space 1 reg
 end-package

cpu/arm/olpc/rtc.fth

@@ -1 @@
-purpose: Driver for MMP internal RTC block
+purpose: Driver for external IDT1388 RTC chip on XO-1.75
 
-0 0  " d4010000"  " /" begin-package
+0 0  " 68" " /i2c@d4031000" begin-package  \ TWSI2
    " rtc" name
-   " mrvl,mmp-rtc" +compatible
-   my-address my-space  h# 1000 reg
-
-   d# 1 encode-int  0 encode-int encode+ " interrupts" property
-   " /interrupt-controller/interrupt-controller@154" encode-phandle " interrupt-parent" property
-
-   " rtc 1Hz" encode-string " rtc alarm" encode-string  encode+ " interrupt-names" property
-
-         
-   " /apbc" encode-phandle 0 encode-int encode+ " clocks" property
+   " idt,idt1338-rtc" +compatible
+   my-address my-space 1 reg
 
 [ifdef] cl2-a1
@@ -27 +19 @@
 : rtc!  ( byte reg# -- )  set-address  twsi-b!  ;
 [then]
-
-headerless
 
 headerless