openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3241 - cpu/arm/olpc
by repository service 29 Aug '12

29 Aug '12

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 29 Aug '12

29 Aug '12

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 29 Aug '12

29 Aug '12

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 29 Aug '12

29 Aug '12

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

[commit] r3237 - dev/olpc/mmp2camera
by repository service 29 Aug '12

29 Aug '12

Author: wmb Date: Wed Aug 29 02:50:52 2012 New Revision: 3237 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3237 Log: OLPC ARM - Camera driver - use the new "my-clocks-on/off" facility to move the clock enabling code out of this file into the PMUA driver. Modified: dev/olpc/mmp2camera/ccic.fth Modified: dev/olpc/mmp2camera/ccic.fth ============================================================================== --- dev/olpc/mmp2camera/ccic.fth Wed Aug 29 02:48:20 2012 (r3236) +++ dev/olpc/mmp2camera/ccic.fth Wed Aug 29 02:50:52 2012 (r3237) @@ -79,54 +79,8 @@ 0 to next-buf ; -[ifdef] mmp3 -: isp-island-power-on - \ set ISP regs to the default value - 0 h# 50 pmua! - 0 h# 1fc pmua! - - \ Turn on the CCIC/ISP power switch - h# 200 h# 1fc pmua! - d# 10 ms - h# 600 h# 1fc pmua! - d# 10 ms - \ Disable isp isolation\n" - h# 700 h# 1fc pmua! - - \ Start memory redundacy repair - 4 h# 224 pmua-set \ PMUA_ISP_CLK_RES_CTRL - begin d# 10 ms h# 224 pmua@ 4 and 0= until - - \ Enable dummy clocks to the SRAMS - h# 10 h# 1e0 pmua-set \ PMUA_ISLD_CI_PDWN_CTRL - d# 200 ms - h# 10 h# 1e0 pmua-clr - - \ Enable ISP clocks here if you want to use the ISP - \ 8 h# 224 pmua-set \ Enable AXI clock in PMUA_ISP_CLK_RES_CTRL - \ h# f00 h# 200 h# 224 pmua-fld \ Clock divider - \ h# c0 h# 40 h# 224 pmua-fld \ CLock source - \ h# 10 h# 224 pmua-set - - \ enable CCIC clocks - h# 8238 h# 50 pmua-set - - \ Deassert ISP clocks here if you want to use the ISP - \ XXX should these be pmua-clr ? - \ 1 h# 224 pmua-set \ AXI reset - \ 2 h# 224 pmua-set \ ISP SW reset - \ h# 10000 h# 50 pmua-set \ CCIC1 AXI Arbiter reset - - \ De-assert CCIC Resets - h# 10107 h# 50 pmua-set \ XXX change to 107 -; -[then] : power-on ( -- ) - [ifdef] mmp3 isp-island-power-on [then] - - \ Enable clocks - h# 3f h# 28 pmua! \ Clock gating - AHB, Internal PIXCLK, AXI clock always on - h# 0003.805b h# 50 pmua! \ PMUA clock config for CCIC - /1, PLL1/16, AXI arb, AXI, perip on + my-clock-on \ h# 0000.0002 h# 88 cl! \ Clock select - PIXMCLK, 797/2 (PLL1/16) / 2 -> 24.9 MHz \ h# 4000.0002 h# 88 cl! \ Clock select - AXI, 797/2 (PLL1/16) / 2 -> 24.9 MHz @@ -143,6 +97,8 @@ reset-sensor h# 40 cl@ h# 1000.0000 or h# 40 cl! \ Disable pads sensor-power-off + + my-clock-off ; @@ -206,8 +162,8 @@ : close ( -- ) ctlr-stop interrupts-off - power-off free-dma-bufs + power-off camera-base h# 1000 " map-out" $call-parent ;

1 0

[commit] r3236 - cpu/arm/mmp2
by repository service 29 Aug '12

29 Aug '12

