August 2012 - openfirmware - mail.coreboot.org

[commit] r3247 - cpu/arm/mmp2
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: wmb Date: Wed Aug 29 21:00:05 2012 New Revision: 3247 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3247 Log: OLPC ARM - Ensure that the main SDHC clock divisor is set properly when changing the SDH1 clock register. Modified: cpu/arm/mmp2/pmua.fth Modified: cpu/arm/mmp2/pmua.fth ============================================================================== --- cpu/arm/mmp2/pmua.fth Wed Aug 29 20:53:05 2012 (r3246) +++ cpu/arm/mmp2/pmua.fth Wed Aug 29 21:00:05 2012 (r3247) @@ -82,7 +82,7 @@ h# 048 +int h# 19 +int h# 19 +int d# 0 +int \ 0 IRE h# 04c +int h# fffff +int h# 71b +int d# 400,000,000 +int \ 1 DISPLAY1 h# 050 +int h# 3f +int h# 3f +int d# 0 +int \ 2 CCIC -h# 054 +int h# 1b +int h# 1b +int d# 200,000,000 +int \ 3 SDH1 +h# 054 +int h# 1b +int h# 41b +int d# 200,000,000 +int \ 3 SDH1 h# 058 +int h# 1b +int h# 1b +int d# 200,000,000 +int \ 4 SDH2 h# 05c +int h# 09 +int h# 09 +int d# 480,000,000 +int \ 5 USB h# 060 +int h# 1ff +int h# bf +int d# 100,000,000 +int \ 6 NF

1 0

[commit] r3246 - cpu/arm/mmp2
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: wmb Date: Wed Aug 29 20:53:05 2012 New Revision: 3246 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3246 Log: OLPC CL4 - added a clock speed reporting entry for the 1.067 GHz case. Modified: cpu/arm/mmp2/clocks.fth Modified: cpu/arm/mmp2/clocks.fth ============================================================================== --- cpu/arm/mmp2/clocks.fth Wed Aug 29 19:53:02 2012 (r3245) +++ cpu/arm/mmp2/clocks.fth Wed Aug 29 20:53:05 2012 (r3246) @@ -96,6 +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 ) endcase d# 1,000,000 / ( mhz ) ;

1 0

[commit] r3245 - cpu/arm/olpc
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: wmb Date: Wed Aug 29 19:53:02 2012 New Revision: 3245 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3245 Log: OLPC ARM - removed spurious null from banner. Modified: cpu/arm/olpc/banner.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Wed Aug 29 10:44:31 2012 (r3244) +++ cpu/arm/olpc/banner.fth Wed Aug 29 19:53:02 2012 (r3245) @@ -143,7 +143,7 @@ : (xbanner-basics) ( -- ) ?spaces cpu-model type ." , " .cpu-speed ." , " .memory-brief ." , " .storage - ." , S/N " " SN" find-tag if type else ." Unknown" then cr + ." , S/N " " SN" find-tag if ?-null type else ." Unknown" then cr ?spaces .rom ." " .ec ." " .clock check-internal-partitions check-tags

1 0

[commit] r3244 - cpu/arm/mmp3
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: quozl Date: Wed Aug 29 10:44:31 2012 New Revision: 3244 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3244 Log: OLPC XO-4 - thermal sensor rework Modified: cpu/arm/mmp3/thermal.fth Modified: cpu/arm/mmp3/thermal.fth ============================================================================== --- cpu/arm/mmp3/thermal.fth Wed Aug 29 07:58:31 2012 (r3243) +++ cpu/arm/mmp3/thermal.fth Wed Aug 29 10:44:31 2012 (r3244) @@ -47,12 +47,6 @@ swap h# f and wa+ w@ ; -h# 03.b000 value tsense - -: +ts ( offset -- io-offset ) tsense swap la+ ; -: ts@ ( offset -- l ) +ts io@ ; -: ts! ( l offset -- ) +ts io! ; - : ts-clock ( offset -- ) 7 over apbc! 3 swap apbc! ( n ) ; @@ -64,8 +58,32 @@ h# a0 ts-clock ; -: ts-start ( n -- ) - dup ts@ h# 4000.0000 or swap ts! +h# 03.b000 value tsense \ p2021 + +: +ts ( offset -- io-offset ) tsense swap la+ ; +: ts@ ( offset -- l ) +ts io@ ; +: ts! ( l offset -- ) +ts io! ; + +\ last system reset was caused by thermal sensor? +\ : tsr? ( -- flag ) h# 0028 mpmu@ h# 10 and ; \ p282 +\ : tsr? ( -- flag ) h# 1028 mpmu@ h# 10 and ; \ p311 + +\ last thermal sensor watchdog reset was caused by THSENS1 unit? +\ (polarity differs from documentation) +\ : thsens1? ( -- flag ) h# 00a4 mpmu@ h# 10 and ; \ p345 + +\ thsens1 is requesting interrupt service? (true if auto run enabled) +\ : thsens1-int? ( -- flag ) h# 00a4 mpmu@ h# 1 and ; \ p346 + +\ thermal sensor interrupt is masked? (normally true) +\ : thsens1-int-masked? h# 180 icu@ 800 and ; \ p700 +\ : thsens1-int-status? h# 188 icu@ 800 and ; \ p702 + +\ thermal sensor watchdog to system reset enable (normally already set) +\ : wdtr? h# 200 mpmu@ 1 7 lshift and 0= ; \ p302 + +: ts-auto-read ( n -- ) \ undocumented + dup ts@ h# 20.0000 or swap ts! ; : ts-wait ( n -- ) @@ -80,8 +98,7 @@ : ts-read ( n -- gc ) dup ts-wait ( n ) - dup ts@ ( n gc ) - swap ts-start ( gc ) + ts@ ( gc ) ; : ts-range-low ( n -- ) @@ -92,33 +109,28 @@ dup ts@ h# 0800.0000 invert and swap ts! ; -: init-thermal-sensor ( -- ) - ts-clocks - 3 0 do i ts-range-low i ts-start loop +: ts-watchdog-enable ( n -- ) + dup ts@ h# 0400.0300 or swap ts! \ 85-87.5C ; -\ switch the sensors out of low range - does not work -[ifdef] notyet -: hot +: init-thermal-sensor ( -- ) ts-clocks - 3 0 do i ts-range-high i ts-start loop + 0 ts-range-high + 0 ts-watchdog-enable + 1 ts-range-low + 2 ts-range-low + 3 0 do i ts-auto-read loop ; -[then] -\ read and average the three sensors +\ read and average the two sensors on lowrange duty : cpu-temperature ( -- celcius ) - 0 ts-read gc>c 1 ts-read gc>c 2 ts-read gc>c - + + d# 30 / + + d# 20 / ; : ?thermal ( -- ) - cpu-temperature d# 70 > abort " CPU too hot" - \ FIXME: choose an appropriate limit, because - \ - the sample unit easily reaches 61C, - \ - using the low range we can't see greater than 61C, and - \ - the high range doesn't actually work. + 0 ts-read gc>c d# 850 > abort " CPU too hot" ; : .c.c ( n -- ) 0 <# # [char] . hold #s #> type ." C " ; @@ -129,9 +141,9 @@ push-decimal time&date >unix-seconds . ." sensors: " - 0 ts@ gc>c .c.c \ innermost? - 1 ts@ gc>c .c.c - 2 ts@ gc>c .c.c \ outermost? + 0 ts@ dup h# f and 0= if drop ." <80C " else gc>c .c.c then + 1 ts@ gc>c .c.c \ FIXME: show <n and >n too here + 2 ts@ gc>c .c.c ." cpu: " cpu-temperature .c ." battery: " bat-temp .c pop-base @@ -143,6 +155,74 @@ until key drop cr ; +\ .thermal 0 ts@ f and . d# 1000 ms cr many + +string-array tsense-regx-bits + ," 31=reserved" + ," 30=start" + ," 29=status" + ," 28=over_int" + ," 27=lowrange" + ," 26=en_wdog" + ," 25=temp_int" + ," 24=en_over_int" + ," 23=en_temp_int" + ," 22=reserved" + ," 21=auto_read_en" +end-string-array + +: .tc ( n -- ) + dup . + push-decimal + gc>c .c.c + pop-base +; + +: .tsense ( n -- ) + dup . cr 4 spaces + d# 11 0 do + dup i lshift h# 8000.0000 and if + i tsense-regx-bits count type space + then + loop cr + \ dup d# 12 rshift h# 7ff and dup if 4 spaces ." reserved=" . cr else drop then + 4 spaces dup 8 rshift h# f and ." wdog_tshld=" .tc cr + 4 spaces dup 4 rshift h# f and ." int_tshld=" .tc cr + 4 spaces dup h# f and ." temp_value=" .tc cr + drop +; + +: .ts + 0 ts@ ." tsense_reg[0]=" .tsense + 1 ts@ ." tsense_reg[1]=" .tsense + 2 ts@ ." tsense_reg[2]=" .tsense +; + +: test-thermal + ." press against heat spreader and press a key once temperature is low" + watch-thermal + h# 200 mpmu@ 1 7 lshift and 0= if + ." THRSENS_WDTR_EN was not set" cr + h# 200 mpmu@ 1 7 lshift or h# 200 mpmu! + then + 0 ts@ + 1 d# 27 lshift or \ set the lowrange bit + h# 0020.0000 or \ set the autorun bit (undocumented) + h# 0400.0000 or \ set the watchdog enable bit + h# b h# f and d# 8 lshift or \ set the watchdog temperature (58-60.5C) + b# 0101.1111.1010.0000.0000.1111.1111.0000 + and \ always write zero to reserved bits + 0 ts! + ." thermal watchdog enabled" cr + watch-thermal +; + +: force-thermal-watchdog + h# 200 mpmu@ 1 7 lshift or h# 200 mpmu! \ thrsens_wdtr_en + h# 0c20.0000 h# 03.b000 io! \ lowrange, en_wdog, auto_read_en, wdog_tshld 26C +; + + [ifdef] notyet \ FIXME : test-thermal .thermal cr

1 0

[commit] r3243 - cpu/arm/olpc
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: quozl Date: Wed Aug 29 07:58:31 2012 New Revision: 3243 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3243 Log: OLPC XO-4 - Neonode, main board SMT test Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Aug 29 07:49:44 2012 (r3242) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Aug 29 07:58:31 2012 (r3243) @@ -525,7 +525,7 @@ 0 to faults - test-station h# 1 = test-station h# 11 = or if \ IR PCB SMT and MB SMT + test-station h# 11 = if \ IR PCB SMT hold-reset connect open if test-os else fault then hold-reset disconnect @@ -538,6 +538,14 @@ 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 + [ifdef] nn-ir-pcb-rev-b test-station h# 2 = if \ MB ASSY open if test-finger-down-each-edge else fault then

1 0

[commit] r3242 - cpu/arm/olpc
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: quozl Date: Wed Aug 29 07:49:44 2012 New Revision: 3242 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3242 Log: OLPC XO-4 - Neonode, rework test coverage based on new requirements, vendor recommends forced LED levels test Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Aug 29 07:04:41 2012 (r3241) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Aug 29 07:49:44 2012 (r3242) @@ -4,6 +4,17 @@ 0 0 " 4,50" " /twsi" begin-package my-space encode-int my-address encode-int encode+ " reg" property +create nn-os \ open short test +create nn-fll \ forced led levels test +create nn-version \ version display + +\ create nn-fss \ optional fixed signal strength test +\ create nn-ls \ optional low signals test + +\ create nn-components \ isolate test results to failed component identifier + +\ create nn-ir-pcb-rev-b \ support for revision b of the ir pcb assembly + \ XXX these are really platform-related, not touchscreen-related : targets? ( -- flag ) final-test? ; : .tsmsg ( -- ) 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr ; @@ -65,6 +76,8 @@ 2drop ( ) ; + + : read-boot-complete ( -- ) h# 07 d# 0 anticipate ; : initialise ( -- ) h# 01 h# 01 h# ee 3 twsi-out h# 01 d# 20 anticipate ; @@ -132,6 +145,17 @@ ; + +0 value faults +: fault faults 1+ to faults ; + +: 4sp ." " ; + +: 8sp ." " ; + + + +[ifdef] nn-version \ version display : (.version) ( addr -- ) dup c@ over 1+ c@ bwjoin ( addr version ) (.) type @@ -154,14 +178,11 @@ .version cr ; +[then] -0 value faults -: fault faults 1+ to faults ; -: 4sp ." " ; - -: 8sp ." " ; +[ifdef] nn-os \ open short test [ifdef] nn-components \ optional decoding of component identifiers @@ -352,6 +373,11 @@ 4sp ." X Axis" cr 0 test-os-axis 4sp ." Y Axis" cr 1 test-os-axis ; +[then] + + + +[ifdef] nn-fss \ fixed signal strength test [ifdef] nn-components d# 11 constant x-ir-0 \ first X axis IR component identifier @@ -383,8 +409,6 @@ \ Y axis, IR11 PD12, IR11 PD11, IR10 PD11 ... IR1 PD1 \ X axis, IR12 PD13, IR12 PD14, IR13 PD14 ... IR26 PD28 [then] - \ FIXME: using a light guide, characterise a low signal level, - \ detect, and fail self test ; : test-fss @@ -392,6 +416,9 @@ 4sp ." X Axis" cr 0 test-fss-axis 4sp ." Y Axis" cr 1 test-fss-axis ; +[then] + + [ifdef] nn-ls \ low signals test : test-ls-axis ( axis -- ) @@ -424,6 +451,8 @@ ; [then] + + [ifdef] nn-fll \ forced LED levels test : test-fll-signal ( signal# signal-value led-level -- ) dup 0= if @@ -442,7 +471,11 @@ cr exit then - 2drop ." pass on axis signal " .d cr + \ 2drop ." pass on axis signal " .d cr + 3drop +[ifdef] nn-components + \ FIXME: express forced led levels faults in terms of IR PCB component names. +[then] ; : test-fll-axis ( axis -- ) @@ -464,6 +497,8 @@ ; [then] + + : press ( line$ -- ) type ." , press a key" @@ -474,41 +509,64 @@ : connect " Connect IR PCB" press ; : disconnect " Disconnect IR PCB" press ; +: dump-events + begin + in? if + ." rx: " pbuf plen bounds do + i c@ 2u.x space + loop cr + then + key? + until + key drop +; + : selftest ( -- error? ) - smt-test? if + 0 to faults + + test-station h# 1 = test-station h# 11 = or if \ IR PCB SMT and MB SMT hold-reset connect - 0 to faults 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 +[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 +[then] + + \ MB FINAL + \ MB SHIP open 0= if ." No touchscreen present" cr false exit then diagnostic-mode? if 0 to faults - test-version - test-os - test-fss + [ifdef] nn-version test-version [then] + [ifdef] nn-os test-os [then] + [ifdef] nn-fss test-fss [then] + [ifdef] nn-fll test-fll [then] faults if close true exit then then - ." dumping events from touchscreen controller, press a key to stop" cr - +[ifdef] nn-ir-pcb-rev-b \ FIXME: graphically show data on screen until key \ ... waiting for revision B of IR PCB - begin - in? if - ." rx: " pbuf plen bounds do - i c@ 2u.x space - loop cr - then - key? - until - key drop +[else] + ." dumping events from touchscreen controller, press a key to stop" cr + dump-events +[then] close false ;

1 0

[commit] r3241 - cpu/arm/olpc
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: wmb Date: Wed Aug 29 07:04:41 2012 New Revision: 3241 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3241 Log: OLPC ARM - Added probe-image-sensor to the startup sequence. This should have been part of an earlier commit but it slipped through the cracks. Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Wed Aug 29 05:55:52 2012 (r3240) +++ cpu/arm/olpc/build-fw.fth Wed Aug 29 07:04:41 2012 (r3241) @@ -861,6 +861,7 @@ report-disk report-keyboard [then] +[ifdef] probe-image-sensor probe-image-sensor [then] " probe+" do-drop-in interpreter-init

1 0

[commit] r3240 - cpu/arm/olpc
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: quozl Date: Wed Aug 29 05:55:52 2012 New Revision: 3240 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3240 Log: OLPC XO-4 - Neonode, add motherboard SMT test phase, close on exit from diag-mode test, hide low signals test from build, add forced LED levels test but hidden Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Aug 29 04:21:27 2012 (r3239) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Aug 29 05:55:52 2012 (r3240) @@ -17,14 +17,15 @@ [then] : set-gpios -[ifdef] mmp2 - 0 1e2bc io!@ \ TWSI4_SCL to GPIO[169] - 0 1e2c0 io!@ \ TWSI4_SDA to GPIO[170] +[ifdef] olpc-cl2 + 0 1e2bc io!@ \ TWSI4_SCL + 0 1e2c0 io!@ \ TWSI4_SDA \ FIXME: discover why this is set to 5 on power up [then] touch-rst-gpio# dup gpio-set gpio-dir-out touch-tck-gpio# dup gpio-clr gpio-dir-out ; : reset ( -- ) touch-rst-gpio# dup gpio-clr gpio-set d# 250 ms ; +: hold-reset ( -- ) touch-rst-gpio# gpio-clr ; : no-data? ( -- no-data? ) touch-int-gpio# gpio-pin@ ; d# 250 constant /pbuf @@ -50,6 +51,8 @@ true ; +\ read incoming packets, ignoring those that don't match, until either +\ one matches, or a timeout occurs. : anticipate ( id msecs -- ) get-msecs + ( id limit ) begin @@ -390,6 +393,7 @@ 4sp ." Y Axis" cr 1 test-fss-axis ; +[ifdef] nn-ls \ low signals test : test-ls-axis ( axis -- ) h# 0d h# 02 h# ee 4 twsi-out h# 0d d# 200 anticipate @@ -418,12 +422,67 @@ 4sp ." X Axis" cr 0 test-ls-axis 4sp ." Y Axis" cr 1 test-ls-axis ; +[then] + +[ifdef] nn-fll \ forced LED levels test +: test-fll-signal ( signal# signal-value led-level -- ) + dup 0= if + fault + rot ." fail on axis signal " .d + ." with LED level " .d ." (too strong) " + ." signal level " .d + cr + exit + then + dup h# c > if + fault + rot ." fail on axis signal " .d + ." with LED level " .d ." (too weak) " + ." signal level " .d + cr + exit + then + 2drop ." pass on axis signal " .d cr +; + +: test-fll-axis ( axis -- ) + h# 20 h# 02 h# ee 4 twsi-out + h# 1c d# 200 anticipate + pbuf plen cdump cr + pbuf 4 + c@ 2/ 0 do + i pbuf 5 + over 3 * + >r ( i r:frag ) + 2* dup r@ 1+ c@ r@ c@ 4 rshift h# f and test-fll-signal + 1+ r@ 2+ c@ r@ c@ h# f and test-fll-signal + r> drop ( ) + loop +; + +: test-fll + ." Forced LED Levels" cr + 4sp ." X Axis" cr 0 test-fll-axis + 4sp ." Y Axis" cr 1 test-fll-axis +; +[then] + +: press ( line$ -- ) + type + ." , press a key" + key drop + cr +; + +: connect " Connect IR PCB" press ; +: disconnect " Disconnect IR PCB" press ; : selftest ( -- error? ) - \ skip test during SMT, as the IR PCB is required for controller to - \ respond, issue being worked with Neonode 2012-08. - smt-test? if false exit then + smt-test? if + hold-reset connect + 0 to faults + open if test-os else fault then + hold-reset disconnect + faults exit + then open 0= if ." No touchscreen present" cr false exit @@ -434,13 +493,13 @@ test-version test-os test-fss - test-ls - faults if true exit then + faults if close true exit then then ." dumping events from touchscreen controller, press a key to stop" cr \ FIXME: graphically show data on screen until key + \ ... waiting for revision B of IR PCB begin in? if ." rx: " pbuf plen bounds do

1 0

[commit] r3239 - cpu/arm/olpc
by repository service Aug. 29, 2012

Aug. 29, 2012

Author: quozl Date: Wed Aug 29 04:21:27 2012 New Revision: 3239 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3239 Log: OLPC XO-4 - bsl, hide destructive test, provide dot per line progress during programming Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Wed Aug 29 03:20:38 2012 (r3238) +++ cpu/arm/olpc/bsl.fth Wed Aug 29 04:21:27 2012 (r3239) @@ -4,7 +4,6 @@ \ TODO: \ friendlier programming interface ( "ok flash-bsl u:\file.hex") -\ progress indicator during programming \ print, perhaps in red, the msp430 password after programming, \ iff the password doesn't match all-ff or the known neonode password. \ save calibration data in mfg tag, in case it's lost. @@ -484,6 +483,7 @@ force-erase ( ) ." Programming" cr begin ( ) + [char] . emit bsl-line-buf d# 100 ifd @ read-line abort" Read line failed" while ( len ) bsl-line-buf swap ( adr len ) @@ -495,6 +495,7 @@ ifd @ fclose ( ) ; +[ifdef] bsl-destructive-test \ This is a destructive test in that it erases whatever firmware happens \ to already be in the device. @@ -543,6 +544,7 @@ ." Verifying ..." bsl-test-data h# 8000 bsl-verify cr ( okay? ) if ." Good" else ." FAILED!" then cr ; +[then] \ LICENSE_BEGIN \ Copyright (c) 2012 FirmWorks

1 0

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

Aug. 29, 2012

Author: wmb Date: Wed Aug 29 03:20:38 2012 New Revision: 3238 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3238 Log: OLPC ARM - Audio driver - use the new "my-clocks-on/off" facility to move the clock enabling code out of this file into the PMUA driver. Modified: cpu/arm/mmp2/pmua.fth cpu/arm/olpc/sound.fth Modified: cpu/arm/mmp2/pmua.fth ============================================================================== --- cpu/arm/mmp2/pmua.fth Wed Aug 29 02:50:52 2012 (r3237) +++ cpu/arm/mmp2/pmua.fth Wed Aug 29 03:20:38 2012 (r3238) @@ -121,37 +121,6 @@ [then] " clock-enable-registers" property -[ifdef] notdef - " clock-enable-registers" get-property if ( on? clock# ) - 2drop exit ( -- ) - then ( on? clock# propval$ ) - - \ Offset into clock-enable-registers array - rot h# 10 * ( on? propval$ offset ) - 2dup <= if ( on? propval$ offset ) - 4drop exit ( -- ) - then ( on? propval-adr$ offset ) - /string ( on? propval-adr$' ) - - \ Get register offset - decode-int >r ( on? propval-adr$' r: reg-offset ) - - \ Apply the clear mask to the register value - decode-int invert ( on? propval-adr$' clr-mask r: reg-offset ) - r@ pmua@ and ( on? propval-adr$' regval r: reg-offset ) - -rot ( on? regval propval-adr$ r: reg-offset ) - - \ Apply the set mask if the clock is being turned on - 3 roll if ( regval propval-adr$ r: reg-offset ) - get-encoded-int or ( regval' r: reg-offset ) - else ( regval propval-adr$ r: reg-offset ) - 2drop ( regval r: reg-offset ) - then ( regval r: reg-offset ) - - \ Write back the modified register value - r> pmua! ( ) -[then] - : generic-on/off ( on? clock# -- ) get-reg&masks if drop exit then ( on? set-mask clr-mask reg ) >r r@ pmua@ and ( on? set-mask regval r: reg ) @@ -159,6 +128,71 @@ r> pmua! ; +h# 10c constant audio-clk + +[ifdef] mmp3 +h# 164 constant audio-dsa +h# 1e4 constant isld-dspa-ctrl +h# 240 constant audio-sram-pwr +[then] + +\ Discrepancies - ms vs us, double-enabling of AXI +: dly d# 10 us ; + +: audio-island-on ( -- ) +[ifdef] mmp3 + h# 200 audio-clk pmua-set dly \ Power switch on + h# 400 audio-clk pmua-set dly \ Power switch more on + 1 audio-sram-pwr pmua-set dly \ Audio SRAM on + 2 audio-sram-pwr pmua-set dly \ Audio SRAM more on + 4 audio-sram-pwr pmua-set dly \ Audio core on + 8 audio-sram-pwr pmua-set dly \ Audio core more on + h# 100 audio-clk pmua-set dly \ Disable isolation + + 4 audio-clk pmua-set \ Start audio SRAM redundancy repair + 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 + + \ Enable dummy clocks to the SRAMs + h# 10 isld-dspa-ctrl pmua-set d# 250 us h# 10 isld-dspa-ctrl pmua-clr + + \ Enable the AXI/APB clocks to the Audio island prior to programming island registers + 2 audio-dsa pmua-set + 8 audio-dsa pmua-set +[else] + h# 600 audio-clk pmua! dly \ Turn on power + h# 610 audio-clk pmua! dly \ Enable clock + h# 710 audio-clk pmua! dly \ Disable isolation + h# 712 audio-clk pmua! dly \ Release reset +[then] +; + +: audio-island-off ( -- ) +[ifdef] true +[ifdef] mmp3 + h# a audio-dsa pmua-clr \ Disable AXI and APB clocks + h# 5 audio-dsa pmua-clr \ Put AXI and APB clocks in reset + 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 +[else] + h# 710 audio-clk pmua! \ Set peripheral reset + h# 610 audio-clk pmua! \ Enable isolation + h# 600 audio-clk pmua! \ Disable clock + h# 000 audio-clk pmua! \ Turn off power +[then] +[then] + 0 audio-clk pmua! +; +: audio-on/off ( on? -- ) + if audio-island-on else audio-island-off then +; + [ifdef] mmp3 : ccic-isp-island-off ( -- ) h# 600 h# 1fc pmua! \ Isolation enabled @@ -231,6 +265,10 @@ drop ccic-on/off exit ( -- ) then ( on? clock# ) + dup d# 20 = if \ AUDIO ( on? clock# ) + drop audio-on/off exit ( -- ) + then + generic-on/off ; Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Wed Aug 29 02:50:52 2012 (r3237) +++ cpu/arm/olpc/sound.fth Wed Aug 29 03:20:38 2012 (r3238) @@ -82,17 +82,9 @@ : adma! ( n offset -- ) adma-base + rl! ; : adma@ ( offset -- n ) adma-base + rl@ ; -h# 10c +pmua constant audio-clk -[ifdef] mmp3 -h# 164 +pmua constant audio-dsa -h# 1e4 +pmua constant isld-dspa-ctrl -h# 240 +pmua constant audio-sram-pwr -[then] - -: audio-clock! ( -- ) audio-clk io! ; : audio-clock-off ( -- ) 0 h# 38 sspa! - 0 audio-clock! + my-clock-off ; : start-audio-pll ( -- error? ) \ For VCXO=26 MHz, OCLK=12.2880 MHz @@ -110,42 +102,9 @@ : dly d# 10 us ; -\ Discrepancies - ms vs us, double-enabling of AXI -: audio-island-on ( -- ) -[ifdef] mmp3 - h# 200 audio-clk io-set dly \ Power switch on - h# 400 audio-clk io-set dly \ Power switch more on - 1 audio-sram-pwr io-set dly \ Audio SRAM on - 2 audio-sram-pwr io-set dly \ Audio SRAM more on - 4 audio-sram-pwr io-set dly \ Audio core on - 8 audio-sram-pwr io-set dly \ Audio core more on - h# 100 audio-clk io-set dly \ Disable isolation - - 4 audio-clk io-set \ Start audio SRAM redundancy repair - begin audio-clk io@ 4 and 0= until \ And wait until done - - \ Bring audio island out of reset - 1 audio-dsa io-set - 4 audio-dsa io-set - 1 audio-dsa io-set - - \ Enable dummy clocks to the SRAMs - h# 10 isld-dspa-ctrl io-set d# 250 us h# 10 isld-dspa-ctrl io-clr - - \ Enable the AXI/APB clocks to the Audio island prior to programming island registers - 2 audio-dsa io-set - 8 audio-dsa io-set -[else] - h# 600 audio-clock! dly \ Enable - h# 610 audio-clock! dly \ Release reset - h# 710 audio-clock! dly \ Enable - h# 712 audio-clock! dly \ Release reset -[then] -; - false value use-audio-pll? : audio-clock-on ( -- error? ) - audio-island-on + my-clock-on use-audio-pll? if start-audio-pll if true exit then

1 0