August 2012 - openfirmware - mail.coreboot.org

[commit] r3227 - cpu/arm/olpc
by repository service Aug. 27, 2012

Aug. 27, 2012

Author: quozl Date: Tue Aug 28 03:07:53 2012 New Revision: 3227 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3227 Log: OLPC XO-4 A1 - fix r3226, reverse conditional Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Tue Aug 28 02:49:18 2012 (r3226) +++ cpu/arm/olpc/nn-touchscreen.fth Tue Aug 28 03:07:53 2012 (r3227) @@ -17,7 +17,7 @@ [then] : set-gpios -[ifndef] mmp3 +[ifdef] mmp2 0 1e2bc io!@ \ TWSI4_SCL to GPIO[169] 0 1e2c0 io!@ \ TWSI4_SDA to GPIO[170] [then]

1 0

[commit] r3226 - cpu/arm/olpc
by repository service Aug. 27, 2012

Aug. 27, 2012

Author: quozl Date: Tue Aug 28 02:49:18 2012 New Revision: 3226 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3226 Log: OLPC XO-4 A1 - initialise MFPR for TWSI4, needed on MMP2 based A1 only, fixes use of A1 for touchscreen testing. Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Mon Aug 27 08:14:53 2012 (r3225) +++ cpu/arm/olpc/nn-touchscreen.fth Tue Aug 28 02:49:18 2012 (r3226) @@ -17,6 +17,10 @@ [then] : set-gpios +[ifndef] mmp3 + 0 1e2bc io!@ \ TWSI4_SCL to GPIO[169] + 0 1e2c0 io!@ \ TWSI4_SDA to GPIO[170] +[then] touch-rst-gpio# dup gpio-set gpio-dir-out touch-tck-gpio# dup gpio-clr gpio-dir-out ;

1 0

[commit] r3225 - cpu/arm/olpc
by repository service Aug. 26, 2012

Aug. 26, 2012