Author: wmb Date: Wed Aug 29 02:48:20 2012 New Revision: 3236 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3236 Log: OLPC ARM - implemented a generic mechanism for enabling and disabling device clocks based on the "clocks" property. Important new words are "my-clock-on" and "my-clock-off", which can be called from a device instance in a node that has a "clocks" property. Modified: cpu/arm/mmp2/apbc.fth cpu/arm/mmp2/pmua.fth Modified: cpu/arm/mmp2/apbc.fth ============================================================================== --- cpu/arm/mmp2/apbc.fth Wed Aug 29 02:12:35 2012 (r3235) +++ cpu/arm/mmp2/apbc.fth Wed Aug 29 02:48:20 2012 (r3236) @@ -89,4 +89,11 @@ h# 94 +int h# 7 +int h# 3 +int d# 26,000,000 +int \ 35 CORESIGHT " clock-enable-registers" property +: on/off ( on? clock# -- ) + get-reg&masks if drop exit then ( on? set-mask clr-mask reg ) + >r r@ apbc@ and ( on? set-mask regval r: reg ) + rot if or else nip then ( regval' r: reg ) + r> apbc! +; + end-package Modified: cpu/arm/mmp2/pmua.fth ============================================================================== --- cpu/arm/mmp2/pmua.fth Wed Aug 29 02:12:35 2012 (r3235) +++ cpu/arm/mmp2/pmua.fth Wed Aug 29 02:48:20 2012 (r3236) @@ -2,6 +2,31 @@ : clocks 2 ; previous definitions +\ Given a clock index, retrieve the register offset and set/clear masks +\ from the clock-enable-registers property in the device node from which +\ this is called. The format and usage of clock-enable-registers is +\ specific to PXA/MMP SoCs, but might be useful for any hardware whose +\ clock enabling can be expressed by clearing some register bits and +\ setting others. + +: get-reg&masks ( clock# -- set-mask ~clr-mask reg false | true ) + " clock-enable-registers" get-property if ( clock# ) + drop true exit ( true -- ) + then ( clock# propval$ ) + + \ Offset into clock-enable-registers array + rot h# 10 * ( propval$ offset ) + 2dup <= if ( propval$ offset ) + 3drop true exit ( true -- ) + then ( propval-adr$ offset ) + /string ( propval-adr$' ) + + decode-int >r ( propval-adr$' r: reg ) + decode-int invert >r ( propval-adr$' r: reg ~clr-mask ) + get-encoded-int r> r> ( set-mask ~clr-mask reg ) + false ( set-mask ~clr-mask reg false ) +; + 0 0 " " " /" begin-package " pmua" name " mrvl,pxa-apmu" +compatible @@ -96,4 +121,132 @@ [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 ) + rot if or else nip then ( regval' r: reg ) + r> pmua! +; + +[ifdef] mmp3 +: ccic-isp-island-off ( -- ) + h# 600 h# 1fc pmua! \ Isolation enabled + \ Fiddle with ISP_CLK_RES_CTRL here to turn off ISP engine + h# 000 h# 1fc pmua! \ Power off +; + +: ccic-isp-island-on ( -- ) + \ set ISP regs to the default value + 0 h# 50 pmua! + 0 h# 1fc pmua! + + \ Turn on the CCIC/ISP power switch + h# 200 h# 1fc pmua! \ Partially powered + d# 10 ms + h# 600 h# 1fc pmua! \ Fully powered + d# 10 ms + h# 700 h# 1fc pmua! \ Isolation disabled + +[ifdef] notdef + \ Empirically, the memory redundancy and SRAMs are unnecessary + \ for camera-only (no ISP) operation. + + \ Start memory redundacy repair + 4 h# 224 pmua-set \ PMUA_ISP_CLK_RES_CTRL + begin d# 10 ms h# 224 pmua@ 4 and 0= until + + \ Enable dummy clocks to the SRAMS + h# 10 h# 1e0 pmua-set \ PMUA_ISLD_CI_PDWN_CTRL + d# 200 ms + h# 10 h# 1e0 pmua-clr +[then] + + \ Enable ISP clocks here if you want to use the ISP + \ 8 h# 224 pmua-set \ Enable AXI clock in PMUA_ISP_CLK_RES_CTRL + \ h# f00 h# 200 h# 224 pmua-fld \ Clock divider + \ h# c0 h# 40 h# 224 pmua-fld \ CLock source + \ h# 10 h# 224 pmua-set + + \ enable CCIC clocks + h# 8238 h# 50 pmua-set + + \ Deassert ISP clocks here if you want to use the ISP + \ XXX should these be pmua-clr ? + \ 1 h# 224 pmua-set \ AXI reset + \ 2 h# 224 pmua-set \ ISP SW reset + \ h# 10000 h# 50 pmua-set \ CCIC1 AXI Arbiter reset + + \ De-assert CCIC Resets + h# 10107 h# 50 pmua-set \ XXX change to 107 +; +[then] + +: ccic-on/off ( on? -- ) + if + [ifdef] mmp3 ccic-isp-island-on [then] + + \ Enable clocks + h# 3f h# 28 pmua! \ Clock gating - AHB, Internal PIXCLK, AXI clock always on + h# 0003.805b h# 50 pmua! \ PMUA clock config for CCIC - /1, PLL1/16, AXI arb, AXI, perip on + else + h# 3f h# 50 pmua-clr + [ifdef] mmp3 ccic-isp-island-off [then] + then +; + +: on/off ( on? clock# -- ) + \ Special-case devices that need more elaborate on/off procedures + dup 2 = if \ CCIC ( on? clock# ) + drop ccic-on/off exit ( -- ) + then ( on? clock# ) + + generic-on/off +; + end-package + +\ This is a general-purpose mechanism for enabling/disabling a clock +\ that is described by a "clocks" property in the device node. The +\ property value is a phandle and an index, as used in Linux. + +: my-clock-on/off ( on? -- ) + " clocks" get-my-property abort" No clocks property" ( on? propval$ ) + decode-int >r ( on? propval$ r: phandle ) + get-encoded-int ( on? clock# r: phandle ) + r> push-package ( on? clock# ) + " on/off" package-execute ( ) + pop-package ( ) +; +: my-clock-off ( -- ) false my-clock-on/off ; +: my-clock-on ( -- ) true my-clock-on/off ;

