August 2012 - openfirmware - mail.coreboot.org

[commit] r3267 - cpu/arm/olpc/cl4
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: wmb Date: Fri Aug 31 21:08:16 2012 New Revision: 3267 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3267 Log: Q7A10 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Fri Aug 31 11:44:22 2012 (r3266) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Aug 31 21:08:16 2012 (r3267) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 09 +macro: FW_MINOR 10 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3266 - cpu/arm/olpc
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: quozl Date: Fri Aug 31 11:44:22 2012 New Revision: 3266 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3266 Log: OLPC XO-4 - bsl, stack effect error in force-erase, junk left, caught by Chia-Hsiu. Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Fri Aug 31 08:19:41 2012 (r3265) +++ cpu/arm/olpc/bsl.fth Fri Aug 31 11:44:22 2012 (r3266) @@ -356,21 +356,27 @@ : force-erase ( -- ) rst-bsl - ff-password ack? dup 0= if - drop - neo-password ack? dup 0= if - drop - ff-password ack? dup 0= if - drop - ." BSL is locked" exit - then - then - then + ff-password ack? dup 0= if ( ff? ) + drop ( ) + neo-password ack? dup 0= if ( neo? ) + drop ( ) + ff-password ack? dup 0= if ( ff-neo-ff? ) + drop ( ) + ." BSL is locked" exit ( ) + else ( ff-neo-ff? ) + drop ( ) + then ( ) + else ( neo? ) + drop ( ) + then ( ) + else ( ff? ) + drop ( ) + then ( ) erase-main null-ffde! calibration-missing if - do-calibration null-ffde! + do-calibration null-ffde! then ;

1 0

[commit] r3265 - in cpu/arm: mmp2 olpc
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: quozl Date: Fri Aug 31 08:19:41 2012 New Revision: 3265 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3265 Log: OLPC XO-4 - Neonode, multitouch graphical test Modified: cpu/arm/mmp2/twsi-node.fth cpu/arm/olpc/nn-touchscreen.fth cpu/arm/olpc/rm3150-touchscreen.fth cpu/arm/olpc/touchscreen-common.fth Modified: cpu/arm/mmp2/twsi-node.fth ============================================================================== --- cpu/arm/mmp2/twsi-node.fth Fri Aug 31 02:44:16 2012 (r3264) +++ cpu/arm/mmp2/twsi-node.fth Fri Aug 31 08:19:41 2012 (r3265) @@ -56,6 +56,7 @@ : bytes-out-in ( out ... #outs #ins -- in ... ) " bytes-out-in" $call-twsi ; : get ( #bytes -- bytes ... ) 0 swap bytes-out-in ; +: read-bytes ( adr len -- ) " read-bytes" $call-twsi ; : reg-b@ ( reg# -- b ) " reg-b@" $call-twsi ; : reg-b! ( b reg# -- ) " reg-b!" $call-twsi ; Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Fri Aug 31 02:44:16 2012 (r3264) +++ cpu/arm/olpc/nn-touchscreen.fth Fri Aug 31 08:19:41 2012 (r3265) @@ -534,47 +534,73 @@ key drop ; +: (scribble) + begin + in? if + pbuf 2+ c@ h# 04 = if \ touch notification event + pbuf 3 + c@ 0 do \ per subpacket loop + pbuf 4 + i 9 * + >r ( r:addr ) + screen-w r@ w@ - ( x r:addr ) + r@ wa1+ w@ ( x y r:addr ) + r> 4 + c@ 2 rshift setcolor ( x y ) + dot + loop + then + then + exit-test? until +; + : scribble + configure + \ FIXME: tune with set scanning frequency request cursor-off + consume + begin in? 0= until background - begin - stream-poll? if drop dot then - key? until + (scribble) cursor-on - \ FIXME: tune the event frequency with set scanning frequency request + page ; -: selftest ( -- error? ) +: ir-pcb-smt ( -- error? ) + hold-reset connect + open if test-os else fault then + hold-reset disconnect + faults +; - 0 to faults +: ir-pcb-assy ( -- error? ) + hold-reset connect + open if test-fll else fault then + hold-reset disconnect + faults +; - test-station h# 11 = if \ IR PCB SMT - hold-reset connect - open if test-os else fault then - hold-reset disconnect - faults exit - then - - test-station h# 12 = if \ IR PCB ASSY - hold-reset connect - open if test-fll else fault then - hold-reset disconnect - faults exit - then - - test-station h# 1 = if \ MB SMT - open 0= if true exit then - test-version - close - false exit - then +: mb-smt ( -- error? ) + open 0= if true exit then + test-version + close + false +; +: mb-assy ( -- error? ) [ifdef] nn-ir-pcb-rev-b - test-station h# 2 = if \ MB ASSY - open if test-finger-down-each-edge else fault then - faults exit - then + open 0= if true exit then + test-finger-down-each-edge + faults [then] +; + +: selftest ( -- error? ) + + 0 to faults + + test-station case + h# 1 = of mb-smt exit endof + h# 2 = of mb-assy exit endof + h# 11 = of ir-pcb-smt exit endof + h# 12 = of ir-pcb-assy exit endof + endcase \ MB FINAL \ MB SHIP Modified: cpu/arm/olpc/rm3150-touchscreen.fth ============================================================================== --- cpu/arm/olpc/rm3150-touchscreen.fth Fri Aug 31 02:44:16 2012 (r3264) +++ cpu/arm/olpc/rm3150-touchscreen.fth Fri Aug 31 08:19:41 2012 (r3265) @@ -120,7 +120,7 @@ cursor-off \ Consume already-queued keys to prevent premature exit - begin key? while key drop repeat + consume \ Consume already-queued trackpad events to prevent premature exit d# 100 0 do Modified: cpu/arm/olpc/touchscreen-common.fth ============================================================================== --- cpu/arm/olpc/touchscreen-common.fth Fri Aug 31 02:44:16 2012 (r3264) +++ cpu/arm/olpc/touchscreen-common.fth Fri Aug 31 08:19:41 2012 (r3265) @@ -166,6 +166,10 @@ key? dup if key drop then ( exit? ) ; +: consume + begin key? while key drop repeat +; + 0 value pressure \ LICENSE_BEGIN

1 0

[commit] r3264 - cpu/arm/mmp2
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: wmb Date: Fri Aug 31 02:44:16 2012 New Revision: 3264 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3264 Log: OLPC XO-4 - the "1 GHz" speed is actually nominally 1.063, not 1.067. Modified: cpu/arm/mmp2/clocks.fth Modified: cpu/arm/mmp2/clocks.fth ============================================================================== --- cpu/arm/mmp2/clocks.fth Fri Aug 31 02:33:38 2012 (r3263) +++ cpu/arm/mmp2/clocks.fth Fri Aug 31 02:44:16 2012 (r3264) @@ -96,7 +96,7 @@ 0 of d# 400,000,000 pj4-clkdiv 1+ / endof ( hz ) 1 of d# 800,000,000 endof ( hz ) 2 of d# 26,000,000 pll2-fbdiv pll2-refdiv */ endof ( hz ) - 3 of d# 1,067,000,000 endof ( hz ) + 3 of d# 1,063,000,000 endof ( hz ) endcase d# 1,000,000 / ( mhz ) ;

1 0

[commit] r3263 - cpu/arm/mmp2
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: wmb Date: Fri Aug 31 02:33:38 2012 New Revision: 3263 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3263 Log: OLPC ARM - Changed the compatible name lists for the apbc and pmua nodes so they tell the Linux driver which style of power island fiddling to use. Modified: cpu/arm/mmp2/apbc.fth cpu/arm/mmp2/pmua.fth Modified: cpu/arm/mmp2/apbc.fth ============================================================================== --- cpu/arm/mmp2/apbc.fth Fri Aug 31 02:32:00 2012 (r3262) +++ cpu/arm/mmp2/apbc.fth Fri Aug 31 02:33:38 2012 (r3263) @@ -1,7 +1,11 @@ 0 0 " " " /" begin-package " apbc" name " mrvl,pxa-apbc" +compatible -" mrvl,mmp2-apbc" +compatible +[ifdef] mmp3 +" marvell,mmp3-apbc" +compatible +[else] +" marvell,mmp2-apbc" +compatible +[then] h# d4015000 h# 1000 reg 1 " #clock-cells" integer-property Modified: cpu/arm/mmp2/pmua.fth ============================================================================== --- cpu/arm/mmp2/pmua.fth Fri Aug 31 02:32:00 2012 (r3262) +++ cpu/arm/mmp2/pmua.fth Fri Aug 31 02:33:38 2012 (r3263) @@ -30,7 +30,11 @@ 0 0 " " " /" begin-package " pmua" name " mrvl,pxa-apmu" +compatible -" mrvl,mmp2-apmu" +compatible +[ifdef] mmp3 +" marvell,mmp3-apmu" +compatible +[else] +" marvell,mmp2-apmu" +compatible +[then] h# d4282800 h# 1000 reg 1 " #clock-cells" integer-property @@ -153,9 +157,9 @@ begin audio-clk pmua@ 4 and 0= until \ And wait until done \ Bring audio island out of reset - 1 audio-dsa pmua-set - 4 audio-dsa pmua-set - 1 audio-dsa pmua-set + 1 audio-dsa pmua-set \ Unreset AXI + 4 audio-dsa pmua-set \ Unreset APB + 1 audio-dsa pmua-set \ Unreset AXI (redundant?) \ Enable dummy clocks to the SRAMs h# 10 isld-dspa-ctrl pmua-set d# 250 us h# 10 isld-dspa-ctrl pmua-clr @@ -179,7 +183,7 @@ h# 100 audio-clk pmua-clr \ Enable isolation h# c audio-sram-pwr pmua-clr \ Audio core off h# 3 audio-sram-pwr pmua-clr \ Audio SRAM off - h# 600 audio-clk pmua-clr \ Enable isolation + h# 600 audio-clk pmua-clr \ Power switch off [else] h# 710 audio-clk pmua! \ Set peripheral reset h# 610 audio-clk pmua! \ Enable isolation

1 0

[commit] r3262 - in cpu/arm: mmp2 olpc
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: wmb Date: Fri Aug 31 02:32:00 2012 New Revision: 3262 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3262 Log: OLPC ARM - Added "reg-w@" and "reg-w!" to the list of I2C interface methods and used them in the codec driver. Modified: cpu/arm/mmp2/twsi-node.fth cpu/arm/mmp2/twsi-package.fth cpu/arm/olpc/sound.fth Modified: cpu/arm/mmp2/twsi-node.fth ============================================================================== --- cpu/arm/mmp2/twsi-node.fth Fri Aug 31 02:22:54 2012 (r3261) +++ cpu/arm/mmp2/twsi-node.fth Fri Aug 31 02:32:00 2012 (r3262) @@ -59,6 +59,8 @@ : reg-b@ ( reg# -- b ) " reg-b@" $call-twsi ; : reg-b! ( b reg# -- ) " reg-b!" $call-twsi ; +: reg-w@ ( reg# -- b ) " reg-w@" $call-twsi ; +: reg-w! ( b reg# -- ) " reg-w!" $call-twsi ; : bytes-out ( byte .. #bytes -- ) " bytes-out" $call-twsi ; \ Useful range is 25K .. 400K - 100K and 400K are typical Modified: cpu/arm/mmp2/twsi-package.fth ============================================================================== --- cpu/arm/mmp2/twsi-package.fth Fri Aug 31 02:22:54 2012 (r3261) +++ cpu/arm/mmp2/twsi-package.fth Fri Aug 31 02:32:00 2012 (r3262) @@ -139,6 +139,9 @@ : reg-b@ ( reg -- byte ) 1 1 bytes-out-in ; : reg-b! ( byte reg -- ) 2 bytes-out ; +: reg-w@ ( reg -- word ) 1 2 bytes-out-in swap bwjoin ; +: reg-w! ( word reg -- ) >r wbsplit r> 3 bytes-out ; + : set-bus-standard cr-set h# 18000 invert and to cr-set ; : set-bus-fast cr-set h# 18000 invert and h# 8000 or to cr-set ; Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Fri Aug 31 02:22:54 2012 (r3261) +++ cpu/arm/olpc/sound.fth Fri Aug 31 02:32:00 2012 (r3262) @@ -7,8 +7,8 @@ " rt5631-hifi" " dai-name" string-property \ snd_soc_dai_link.codec_dai_name : open ( -- true ) my-unit " set-address" $call-parent true ; : close ( -- ) ; - : codec@ ( reg# -- w ) 1 2 " bytes-out-in" $call-parent swap bwjoin ; - : codec! ( w reg# -- ) >r wbsplit r> 3 " bytes-out" $call-parent ; + : codec@ ( reg# -- w ) " reg-w@" $call-parent ; + : codec! ( w reg# -- ) " reg-w!" $call-parent ; finish-device device-end

1 0

[commit] r3261 - cpu/arm/olpc
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: wmb Date: Fri Aug 31 02:22:54 2012 New Revision: 3261 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3261 Log: Fixed a commentary typo in the previous checkin. Modified: cpu/arm/olpc/gpio-i2c.fth Modified: cpu/arm/olpc/gpio-i2c.fth ============================================================================== --- cpu/arm/olpc/gpio-i2c.fth Fri Aug 31 02:22:06 2012 (r3260) +++ cpu/arm/olpc/gpio-i2c.fth Fri Aug 31 02:22:54 2012 (r3261) @@ -49,8 +49,8 @@ cam-sda-gpio# to smb-data-gpio# slave-address to smb-slave ; - \ Since this I2C bus is dedicated to the DCON, we save space by - \ implementing only the methods that the DCON uses + \ Since this I2C bus is dedicated to the camera sensor, we save space by + \ implementing only the methods that the sensor uses : reg-b@ ( reg# -- b ) smb-setup smb-byte@ ; : reg-b! ( b reg# -- ) smb-setup smb-byte! ; : open ( -- flag ) true ;

1 0

[commit] r3260 - cpu/arm/olpc dev/olpc/dcon
by repository service Aug. 31, 2012

Aug. 31, 2012

Author: wmb Date: Fri Aug 31 02:22:06 2012 New Revision: 3260 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3260 Log: OLPC ARM - Converted the MMP2 DCON driver to call it's I2C parent bus for I2C services, instead of using the bit-banged SMBUS driver directly. Also added I2C methods to the parent node for the image sensor, paving the way for later conversion of that driver. Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/gpio-i2c.fth dev/olpc/dcon/mmp2dcon.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Aug 31 01:52:44 2012 (r3259) +++ cpu/arm/olpc/build-fw.fth Fri Aug 31 02:22:06 2012 (r3260) @@ -101,6 +101,8 @@ fload ${BP}/cpu/arm/mmp2/watchdog.fth \ reset-all using watchdog timer +fload ${BP}/cpu/arm/olpc/smbus.fth \ Bit-banged SMBUS (I2C) using GPIOs + fload ${BP}/cpu/arm/olpc/gpio-i2c.fth fload ${BP}/cpu/arm/olpc/twsi-i2c.fth @@ -134,8 +136,6 @@ \needs md5init fload ${BP}/ofw/ppp/md5.fth \ MD5 hash -fload ${BP}/cpu/arm/olpc/smbus.fth \ Bit-banged SMBUS (I2C) using GPIOs - fload ${BP}/dev/olpc/spiflash/flashif.fth \ Generic FLASH interface fload ${BP}/dev/olpc/spiflash/spiif.fth \ Generic low-level SPI bus access Modified: cpu/arm/olpc/gpio-i2c.fth ============================================================================== --- cpu/arm/olpc/gpio-i2c.fth Fri Aug 31 01:52:44 2012 (r3259) +++ cpu/arm/olpc/gpio-i2c.fth Fri Aug 31 02:22:06 2012 (r3260) @@ -36,14 +36,26 @@ 1 " #size-cells" integer-property : encode-unit ( phys.. -- str ) push-hex (u.) pop-base ; : decode-unit ( str -- phys.. ) push-hex $number if 0 then pop-base ; - : open ( -- flag ) true ; - : close ( -- ) ; 0 0 encode-bytes cam-sda-gpio# 0 encode-gpio cam-scl-gpio# 0 encode-gpio " gpios" property + 0 instance value slave-address + : set-address ( slave -- ) to slave-address ; + : smb-setup + 1 to smb-dly-us cam-scl-gpio# to smb-clock-gpio# + cam-sda-gpio# to smb-data-gpio# + slave-address to smb-slave + ; + \ Since this I2C bus is dedicated to the DCON, we save space by + \ implementing only the methods that the DCON uses + : reg-b@ ( reg# -- b ) smb-setup smb-byte@ ; + : reg-b! ( b reg# -- ) smb-setup smb-byte! ; + : open ( -- flag ) true ; + : close ( -- ) ; + new-device " image-sensor" device-name @@ -56,7 +68,6 @@ cam-pwr-gpio# 0 encode-gpio cam-rst-gpio# 0 encode-gpio " gpios" property - finish-device finish-device @@ -67,12 +78,30 @@ 1 " #size-cells" integer-property : encode-unit ( phys.. -- str ) push-hex (u.) pop-base ; : decode-unit ( str -- phys.. ) push-hex $number if 0 then pop-base ; - : open ( -- flag ) true ; - : close ( -- ) ; 0 0 encode-bytes dcon-sda-gpio# 0 encode-gpio dcon-scl-gpio# 0 encode-gpio " gpios" property + + 0 instance value slave-address + : set-address ( slave -- ) to slave-address ; + : smb-setup ( -- ) + dcon-scl-gpio# to smb-clock-gpio# + dcon-sda-gpio# to smb-data-gpio# + slave-address to smb-slave + ; + + \ Since this I2C bus is dedicated to the DCON, we save space by + \ implementing only the methods that the DCON uses + + : reg-w@ ( reg# -- w ) smb-setup smb-word@ ; + : reg-w! ( w reg# -- ) smb-setup smb-word! ; + + : bus-reset ( -- ) smb-setup smb-stop 1 ms smb-off 1 ms smb-on ; + : bus-init ( -- ) smb-setup smb-on smb-pulses ; + + : open ( -- flag ) true ; + : close ( -- ) ; finish-device device-end Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Fri Aug 31 01:52:44 2012 (r3259) +++ dev/olpc/dcon/mmp2dcon.fth Fri Aug 31 02:22:06 2012 (r3260) @@ -53,18 +53,11 @@ \ h# 4000 constant DM_DEBUG \ h# 8000 constant DM_SELFTEST -: set-dcon-slave ( -- ) - dcon-scl-gpio# to smb-clock-gpio# - dcon-sda-gpio# to smb-data-gpio# +: bus-init ( -- ) " bus-init" $call-parent ; +: bus-reset ( -- ) " bus-reset" $call-parent ; - h# 0d to smb-slave -; - -: smb-init ( -- ) set-dcon-slave smb-on smb-pulses ; -: smb-reset ( -- ) smb-stop 1 ms smb-off 1 ms smb-on ; - -: dcon@ ( reg# -- word ) set-dcon-slave smb-word@ ; -: dcon! ( word reg# -- ) set-dcon-slave smb-word! ; +: dcon@ ( reg# -- word ) " reg-w@" $call-parent ; +: dcon! ( word reg# -- ) " reg-w!" $call-parent ; : dcon-load ( -- ) dcon-load-gpio# gpio-set ; : dcon-unload ( -- ) dcon-load-gpio# gpio-clr ; @@ -134,7 +127,7 @@ \ gx_configure_tft(info); : try-dcon! ( w reg# -- ) - ['] dcon! catch if 2drop smb-reset then + ['] dcon! catch if 2drop bus-reset then ; : mode@ ( -- mode ) 1 dcon@ ; @@ -171,14 +164,14 @@ ; \ Setup so it can be called by execute-device-method -: dcon-off ( -- ) smb-init h# 12 ['] mode! catch if drop then ; +: dcon-off ( -- ) bus-init h# 12 ['] mode! catch if drop then ; : dcon2? ( -- flag ) 5 0 do 0 ['] dcon@ catch 0= if ( x ) h# dc02 = unloop exit then ( x ) - drop d# 50 ms smb-init ( ) + drop d# 50 ms bus-init ( ) loop false ; @@ -217,7 +210,7 @@ [ifdef] old-way : init-dcon ( -- ) - smb-init + bus-init \ Unnecessary because CForth has already done it \ dcon-load dcon-enable ( maybe-set-cmos ) @@ -226,7 +219,8 @@ ' init-dcon to init-panel [else] : open ( -- flag ) - smb-init + my-unit " set-address" $call-parent + bus-init \ Unnecessary because CForth has already done it \ dcon-load dcon-enable ( maybe-set-cmos ) \ dcon-enable leaves mode set to 69 - 40:antialias, 20:swizzle, 8:backlight on, 1:passthru off

1 0

[commit] r3259 - cpu/arm/olpc
by repository service Aug. 30, 2012

Aug. 30, 2012

Author: wmb Date: Fri Aug 31 01:52:44 2012 New Revision: 3259 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3259 Log: OLPC ARM - Now that all TWSI child devices have been converted to use the new factoring, removed the old top-level /twsi node from the device tree and removed the global TWSI driver code. The only global references to twsi are now in the suspend/resume code (to be fixed) and an incidental one in MFPR pin attributes. Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/prefw.fth cpu/arm/olpc/twsi-i2c.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Aug 31 01:42:31 2012 (r3258) +++ cpu/arm/olpc/build-fw.fth Fri Aug 31 01:52:44 2012 (r3259) @@ -10,7 +10,6 @@ : init-stuff acgr-clocks-on init-timers - init-twsi ; warning @ warning off : stand-init-io Modified: cpu/arm/olpc/prefw.fth ============================================================================== --- cpu/arm/olpc/prefw.fth Fri Aug 31 01:42:31 2012 (r3258) +++ cpu/arm/olpc/prefw.fth Fri Aug 31 01:52:44 2012 (r3259) @@ -229,7 +229,6 @@ fload ${BP}/cpu/arm/mmp2/irq.fth fload ${BP}/cpu/arm/mmp2/timer.fth fload ${BP}/cpu/arm/mmp2/gpio.fth -fload ${BP}/cpu/arm/mmp2/twsi.fth fload ${BP}/cpu/arm/mmp2/mfpr.fth fload ${BP}/cpu/arm/mmp2/twsi-package.fth Modified: cpu/arm/olpc/twsi-i2c.fth ============================================================================== --- cpu/arm/olpc/twsi-i2c.fth Fri Aug 31 01:42:31 2012 (r3258) +++ cpu/arm/olpc/twsi-i2c.fth Fri Aug 31 01:52:44 2012 (r3259) @@ -1,14 +1,16 @@ purpose: Device tree nodes for board-specific I2C buses implemented by TWSI hardware -: make-twsi-node " ${BP}/cpu/arm/mmp2/twsi-node.fth" included ; +\ We omit nodes for unconnected TWSI channels +\ The unit# properties are chosen so that GPIO I2C nodes get lower addresses. +\ Some Linux drivers expect to find devices on specific I2C bus numbers. \ baseadr clk irq mux? fast? unit# - h# d4011000 1 7 false true 2 make-twsi-node \ TWSI1 - h# d4031000 2 0 true true 3 make-twsi-node \ TWSI2 -\ h# d4032000 3 1 true true N make-twsi-node \ TWSI3 - h# d4033000 4 2 true true 5 make-twsi-node \ TWSI4 -\ h# d4038000 d# 30 3 true true N make-twsi-node \ TWSI5 - h# d4034000 d# 31 4 true true 4 make-twsi-node \ TWSI6 + h# d4011000 1 7 false true 2 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI1 + h# d4031000 2 0 true true 3 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI2 +\ h# d4032000 3 1 true true N fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI3 + h# d4033000 4 2 true true 5 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI4 +\ h# d4038000 d# 30 3 true true N fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI5 + h# d4034000 d# 31 4 true true 4 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI6 [ifdef] soon-olpc-cl2 \ this breaks cl4-a1 boards, which ofw calls cl2. dev /i2c@d4033000 \ TWSI4

1 0

[commit] r3258 - in cpu/arm: mmp2 olpc
by repository service Aug. 30, 2012

Aug. 30, 2012

Author: wmb Date: Fri Aug 31 01:42:31 2012 New Revision: 3258 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3258 Log: OLPC ARM - Converted the RTC driver to use the new TWSI factoring, at the same time changing all occurrences of the method names "byte@" and "byte!" to "reg-b@" and "reg-b!". Modified: cpu/arm/mmp2/twsi-node.fth cpu/arm/mmp2/twsi-package.fth cpu/arm/olpc/accelerometer.fth cpu/arm/olpc/rtc.fth Modified: cpu/arm/mmp2/twsi-node.fth ============================================================================== --- cpu/arm/mmp2/twsi-node.fth Fri Aug 31 01:28:30 2012 (r3257) +++ cpu/arm/mmp2/twsi-node.fth Fri Aug 31 01:42:31 2012 (r3258) @@ -57,8 +57,8 @@ : get ( #bytes -- bytes ... ) 0 swap bytes-out-in ; -: byte@ ( -- ) " byte@" $call-twsi ; -: byte! ( -- ) " byte!" $call-twsi ; +: reg-b@ ( reg# -- b ) " reg-b@" $call-twsi ; +: reg-b! ( b reg# -- ) " reg-b!" $call-twsi ; : bytes-out ( byte .. #bytes -- ) " bytes-out" $call-twsi ; \ Useful range is 25K .. 400K - 100K and 400K are typical Modified: cpu/arm/mmp2/twsi-package.fth ============================================================================== --- cpu/arm/mmp2/twsi-package.fth Fri Aug 31 01:28:30 2012 (r3257) +++ cpu/arm/mmp2/twsi-package.fth Fri Aug 31 01:42:31 2012 (r3258) @@ -136,8 +136,8 @@ bbu_ICR_STOP twsi-putbyte ( ) ; -: byte@ ( reg -- byte ) 1 1 bytes-out-in ; -: byte! ( byte reg -- ) 2 bytes-out ; +: reg-b@ ( reg -- byte ) 1 1 bytes-out-in ; +: reg-b! ( byte reg -- ) 2 bytes-out ; : set-bus-standard cr-set h# 18000 invert and to cr-set ; : set-bus-fast cr-set h# 18000 invert and h# 8000 or to cr-set ; Modified: cpu/arm/olpc/accelerometer.fth ============================================================================== --- cpu/arm/olpc/accelerometer.fth Fri Aug 31 01:28:30 2012 (r3257) +++ cpu/arm/olpc/accelerometer.fth Fri Aug 31 01:42:31 2012 (r3258) @@ -9,8 +9,8 @@ \ This is for the stand-alone accelerometers LIS3DHTR and LIS33DETR \ We could call this just once in open if we had a TWSI parent node -: acc-reg@ ( reg# -- b ) " byte@" $call-parent ; -: acc-reg! ( b reg# -- ) " byte!" $call-parent ; +: acc-reg@ ( reg# -- b ) " reg-b@" $call-parent ; +: acc-reg! ( b reg# -- ) " reg-b!" $call-parent ; : ctl1! ( b -- ) h# 20 acc-reg! ; : ctl4! ( b -- ) h# 23 acc-reg! ; : accelerometer-on ( -- ) h# 47 ctl1! ; Modified: cpu/arm/olpc/rtc.fth ============================================================================== --- cpu/arm/olpc/rtc.fth Fri Aug 31 01:28:30 2012 (r3257) +++ cpu/arm/olpc/rtc.fth Fri Aug 31 01:42:31 2012 (r3258) @@ -2,23 +2,13 @@ dev /i2c@d4031000 \ TWSI2 new-device - " rtc" name - " idt,idt1338-rtc" +compatible - h# 68 1 reg - -[ifdef] cl2-a1 -: set-address ( -- ) - rtc-scl-gpio# to smb-clock-gpio# - rtc-sda-gpio# to smb-data-gpio# - h# 68 to smb-slave -; -: rtc@ ( reg# -- byte ) set-address smb-byte@ ; -: rtc! ( byte reg# -- ) set-address smb-byte! ; -[else] -: set-address ( -- ) h# 68 2 set-twsi-target ; -: rtc@ ( reg# -- byte ) set-address twsi-b@ ; -: rtc! ( byte reg# -- ) set-address twsi-b! ; -[then] + +" rtc" name +" idt,idt1338-rtc" +compatible +h# 68 1 reg + +: rtc@ ( reg# -- byte ) " reg-b@" $call-parent ; +: rtc! ( byte reg# -- ) " reg-b!" $call-parent ; headerless @@ -33,6 +23,8 @@ headers : open ( -- okay ) + my-unit " set-address" $call-parent + 0 ['] rtc@ catch if ( x ) drop false exit ( -- false ) then ( value ) @@ -58,12 +50,7 @@ : >bcd ( binary -- bcd ) d# 10 /mod 4 << + ; : bcd-time&date ( -- s m h d m y century ) - set-address -[ifdef] cl2-a1 - 9 0 smb-read-n ( s m h dow d m y control c ) -[else] - 0 1 9 twsi-get ( s m h dow d m y control c ) -[then] + 0 1 9 " bytes-out-in" $call-parent ( s m h dow d m y control c ) nip ( s m h dow d m y c ) 4 roll drop ( s m h d m y c ) ;

1 0