Author: wmb Date: Mon Aug 20 23:55:40 2012 New Revision: 3207 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3207
Log: OLPC ARM - sorted out confusion about which of the two RTC nodes (internal vs. external) gets which device tree properties.
Modified: cpu/arm/mmp2/rtc.fth cpu/arm/mmp2/twsi.fth cpu/arm/olpc/rtc.fth
Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Mon Aug 20 23:53:06 2012 (r3206) +++ cpu/arm/mmp2/rtc.fth Mon Aug 20 23:55:40 2012 (r3207) @@ -1,6 +1,19 @@ \ 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) : int5-mask ( -- offset ) h# 16c +icu ; : int5-status@ ( -- value ) h# 154 icu@ ;
Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Mon Aug 20 23:53:06 2012 (r3206) +++ cpu/arm/mmp2/twsi.fth Mon Aug 20 23:55:40 2012 (r3207) @@ -195,13 +195,6 @@ h# d4034000 d# 31 4 true true 4 make-twsi-node \ TWSI6
-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 " touchscreen" name @@ -226,12 +219,6 @@ 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 - 0 0 " " " /" begin-package " twsi" name
Modified: cpu/arm/olpc/rtc.fth ============================================================================== --- cpu/arm/olpc/rtc.fth Mon Aug 20 23:53:06 2012 (r3206) +++ cpu/arm/olpc/rtc.fth Mon Aug 20 23:55:40 2012 (r3207) @@ -1,17 +1,9 @@ -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 : set-address ( -- ) @@ -29,8 +21,6 @@
headerless
-headerless - : ?clear h# 3f rtc@ h# 3e rtc@ bwjoin h# 55aa <> if h# 20 8 rtc! \ century