Author: quozl Date: Mon Aug 27 08:14:53 2012 New Revision: 3225 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3225 Log: OLPC XO-4 - turn off the DCON before sending the EC power off command Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Aug 24 11:01:01 2012 (r3224) +++ cpu/arm/olpc/build-fw.fth Mon Aug 27 08:14:53 2012 (r3225) @@ -170,14 +170,11 @@ fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree fload ${BP}/dev/olpc/kb3700/eccmds.fth -: stand-power-off ( -- ) ec-power-off begin wfi again ; +: dcon-off " dcon-off" $call-dcon ; +: stand-power-off ( -- ) dcon-off ec-power-off begin wfi again ; ' stand-power-off to power-off -: olpc-reset-all ( -- ) - " dcon-off" $call-dcon - ec-power-cycle - begin wfi again -; +: olpc-reset-all ( -- ) dcon-off ec-power-cycle begin wfi again ; ' olpc-reset-all to reset-all stand-init: ['] reset-all to bye

1 0

[commit] r3224 - in cpu/arm: mmp3 olpc
by repository service Aug. 24, 2012

Aug. 24, 2012

Author: quozl Date: Fri Aug 24 11:01:01 2012 New Revision: 3224 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3224 Log: OLPC XO-4 - configure and read thermal sensor Added: cpu/arm/mmp3/thermal.fth Modified: cpu/arm/olpc/build-fw.fth Added: cpu/arm/mmp3/thermal.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp3/thermal.fth Fri Aug 24 11:01:01 2012 (r3224) @@ -0,0 +1,192 @@ +\ See license at end of file +purpose: Driver for the MMP3 thermal sensor + +\ FIXME: characterise the observations using an IR thermometer, +\ because the datasheet and the registers manual disagree on +\ interpretation of these gray code values. + +create gc0 \ high range +d# 780 w, \ 0000 +d# 830 w, \ 0001 +d# 855 w, \ 0010 +d# 805 w, \ 0011 +d# 955 w, \ 0100 +d# 930 w, \ 0101 +d# 880 w, \ 0110 +d# 905 w, \ 0111 +d# 0 w, \ 1000 +d# 1130 w, \ 1001 +d# 1080 w, \ 1010 +d# 1105 w, \ 1011 +d# 980 w, \ 1100 +d# 1005 w, \ 1101 +d# 1055 w, \ 1110 +d# 1030 w, \ 1111 + +create gc1 \ low range +d# 260 w, \ 0000 +d# 285 w, \ 0001 +d# 335 w, \ 0010 +d# 310 w, \ 0011 +d# 435 w, \ 0100 +d# 410 w, \ 0101 +d# 360 w, \ 0110 +d# 385 w, \ 0111 +d# 0 w, \ 1000 +d# 610 w, \ 1001 +d# 560 w, \ 1010 +d# 585 w, \ 1011 +d# 460 w, \ 1100 +d# 485 w, \ 1101 +d# 535 w, \ 1110 +d# 510 w, \ 1111 + +: gc>c ( gray-code -- tenths-of-celcius ) + dup h# 0800.0000 and ( gray-code low-range? ) + if gc1 else gc0 then ( gray-code table ) + 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 ) +; + +: ts-clocks + h# 90 ts-clock + h# 98 ts-clock + h# 9c ts-clock + h# a0 ts-clock +; + +: ts-start ( n -- ) + dup ts@ h# 4000.0000 or swap ts! +; + +: ts-wait ( n -- ) + d# 10 get-msecs + ( n limit ) + begin + over ts@ h# 2000.0000 and ( n limit ready? ) + if 2drop exit then + dup get-msecs - 0< ( n limit timeout? ) + until ( n limit ) + 2drop ( ) +; + +: ts-read ( n -- gc ) + dup ts-wait ( n ) + dup ts@ ( n gc ) + swap ts-start ( gc ) +; + +: ts-range-low ( n -- ) + dup ts@ h# 0800.0000 or swap ts! +; + +: ts-range-high ( n -- ) + 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 +; + +\ switch the sensors out of low range - does not work +[ifdef] notyet +: hot + ts-clocks + 3 0 do i ts-range-high i ts-start loop +; +[then] + +\ read and average the three sensors +: cpu-temperature ( -- celcius ) + 0 ts-read gc>c + 1 ts-read gc>c + 2 ts-read gc>c + + + d# 30 / +; + +: ?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. +; + +: .c.c ( n -- ) 0 <# # [char] . hold #s #> type ." C " ; + +: .c ( n -- ) (.) type ." C " ; + +: .thermal + 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? + ." cpu: " cpu-temperature .c + ." battery: " bat-temp .c + pop-base +; + +: watch-thermal + begin + .thermal cr d# 1000 ms key? + until key drop cr +; + +[ifdef] notyet \ FIXME +: test-thermal + .thermal cr + + \ save the threshold set by cforth + thermal-base 4 + io@ >r + + \ temporarily set the threshold close to current value + thermal-base io@ h# 3ff and 8 + wd-thresh! + + begin + (cr .thermal kill-line d# 500 ms key? + until key drop cr + + \ restore the threshold + r> wd-thresh! + .thermal cr +; +[then] + +stand-init: Thermal sensor + init-thermal-sensor +; + +\ LICENSE_BEGIN +\ Copyright (c) 2012 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Aug 24 05:22:48 2012 (r3223) +++ cpu/arm/olpc/build-fw.fth Fri Aug 24 11:01:01 2012 (r3224) @@ -354,7 +354,11 @@ extra-mem-va /extra-mem add-memory ; +[ifdef] mmp3 +fload ${BP}/cpu/arm/mmp3/thermal.fth +[else] fload ${BP}/cpu/arm/mmp2/thermal.fth +[then] fload ${BP}/cpu/arm/mmp2/fuse.fth [ifdef] bsl-uart-base fload ${BP}/cpu/arm/olpc/bsl.fth

1 0

[commit] r3223 - cpu/arm/olpc
by repository service Aug. 23, 2012

Aug. 23, 2012

Author: quozl Date: Fri Aug 24 05:22:48 2012 New Revision: 3223 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3223 Log: OLPC XO-4 - Neonode, show meaningful error messages on open fail, factorise packet buffer allocation Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Fri Aug 24 00:45:55 2012 (r3222) +++ cpu/arm/olpc/nn-touchscreen.fth Fri Aug 24 05:22:48 2012 (r3223) @@ -8,7 +8,9 @@ : targets? ( -- flag ) final-test? ; : .tsmsg ( -- ) 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr ; +[ifndef] set-geometry fload ${BP}/cpu/arm/olpc/touchscreen-common.fth +[then] [ifndef] 2u.x : 2u.x base @ >r hex 0 <# # # #> type r> base ! ; @@ -26,6 +28,9 @@ 0 value plen 0 value configure? +: pbuf-alloc /pbuf alloc-mem to pbuf ; +: pbuf-free pbuf /pbuf free-mem ; + : in? ( -- got-data? ) no-data? if false exit then @@ -80,21 +85,30 @@ ; : open ( -- okay? ) - /pbuf alloc-mem to pbuf + pbuf-alloc my-unit set-twsi-target set-gpios no-data? if reset - no-data? if pbuf /pbuf free-mem false exit then + no-data? if + ." no response to reset" cr + pbuf-free false exit + then + then + ['] read-boot-complete catch if + ." no response on bus" cr + pbuf-free false exit + then + ['] configure catch if + ." failed to configure" cr + pbuf-free false exit then - read-boot-complete - ['] configure catch if pbuf /pbuf free-mem false exit then true ; : close deactivate - pbuf /pbuf free-mem + pbuf-free ; : stream-poll? ( -- false | x y buttons true )

1 0

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

Aug. 23, 2012

Author: wmb Date: Fri Aug 24 00:45:55 2012 New Revision: 3222 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3222 Log: Q7A08 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 24 00:45:11 2012 (r3221) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Aug 24 00:45:55 2012 (r3222) @@ -1,8 +1,8 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 07 - +macro: FW_MINOR 08 + \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if] " fw-suffix" $read-file 2 min " ${FW_MINOR}%s" expand$ sprintf

1 0

[commit] r3221 - cpu/arm/olpc
by repository service Aug. 23, 2012

Aug. 23, 2012

Author: wmb Date: Fri Aug 24 00:45:11 2012 New Revision: 3221 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3221 Log: OLPC XO-4 - USB device node - changed compatible name to match the Linux driver, added reg-names property so the driver can continue to get the resource "byname". Modified: cpu/arm/olpc/usb.fth Modified: cpu/arm/olpc/usb.fth ============================================================================== --- cpu/arm/olpc/usb.fth Thu Aug 23 22:25:01 2012 (r3220) +++ cpu/arm/olpc/usb.fth Fri Aug 24 00:45:11 2012 (r3221) @@ -11,9 +11,6 @@ " /pmua" encode-phandle 5 encode-int encode+ " clocks" property d# 44 " interrupts" integer-property - " mrvl,pxa-u2oehci" +compatible - " mrvl,mmp3-u2oehci" +compatible - " host" " dr_mode" string-property " utmi" " phy_type" string-property @@ -23,6 +20,10 @@ false constant needs-dummy-qh? : grab-controller ( config-adr -- error? ) drop false ; fload ${BP}/dev/usb2/hcd/ehci/loadpkg.fth + + " marvell,pxau2o-ehci" +compatible + " u2o" " reg-names" string-property + \ false to delay? \ No need for a polling delay on this platform : otg-set-host-mode 3 h# a8 ehci-reg! ; \ Force host mode ' otg-set-host-mode to set-host-mode

1 0

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

Aug. 23, 2012

Author: wmb Date: Thu Aug 23 22:25:01 2012 New Revision: 3220 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3220 Log: Q7A07 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Thu Aug 23 22:20:15 2012 (r3219) +++ cpu/arm/olpc/cl4/fw-version.fth Thu Aug 23 22:25:01 2012 (r3220) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 06 +macro: FW_MINOR 07 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3219 - cpu/arm/olpc
by repository service Aug. 23, 2012

Aug. 23, 2012

Author: wmb Date: Thu Aug 23 22:20:15 2012 New Revision: 3219 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3219 Log: OLPC ARM - Changed the representation of the audio device in the device tree, for compatibility with Linux's alsa soc framework. Modified: cpu/arm/olpc/sound.fth Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Thu Aug 23 22:18:47 2012 (r3218) +++ cpu/arm/olpc/sound.fth Thu Aug 23 22:20:15 2012 (r3219) @@ -1,10 +1,58 @@ -[ifdef] olpc-cl4 -0 0 " c0ffd800" " /" begin-package -[else] -0 0 " d42a0800" " /" begin-package -[then] +0 0 " 1a" " /i2c@d4011000" begin-package \ TWSI1 + " audio-codec" name + " realtek,alc5631" +compatible + " realtek,rt5631" +compatible + my-address my-space 1 reg + " rt5631-hifi" " dai-name" string-property \ snd_soc_dai_link.codec_dai_name +end-package + +: +audio ( offset -- address ) + [ifdef] mmp3 h# c0ffd000 [else] h# d42a0000 [then] + +; + +dev / +new-device + " adma" device-name + h# 800 +audio h# 100 reg + d# 47 " interrupts" integer-property + current-device ( adma0-ph ) +finish-device + +new-device + " adma" device-name + h# 900 +audio h# 100 reg + d# 48 " interrupts" integer-property + current-device ( adma0-ph adma1-ph ) +finish-device + +new-device + " asram" device-name + audio-sram-pa /audio-sram reg + + \ 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 + + ( adma0-ph adma1-ph ) + encode-int rot encode-int encode+ " adma-nodes" property +finish-device + +new-device + " sspa" name + h# d00 +audio h# 100 reg + + " mrvl,mmp-sspa-dai" +compatible + + " /pmua" encode-phandle d# 20 encode-int encode+ " clocks" property + d# 3 " interrupts" integer-property +finish-device + +new-device + " audio" name -my-space h# 800 reg +h# c00 +audio h# 100 reg + +" mrvl,mmp-sspa-dai" +compatible " /pmua" encode-phandle d# 20 encode-int encode+ " clocks" property d# 2 " interrupts" integer-property @@ -606,14 +654,15 @@ : (close) \ Reinstate audio-clock-off when Linux turns on its own clock \ audio-clock-off - adma-base h# 800 " map-out" $call-parent + adma-base h# 100 " map-out" $call-parent + sspa-base h# 100 " map-out" $call-parent 0 to adma-base 0 to sspa-base ; 0 value open-count : open ( -- flag ) open-count 0= if - my-space h# 800 " map-in" $call-parent to adma-base - adma-base h# 400 + to sspa-base + my-unit h# 400 - h# 100 " map-in" $call-parent to adma-base + my-unit h# 100 " map-in" $call-parent to sspa-base audio-clock-on if (close) false exit then init-codec then @@ -660,7 +709,9 @@ fload ${BP}/dev/hdaudio/test.fth warning ! -end-package +finish-device + +device-end : (watch-dc) ( bias? -- ) " /audio" open-dev >r ( bias? r: ihandle ) @@ -671,6 +722,32 @@ : watch-dc-unbiased ( -- ) false (watch-dc) ; +0 0 " " " /" begin-package + " audio-complex" device-name + " olpc,mmp-audio" +compatible + + \ The name that was hardcoded in the Linux driver was OLPC XO-1.75 + " OLPC XO" " model" string-property + + : +string encode-string encode+ ; + + 0 0 encode-bytes + " Headphone Jack" +string " HPOL" +string + " Headphone Jack" +string " HPOR" +string + " MIC2" +string " Mic Jack" +string + " audio-routing" property + + " /audio-codec" encode-phandle " codec-node" property + " /audio" encode-phandle " cpu-dai-node" property + " /asram" encode-phandle " platform-node" property + + \ SND_SOC_DAIFTM_xxx: + \ 4000 is ..CBS_CFS - the codec is the slave for clk and FRM + \ 0100 is ..NB_NF - non-inverted BCLK and FRM + \ 0001 is ..I2S - standard I2S bit positions + h# 4101 " dai-format" encode-int +end-package + \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks \

1 0

[commit] r3218 - in cpu/arm: mmp2 mmp3
by repository service Aug. 23, 2012

Aug. 23, 2012

Author: wmb Date: Thu Aug 23 22:18:47 2012 New Revision: 3218 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3218 Log: OLPC ARM - Fixed incorrect audio SRAM sizes. Modified: cpu/arm/mmp2/soc-config.fth cpu/arm/mmp3/soc-config.fth Modified: cpu/arm/mmp2/soc-config.fth ============================================================================== --- cpu/arm/mmp2/soc-config.fth Thu Aug 23 22:17:39 2012 (r3217) +++ cpu/arm/mmp2/soc-config.fth Thu Aug 23 22:18:47 2012 (r3218) @@ -5,4 +5,4 @@ h# 1.0000 constant /audio-sram \ Size of Audio SRAM h# 0010.0000 constant /audio-sram-map \ Mapping size of Audio SRAM -h# 0030.0000 constant /sram \ Size of SRAM +h# 0003.0000 constant /sram \ Size of SRAM Modified: cpu/arm/mmp3/soc-config.fth ============================================================================== --- cpu/arm/mmp3/soc-config.fth Thu Aug 23 22:17:39 2012 (r3217) +++ cpu/arm/mmp3/soc-config.fth Thu Aug 23 22:18:47 2012 (r3218) @@ -5,7 +5,7 @@ h# 10.0000 constant /mmp3-audio h# d103.0000 constant audio-sram-pa \ Base of Audio SRAM -h# 1.0000 constant /audio-sram +h# 2.0000 constant /audio-sram \ No need to map audio-sram separately; it fits in the SRAM area -h# 0040.0000 constant /sram \ Size of SRAM +h# 0005.0000 constant /sram \ Size of SRAM

1 0