1 0

[commit] r3235 - in dev/olpc: . mmp2camera
by repository service 29 Aug '12

29 Aug '12

Author: wmb Date: Wed Aug 29 02:12:35 2012 New Revision: 3235 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3235 Log: OLPC ARM - Set reg and compatible properties in the /image-sensor node dynamically, by probing for the specific chip that is present. This requires the assistance of the camera driver, because the image sensor won't respond to its I2C bus unless it has a clock from the CCIC camera unit. Modified: dev/olpc/imagesensor.fth dev/olpc/mmp2camera/loadpkg.fth dev/olpc/ov7670.fth dev/olpc/seti.fth Modified: dev/olpc/imagesensor.fth ============================================================================== --- dev/olpc/imagesensor.fth Wed Aug 29 02:10:05 2012 (r3234) +++ dev/olpc/imagesensor.fth Wed Aug 29 02:12:35 2012 (r3235) @@ -12,3 +12,21 @@ : sensor-found? ( -- flag ) false ; +: set-sensor-properties ( name$ i2c-addr -- ) + my-self >r 0 to my-self + " /image-sensor" find-device ( name$ i2c-addr ) + " reg" get-property if ( name$ i2c-addr ) + 1 reg ( name$ ) + +compatible ( ) + else ( name$ i2c-addr regval$ ) + 2drop 3drop ( ) + then + device-end + r> to my-self +; + +also forth definitions +: probe-image-sensor ( -- ) + " /camera" open-dev close-dev +; +previous definitions Modified: dev/olpc/mmp2camera/loadpkg.fth ============================================================================== --- dev/olpc/mmp2camera/loadpkg.fth Wed Aug 29 02:10:05 2012 (r3234) +++ dev/olpc/mmp2camera/loadpkg.fth Wed Aug 29 02:12:35 2012 (r3235) @@ -10,6 +10,8 @@ cam-rst-gpio# 0 encode-gpio " gpios" property + " /image-sensor" encode-phandle " image-sensor" property + 0 [if] : alloc-capture-buffer ( len -- vadr padr ) \ XXX need map-in if we should use virtual mode Modified: dev/olpc/ov7670.fth ============================================================================== --- dev/olpc/ov7670.fth Wed Aug 29 02:10:05 2012 (r3234) +++ dev/olpc/ov7670.fth Wed Aug 29 02:12:35 2012 (r3235) @@ -166,6 +166,7 @@ then ( ) " OV7670" " sensor" string-property + " omnivision,ov7670" camera-smb-slave set-sensor-properties ['] ov7670-set-mirrored to set-mirrored ['] ov7670-config to camera-config Modified: dev/olpc/seti.fth ============================================================================== --- dev/olpc/seti.fth Wed Aug 29 02:10:05 2012 (r3234) +++ dev/olpc/seti.fth Wed Aug 29 02:12:35 2012 (r3235) @@ -306,6 +306,7 @@ h# 12 <> if false exit then ( ) " SETi,SIV120D" " sensor" string-property + " seti,siv120d" camera-smb-slave set-sensor-properties ['] seti-set-mirrored to set-mirrored ['] seti-config to camera-config

1 0

[commit] r3234 - in cpu/arm: mmp2 olpc
by repository service 29 Aug '12

29 Aug '12

Author: wmb Date: Wed Aug 29 02:10:05 2012 New Revision: 3234 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3234 Log: OLPC ARM - Moved the board-specific code to create I2C device nodes into OLPC-specific files. Added: cpu/arm/olpc/gpio-i2c.fth cpu/arm/olpc/twsi-i2c.fth Modified: cpu/arm/mmp2/gpio.fth cpu/arm/mmp2/twsi.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/mmp2/gpio.fth ============================================================================== --- cpu/arm/mmp2/gpio.fth Tue Aug 28 18:25:56 2012 (r3233) +++ cpu/arm/mmp2/gpio.fth Wed Aug 29 02:10:05 2012 (r3234) @@ -77,52 +77,3 @@ h# 104 make-gpio-mux-node h# 108 make-gpio-mux-node end-package - -: encode-gpio ( propval$ gpio# low? -- propval$' ) - >r >r ( propval$ r: low? gpio# ) - " /gpio" encode-phandle encode+ ( propval$' r: low? gpio# ) - r> encode-int encode+ ( propval$' r: low? ) - r> encode-int encode+ ( propval$' ) -; - -: gpio-property ( gpionum low? gpioname$ -- ) - 2>r 2>r ( r: gpioname$ gpionum low? ) - 0 0 encode-bytes ( propval$ r: gpioname$ gpionum low? ) - 2r> encode-gpio ( propval$' r: gpioname$ ) - 2r> property ( ) -; - -dev / - new-device - " camera-i2c" device-name - " i2c-gpio" +compatible - 1 " #address-cells" integer-property - 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 - finish-device - - new-device - " dcon-i2c" device-name - " i2c-gpio" +compatible - 1 " #address-cells" integer-property - 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 - finish-device -device-end Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Tue Aug 28 18:25:56 2012 (r3233) +++ cpu/arm/mmp2/twsi.fth Wed Aug 29 02:10:05 2012 (r3234) @@ -163,62 +163,6 @@ : twsi-b! ( byte reg -- ) 2 twsi-out ; [ifdef] begin-package -: make-twsi-node ( baseadr clock# irq# muxed-irq? fast? unit# -- ) - root-device - new-device - " linux,unit#" integer-property - " i2c" name - " mrvl,mmp-twsi" +compatible ( baseadr clock# irq# muxed-irq? fast? ) - if 0 0 " mrvl,i2c-fast-mode" property then ( baseadr clock# irq# muxed-irq? ) - if - " /interrupt-controller/interrupt-controller@158" encode-phandle " interrupt-parent" property - then ( baseadr clock# irq# ) - " interrupts" integer-property ( baseadr clock# ) - " /apbc" encode-phandle rot encode-int encode+ " clocks" property - - h# 1000 reg ( ) - 1 " #address-cells" integer-property - 1 " #size-cells" integer-property - " : open true ; : close ;" evaluate - " : encode-unit ( phys.. -- str ) push-hex (u.) pop-base ;" evaluate - " : decode-unit ( str -- phys.. ) push-hex $number if 0 then pop-base ;" evaluate - finish-device - device-end -; - -\ 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 - - -[ifdef] soon-olpc-cl2 \ this breaks cl4-a1 boards, which ofw calls cl2. -0 0 " 30" " /i2c@d4033000" begin-package \ TWSI4 - " touchscreen" name - " raydium_ts" +compatible - my-address my-space 1 reg -end-package -[else] -0 0 " 50" " /i2c@d4033000" begin-package \ TWSI4 - " touchscreen" name - " zforce" +compatible - my-address my-space 1 reg - touch-rst-gpio# 1 " reset-gpios" gpio-property - touch-tck-gpio# 1 " test-gpios" gpio-property - touch-hd-gpio# 1 " hd-gpios" gpio-property - touch-int-gpio# 1 " dr-gpios" gpio-property -end-package -[then] - -0 0 " 19" " /i2c@d4034000" begin-package \ TWSI6 - " accelerometer" name - " lis3lv02d" +compatible - my-address my-space 1 reg -end-package - 0 0 " " " /" begin-package " twsi" name Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Aug 28 18:25:56 2012 (r3233) +++ cpu/arm/olpc/build-fw.fth Wed Aug 29 02:10:05 2012 (r3234) @@ -102,6 +102,9 @@ fload ${BP}/cpu/arm/mmp2/watchdog.fth \ reset-all using watchdog timer +fload ${BP}/cpu/arm/olpc/gpio-i2c.fth +fload ${BP}/cpu/arm/olpc/twsi-i2c.fth + 0 0 " d4018000" " /" begin-package \ UART3 fload ${BP}/cpu/arm/mmp2/uart.fth " /apbc" encode-phandle d# 12 encode-int encode+ " clocks" property Added: cpu/arm/olpc/gpio-i2c.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/gpio-i2c.fth Wed Aug 29 02:10:05 2012 (r3234) @@ -0,0 +1,78 @@ +purpose: Device tree nodes for I2C buses implemented with GPIOs + +: encode-gpio ( propval$ gpio# low? -- propval$' ) + >r >r ( propval$ r: low? gpio# ) + " /gpio" encode-phandle encode+ ( propval$' r: low? gpio# ) + r> encode-int encode+ ( propval$' r: low? ) + r> encode-int encode+ ( propval$' ) +; + +: gpio-property ( gpionum low? gpioname$ -- ) + 2>r 2>r ( r: gpioname$ gpionum low? ) + 0 0 encode-bytes ( propval$ r: gpioname$ gpionum low? ) + 2r> encode-gpio ( propval$' r: gpioname$ ) + 2r> property ( ) +; + +: make-sensor-node ( name$ i2c-addr -- ) + " /camera-i2c" find-device ( name$ i2c-addr ) + new-device ( name$ i2c-addr ) + 1 reg ( name$ ) + +compatible ( ) + " image-sensor" device-name + 0 0 encode-bytes + cam-pwr-gpio# 0 encode-gpio + cam-rst-gpio# 0 encode-gpio + " gpios" property + finish-device + device-end +; + +dev / + new-device + " camera-i2c" device-name + " i2c-gpio" +compatible + 1 " #address-cells" integer-property + 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 + + new-device + " image-sensor" device-name + + \ The reg and compatible properties are set by probing, based on the actual + \ image sensor encountered. For example: + \ h# 21 1 reg + \ " omnivision,ov7670" +compatible + + 0 0 encode-bytes + cam-pwr-gpio# 0 encode-gpio + cam-rst-gpio# 0 encode-gpio + " gpios" property + + finish-device + finish-device + + new-device + " dcon-i2c" device-name + " i2c-gpio" +compatible + 1 " #address-cells" integer-property + 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 + finish-device +device-end Added: cpu/arm/olpc/twsi-i2c.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/twsi-i2c.fth Wed Aug 29 02:10:05 2012 (r3234) @@ -0,0 +1,57 @@ +purpose: Device tree nodes for board-specific I2C buses implemented by TWSI hardware + +: make-twsi-node ( baseadr clock# irq# muxed-irq? fast? unit# -- ) + root-device + new-device + " linux,unit#" integer-property + " i2c" name + " mrvl,mmp-twsi" +compatible ( baseadr clock# irq# muxed-irq? fast? ) + if 0 0 " mrvl,i2c-fast-mode" property then ( baseadr clock# irq# muxed-irq? ) + if + " /interrupt-controller/interrupt-controller@158" encode-phandle " interrupt-parent" property + then ( baseadr clock# irq# ) + " interrupts" integer-property ( baseadr clock# ) + " /apbc" encode-phandle rot encode-int encode+ " clocks" property + + h# 1000 reg ( ) + 1 " #address-cells" integer-property + 1 " #size-cells" integer-property + " : open true ; : close ;" evaluate + " : encode-unit ( phys.. -- str ) push-hex (u.) pop-base ;" evaluate + " : decode-unit ( str -- phys.. ) push-hex $number if 0 then pop-base ;" evaluate + finish-device + device-end +; + +\ 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 + + +[ifdef] soon-olpc-cl2 \ this breaks cl4-a1 boards, which ofw calls cl2. +0 0 " 30" " /i2c@d4033000" begin-package \ TWSI4 + " touchscreen" name + " raydium_ts" +compatible + my-address my-space 1 reg +end-package +[else] +0 0 " 50" " /i2c@d4033000" begin-package \ TWSI4 + " touchscreen" name + " zforce" +compatible + my-address my-space 1 reg + touch-rst-gpio# 1 " reset-gpios" gpio-property + touch-tck-gpio# 1 " test-gpios" gpio-property + touch-hd-gpio# 1 " hd-gpios" gpio-property + touch-int-gpio# 1 " dr-gpios" gpio-property +end-package +[then] + +0 0 " 19" " /i2c@d4034000" begin-package \ TWSI6 + " accelerometer" name + " lis3lv02d" +compatible + my-address my-space 1 reg +end-package

1 0

[commit] r3233 - dev/olpc/mmp2camera
by repository service 28 Aug '12

28 Aug '12

Author: wmb Date: Tue Aug 28 18:25:56 2012 New Revision: 3233 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3233 Log: OLPC ARM - MMP camera driver - Some tweaking of device tree properties for the benefit of the Linux driver. Modified: dev/olpc/mmp2camera/loadpkg.fth Modified: dev/olpc/mmp2camera/loadpkg.fth ============================================================================== --- dev/olpc/mmp2camera/loadpkg.fth Tue Aug 28 18:25:18 2012 (r3232) +++ dev/olpc/mmp2camera/loadpkg.fth Tue Aug 28 18:25:56 2012 (r3233) @@ -1,9 +1,15 @@ " " " d420a000" " /" begin-package " camera" device-name + " marvell,mmpcam" +compatible my-address my-space h# 800 reg " /pmua" encode-phandle 2 encode-int encode+ " clocks" property d# 42 " interrupts" integer-property + 0 0 encode-bytes + cam-pwr-gpio# 0 encode-gpio + cam-rst-gpio# 0 encode-gpio + " gpios" property + 0 [if] : alloc-capture-buffer ( len -- vadr padr ) \ XXX need map-in if we should use virtual mode

1 0

[commit] r3232 - cpu/arm/olpc
by repository service 28 Aug '12

28 Aug '12

Author: wmb Date: Tue Aug 28 18:25:18 2012 New Revision: 3232 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3232 Log: OLPC ARM - MMP audio driver - Some tweaking of device tree properties for the benefit of the Linux driver. Modified: cpu/arm/olpc/sound.fth Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Tue Aug 28 10:03:02 2012 (r3231) +++ cpu/arm/olpc/sound.fth Tue Aug 28 18:25:18 2012 (r3232) @@ -10,18 +10,36 @@ [ifdef] mmp3 h# c0ffd000 [else] h# d42a0000 [then] + ; +\ "mav" stands for M(DMA), A(DMA), V(DMA), distinct from +\ the 16 "peripheral" PDMA channels. +\ The number space for mmp-mav-dma-channels is as follows: +\ 0: MDMA0 +\ 1: MDMA1 +\ 2: ADMA1_CH0 (out) +\ 3: ADMA1_CH1 (in) +\ 4: ADMA2_CH0 (out) +\ 5: ADMA2_CH1 (in) +\ 6: VDMA1_CH0 +\ 7: VDMA1_CH1 +\ That's consistent with the enumeration mmp_tdma_type in +\ Linux:arch/arm/mach-mmp/include/mach/mmp_dma.h +\ and also reflects the bit numbering (+16) in the various +\ DMA IRQ status and mask registers, e.g. ICU_DMA_IRQ1_STATUS + dev / new-device " adma" device-name h# 800 +audio h# 100 reg - d# 47 " interrupts" integer-property + 3 encode-int 2 encode-int encode+ " mmp-mav-dma-channels" property + " marvell,mmp-audio-dma" +compatible current-device ( adma0-ph ) finish-device new-device " adma" device-name h# 900 +audio h# 100 reg - d# 48 " interrupts" integer-property + 5 encode-int 4 encode-int encode+ " mmp-mav-dma-channels" property + " marvell,mmp-audio-dma" +compatible current-device ( adma0-ph adma1-ph ) finish-device @@ -31,7 +49,7 @@ \ We call this the platform driver, a single point that collects \ the Audio DMA resources - " mrvl,mmp-pcm-audio" +compatible \ snd_soc_dai_link.cpu_dai_of_node + " marvell,mmp-pcm-audio" +compatible \ snd_soc_dai_link.cpu_dai_of_node ( adma0-ph adma1-ph ) encode-int rot encode-int encode+ " adma-nodes" property @@ -41,7 +59,7 @@ " sspa" name h# d00 +audio h# 100 reg - " mrvl,mmp-sspa-dai" +compatible + " marvell,mmp-sspa-dai" +compatible " /pmua" encode-phandle d# 20 encode-int encode+ " clocks" property d# 3 " interrupts" integer-property @@ -52,7 +70,7 @@ " audio" name h# c00 +audio h# 100 reg -" mrvl,mmp-sspa-dai" +compatible +" marvell,mmp-sspa-dai" +compatible " /pmua" encode-phandle d# 20 encode-int encode+ " clocks" property d# 2 " interrupts" integer-property

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware