openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3123 - cpu/arm/olpc/1.75
by repository service 03 Aug '12

03 Aug '12

Author: pgf Date: Fri Aug 3 09:53:53 2012 New Revision: 3123 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3123 Log: fix gpio pin assignments for cl4-a1 Modified: cpu/arm/olpc/1.75/gpiopins.fth Modified: cpu/arm/olpc/1.75/gpiopins.fth ============================================================================== --- cpu/arm/olpc/1.75/gpiopins.fth Fri Aug 3 09:48:57 2012 (r3122) +++ cpu/arm/olpc/1.75/gpiopins.fth Fri Aug 3 09:53:53 2012 (r3123) @@ -64,5 +64,5 @@ d# 17 constant check-gpio# d# 14 constant touch-hd-gpio# -d# 139 constant touch-tck-gpio# -d# 98 constant touch-rst-gpio# +d# 98 constant touch-tck-gpio# +d# 152 constant touch-rst-gpio#

1 0

[commit] r3122 - cpu/arm/mmp2
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 09:48:57 2012 New Revision: 3122 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3122 Log: OLPC ARM - Fix screwup in recent checking that broke XO-1.75 startup. Modified: cpu/arm/mmp2/initmmu.fth Modified: cpu/arm/mmp2/initmmu.fth ============================================================================== --- cpu/arm/mmp2/initmmu.fth Fri Aug 3 08:56:17 2012 (r3121) +++ cpu/arm/mmp2/initmmu.fth Fri Aug 3 09:48:57 2012 (r3122) @@ -369,6 +369,7 @@ set r3,#0xc02 \ No caching or write buffering set r4,`mmp3-audio-va #` \ Virtual address bl `map-sections` +[then] mov pc, r10 end-code

1 0

[commit] r3121 - cpu/arm/mmp3
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 08:56:17 2012 New Revision: 3121 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3121 Log: OLPC CL4 - Fix the USB PLL frequency. Modified: cpu/arm/mmp3/usb2phy.fth Modified: cpu/arm/mmp3/usb2phy.fth ============================================================================== --- cpu/arm/mmp3/usb2phy.fth Fri Aug 3 08:06:11 2012 (r3120) +++ cpu/arm/mmp3/usb2phy.fth Fri Aug 3 08:56:17 2012 (r3121) @@ -41,10 +41,8 @@ \ h# d00 h# 100 +pmua io-set \ Select 26 MHz VCXO clock h# 000 h# 100 +pmua io-set \ Select crystal -\ h# 3fff pll-reg0 io-clr \ REFDIV_MASK_B0 3e00, FBDIV_MASK_B0 01ff -\ h# 1af0 pll-reg0 io-set \ 0xd << 9 , 0xf0 << 0 \ h# ca60 is the value to use for a 25 MHz crystal - h# daf0 pll-reg0 io-set \ 0xd << 9 , 0xf0 << 0 + h# daf0 pll-reg0 io! \ REFDIV: 0xd << 9, FBDIV: 0xf0 << 0 h# 3000 reserve-reg0 io! \ Program PLLVDD12 per Marvell email

1 0

[commit] r3120 - cpu/arm/olpc/cl4
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 08:06:11 2012 New Revision: 3120 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3120 Log: Q7A00 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 3 07:57:45 2012 (r3119) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Aug 3 08:06:11 2012 (r3120) @@ -1,7 +1,7 @@ \ The overall firmware revision -macro: FW_PREFIX Q6 +macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 04 +macro: FW_MINOR 00 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3119 - cpu/arm/olpc/cl4
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 07:57:45 2012 New Revision: 3119 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3119 Log: Q6A04 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 3 07:43:57 2012 (r3118) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Aug 3 07:57:45 2012 (r3119) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q6 macro: FW_MAJOR A -macro: FW_MINOR 03 +macro: FW_MINOR 04 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3118 - in cpu/arm/olpc: . 1.75 3.0 cl4
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 07:43:57 2012 New Revision: 3118 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3118 Log: OLPC ARM - move hardcoded MIC GPIO pin# into gpiopins.fth Modified: cpu/arm/olpc/1.75/config-a1.fth cpu/arm/olpc/1.75/gpiopins.fth cpu/arm/olpc/3.0/gpiopins.fth cpu/arm/olpc/cl4/gpiopins.fth cpu/arm/olpc/sound.fth Modified: cpu/arm/olpc/1.75/config-a1.fth ============================================================================== --- cpu/arm/olpc/1.75/config-a1.fth Fri Aug 3 07:23:49 2012 (r3117) +++ cpu/arm/olpc/1.75/config-a1.fth Fri Aug 3 07:43:57 2012 (r3118) @@ -69,6 +69,7 @@ d# 143 constant mic-ac/dc-gpio# d# 8 constant audio-reset-gpio# d# 97 constant hp-plug-gpio# +d# 96 constant mic-plug-gpio# d# 10 constant led-storage-gpio# d# 11 constant vid2-gpio# Modified: cpu/arm/olpc/1.75/gpiopins.fth ============================================================================== --- cpu/arm/olpc/1.75/gpiopins.fth Fri Aug 3 07:23:49 2012 (r3117) +++ cpu/arm/olpc/1.75/gpiopins.fth Fri Aug 3 07:43:57 2012 (r3118) @@ -43,6 +43,7 @@ d# 143 constant mic-ac/dc-gpio# d# 8 constant audio-reset-gpio# d# 97 constant hp-plug-gpio# +d# 96 constant mic-plug-gpio# d# 10 constant led-storage-gpio# d# 11 constant vid2-gpio# Modified: cpu/arm/olpc/3.0/gpiopins.fth ============================================================================== --- cpu/arm/olpc/3.0/gpiopins.fth Fri Aug 3 07:23:49 2012 (r3117) +++ cpu/arm/olpc/3.0/gpiopins.fth Fri Aug 3 07:43:57 2012 (r3118) @@ -37,4 +37,5 @@ d# 143 constant mic-ac/dc-gpio# d# 8 constant audio-reset-gpio# d# 97 constant hp-plug-gpio# +d# 96 constant mic-plug-gpio# d# 11 constant vid2-gpio# Modified: cpu/arm/olpc/cl4/gpiopins.fth ============================================================================== --- cpu/arm/olpc/cl4/gpiopins.fth Fri Aug 3 07:23:49 2012 (r3117) +++ cpu/arm/olpc/cl4/gpiopins.fth Fri Aug 3 07:43:57 2012 (r3118) @@ -41,6 +41,7 @@ d# 143 constant mic-ac/dc-gpio# d# 8 constant audio-reset-gpio# d# 13 constant hp-plug-gpio# +d# 96 constant mic-plug-gpio# d# 10 constant led-storage-gpio# d# 123 constant vid2-gpio# Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Fri Aug 3 07:23:49 2012 (r3117) +++ cpu/arm/olpc/sound.fth Fri Aug 3 07:43:57 2012 (r3118) @@ -290,7 +290,7 @@ fload ${BP}/cpu/arm/olpc/alc5624.fth \ Realtek ALC5624 CODEC [else] hp-plug-gpio# constant headphone-jack -d# 96 constant external-mic +mic-plug-gpio# constant external-mic : pin-sense? ( gpio# -- flag ) gpio-pin@ ; : headphones-inserted? ( -- flag ) headphone-jack pin-sense? ; : microphone-inserted? ( -- flag )

1 0

[commit] r3117 - in cpu/arm: mmp2 mmp3 olpc olpc/1.75 olpc/3.0 olpc/cl4
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 07:23:49 2012 New Revision: 3117 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3117 Log: OLPC CL4 - Handle differences between MMP2 and MMP3 audio subsystems. Modified: cpu/arm/mmp2/hwaddrs.fth cpu/arm/mmp2/initmmu.fth cpu/arm/mmp2/rootnode.fth cpu/arm/mmp2/soc-config.fth cpu/arm/mmp3/soc-config.fth cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/3.0/config.fth cpu/arm/olpc/addrs.fth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/cl4/config.fth cpu/arm/olpc/cl4/fw.bth cpu/arm/olpc/sound.fth Modified: cpu/arm/mmp2/hwaddrs.fth ============================================================================== --- cpu/arm/mmp2/hwaddrs.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/mmp2/hwaddrs.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -2,15 +2,11 @@ h# d000.0000 constant memctrl-pa h# d100.0000 constant sram-pa \ Base of SRAM -h# 0030.0000 constant /sram \ Size of SRAM h# d400.0000 constant apb-pa \ Base of APB bus h# d420.0000 constant axi-pa \ Base of AXI bus h# f000.0000 constant axi2-pa \ Another AXI bus area -h# e000.0000 constant audio-sram-pa \ Base of Audio SRAM -h# 0010.0000 constant /audio-sram \ Size of Audio SRAM - apb-pa constant io-pa \ We use this as the base for most IO accesses h# 0030.0000 constant /io Modified: cpu/arm/mmp2/initmmu.fth ============================================================================== --- cpu/arm/mmp2/initmmu.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/mmp2/initmmu.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -344,10 +344,12 @@ set r3,#0xc02 \ No caching or write buffering bl `map-sections-v=p` +[ifdef] /audio-sram-map set r1,`audio-sram-pa #` \ Address of Audio SRAM - set r2,`/audio-sram #` \ Size of audio SRAM + set r2,`/audio-sram-map #` \ Map size of audio SRAM set r3,#0xc02 \ No caching or write buffering bl `map-sections-v=p` +[then] set r1,`io-pa #` \ Address of I/O set r2,`/io #` \ Size of I/O region @@ -361,6 +363,13 @@ set r4,`io2-va #` \ Virtual address bl `map-sections` +[ifdef] mmp3-audio-pa + set r1,`mmp3-audio-pa #` \ Address of I/O + set r2,`/mmp3-audio #` \ Size of I/O region + set r3,#0xc02 \ No caching or write buffering + set r4,`mmp3-audio-va #` \ Virtual address + bl `map-sections` + mov pc, r10 end-code Modified: cpu/arm/mmp2/rootnode.fth ============================================================================== --- cpu/arm/mmp2/rootnode.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/mmp2/rootnode.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -36,6 +36,13 @@ io-pa - io-va + ( virt ) exit then ( phys ) +[ifdef] mmp3-audio-pa + dup mmp3-audio-pa u>= if ( phys ) + mmp3-audio-pa - ( offset ) + mmp3-audio-va + ( virt ) + exit + then +[then] \ Fall through to return virt == phys ; : map-out ( virtual size -- ) Modified: cpu/arm/mmp2/soc-config.fth ============================================================================== --- cpu/arm/mmp2/soc-config.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/mmp2/soc-config.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -1,2 +1,8 @@ create mmp2 h# 10000 constant l2-#sets + +h# e000.0000 constant audio-sram-pa \ Base of Audio SRAM +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 Modified: cpu/arm/mmp3/soc-config.fth ============================================================================== --- cpu/arm/mmp3/soc-config.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/mmp3/soc-config.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -1,2 +1,11 @@ create mmp3 h# 20000 constant l2-#sets + +h# c0f0.0000 constant mmp3-audio-pa +h# 10.0000 constant /mmp3-audio + +h# d103.0000 constant audio-sram-pa \ Base of Audio SRAM +h# 1.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 Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/1.75/config.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -7,6 +7,7 @@ create has-sp-kbd create has-dcon +fload ${BP}/cpu/arm/mmp2/soc-config.fth fload ${BP}/cpu/arm/mmp2/hwaddrs.fth fload ${BP}/cpu/arm/olpc/addrs.fth @@ -35,6 +36,4 @@ \ These constants are correct for XO-1.75 and XO-CL4; they might \ need to be changed for different hardware. See setup-gpios-hack -fload ${BP}/cpu/arm/mmp2/soc-config.fth - fload ${BP}/cpu/arm/olpc/1.75/gpiopins.fth Modified: cpu/arm/olpc/3.0/config.fth ============================================================================== --- cpu/arm/olpc/3.0/config.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/3.0/config.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -6,6 +6,7 @@ create use-screen-kbd create use-small-font +fload ${BP}/cpu/arm/mmp2/soc-config.fth fload ${BP}/cpu/arm/mmp2/hwaddrs.fth fload ${BP}/cpu/arm/olpc/addrs.fth @@ -32,6 +33,4 @@ h# 18000 constant console-uart-base -fload ${BP}/cpu/arm/mmp2/soc-config.fth - fload ${BP}/cpu/arm/olpc/3.0/gpiopins.fth Modified: cpu/arm/olpc/addrs.fth ============================================================================== --- cpu/arm/olpc/addrs.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/addrs.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -17,6 +17,9 @@ h# fe00.0000 constant io-va \ We map IO (APB + AXI) space at this virtual address h# fe30.0000 constant io2-va \ Mapping area for AXI2 space +h# fe40.0000 constant mmp3-audio-va \ Used only if mmp3-audio-pa is defined +: audio-sram-va ( -- ) audio-sram-pa ; + [ifdef] virtual-mode h# f700.0000 constant fw-virt-base h# 0100.0000 constant fw-virt-size \ 16 megs of mapping space Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/build-fw.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -841,11 +841,7 @@ \+ use-screen-kbd open-hotspot install-alarm -[ifdef] olpc-cl4 - ." build-fw.fth: not sounding" cr -[else] ?sound -[then] ?games @@ -876,7 +872,7 @@ \+ use-screen-kbd ?text-on [ifdef] olpc-cl4 - ." Quitting before auto-boot" cr quit + ." Quitting before auto-boot" cr visible banner quit [then] auto-boot \+ use-screen-kbd close-hotspot Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/cl4/config.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -7,6 +7,7 @@ create has-sp-kbd create has-dcon +fload ${BP}/cpu/arm/mmp3/soc-config.fth fload ${BP}/cpu/arm/mmp2/hwaddrs.fth fload ${BP}/cpu/arm/olpc/addrs.fth @@ -28,6 +29,4 @@ h# ec00 constant /ec-flash h# eb80 constant ec-flags-offset \ don't program or verify this page -fload ${BP}/cpu/arm/mmp3/soc-config.fth - fload ${BP}/cpu/arm/olpc/cl4/gpiopins.fth Modified: cpu/arm/olpc/cl4/fw.bth ============================================================================== --- cpu/arm/olpc/cl4/fw.bth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/cl4/fw.bth Fri Aug 3 07:23:49 2012 (r3117) @@ -12,7 +12,7 @@ fload ${BP}/cpu/arm/olpc/build-fw.fth -true to stand-init-debug? +\ true to stand-init-debug? \ Setup UART configuration h# d4017000 to uart-base \ UART2 Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Fri Aug 3 07:21:03 2012 (r3116) +++ cpu/arm/olpc/sound.fth Fri Aug 3 07:23:49 2012 (r3117) @@ -1,4 +1,8 @@ +[ifdef] olpc-cl4 +0 0 " c0ffd800" " /" begin-package +[else] 0 0 " d42a0800" " /" begin-package +[then] " audio" name my-space h# 800 reg @@ -12,7 +16,14 @@ : adma! ( n offset -- ) adma-base + rl! ; : adma@ ( offset -- n ) adma-base + rl@ ; -: audio-clock! ( -- ) h# 10c pmua! ; +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 pmua! ; : audio-clock-off ( -- ) 0 h# 38 sspa! 0 audio-clock! @@ -31,43 +42,76 @@ true ; -: audio-clock-on ( -- error? ) - h# 600 audio-clock! d# 10 us \ Enable - h# 610 audio-clock! d# 10 us \ Release reset - h# 710 audio-clock! d# 10 us \ Enable - h# 712 audio-clock! d# 10 us \ Release reset - -[ifdef] setup-audio-pll - start-audio-pll if true exit then - - \ Bits 14:9 set the divisor from SYSCLK to BITCLK. The setting below - \ is d# 8, which gives BITCLK = 1.536 MHz. That's 32x 48000, just enough - \ for two (stereo) 16-bit samples. - \ The 80 bit is 0, choosing the AudioPLL instead of the I2SCLK - h# 1103 h# 34 sspa! \ SSPA_AUD_CTRL0 -[else] - \ This section of the code uses I2SCLK instead of the Audio PLL. Marvell - \ says that I2SCLK is prone to jitter so the Audio PLL is preferred. +: dly d# 10 us ; - \ * 10 / 27 gives about 147.456 - \ The M/N divisor gets 199.33 MHz (Figure 283 - clock tree - in Datasheet) - \ But the M/N divisors always have an implicit /2 (section 7.3.7 in datasheet), - \ so the input frequency is 99.67 with respect to NOM (sic) and DENOM. - \ we want 12.288 MHz SYSCLK. 99.67 * 9 / 73 = 12.2876 so 50 ppm error. - d# 9 d# 15 lshift d# 73 or h# d000.0000 or h# 40 mpmu! - -\ The manual says that bit 5 enables I2SCLK to SSPA1, but empirically, bit 21 seems to do it -\ h# 1024 mpmu@ h# 20 or h# 1024 mpmu! \ Enable 12S clock out to SSPA1 - h# 1024 mpmu@ h# 20.0000 or h# 1024 mpmu! \ Enable 12S clock out to SSPA1 - - h# 10800 h# 38 sspa! - - \ Bits 14:9 set the divisor from SYSCLK to BITCLK. The setting below - \ is d# 8, which gives BITCLK = 1.536 MHz. That's 32x 48000, just enough - \ for two (stereo) 16-bit samples. - \ The 80 bit is 1, choosing the I2SCLK instead of the AudioPLL - h# 1183 h# 34 sspa! \ SSPA_AUD_CTRL0 +\ 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 4 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 + + use-audio-pll? if + start-audio-pll if true exit then + + \ Bits 14:9 set the divisor from SYSCLK to BITCLK. The setting below + \ is d# 8, which gives BITCLK = 1.536 MHz. That's 32x 48000, just enough + \ for two (stereo) 16-bit samples. + \ The 80 bit is 0, choosing the AudioPLL instead of the I2SCLK + h# 1103 h# 34 sspa! \ SSPA_AUD_CTRL0 + else + \ This section of the code uses I2SCLK instead of the Audio PLL. Marvell + \ says that I2SCLK is prone to jitter so the Audio PLL is preferred. + + \ * 10 / 27 gives about 147.456 + \ The M/N divisor gets 199.33 MHz (Figure 283 - clock tree - in Datasheet) + \ But the M/N divisors always have an implicit /2 (section 7.3.7 in datasheet), + \ so the input frequency is 99.67 with respect to NOM (sic) and DENOM. + \ we want 12.288 MHz SYSCLK. 99.67 * 9 / 73 = 12.2876 so 50 ppm error. + d# 9 d# 15 lshift d# 73 or h# d000.0000 or h# 40 mpmu! + + \ The manual says that bit 5 enables I2SCLK to SSPA1, but empirically, bit 21 seems to do it + \ That is true on both MMP2 and MMP3 + h# 20.0000 h# 1024 +mpmu io-set \ Enable 12S clock out to SSPA1 + + h# 10800 h# 38 sspa! + + \ Bits 14:9 set the divisor from SYSCLK to BITCLK. The setting below + \ is d# 8, which gives BITCLK = 1.536 MHz. That's 32x 48000, just enough + \ for two (stereo) 16-bit samples. + \ The 80 bit is 1, choosing the I2SCLK instead of the AudioPLL + h# 1183 h# 34 sspa! \ SSPA_AUD_CTRL0 + then false ; @@ -150,12 +194,11 @@ : slave-tx ( -- ) h# 8c sspa@ h# 8000.0001 or h# 8c sspa! ; \ Slave, on : disable-sspa-tx ( -- ) h# 8c sspa@ h# 8000.0004 or h# 4.0001 invert and h# 8c sspa! ; -h# e000.0000 constant audio-sram h# fc0 constant /audio-buf -audio-sram constant out-bufs -audio-sram h# 1f80 + constant out-desc -audio-sram h# 2000 + constant in-bufs -audio-sram h# 3f80 + constant in-desc +audio-sram-va constant out-bufs +audio-sram-va h# 1f80 + constant out-desc +audio-sram-va h# 2000 + constant in-bufs +audio-sram-va h# 3f80 + constant in-desc \ Descriptor format: \ Byte count @@ -246,7 +289,7 @@ [ifdef] cl2-a1 fload ${BP}/cpu/arm/olpc/alc5624.fth \ Realtek ALC5624 CODEC [else] -d# 97 constant headphone-jack +hp-plug-gpio# constant headphone-jack d# 96 constant external-mic : pin-sense? ( gpio# -- flag ) gpio-pin@ ; : headphones-inserted? ( -- flag ) headphone-jack pin-sense? ;

1 0

[commit] r3116 - dev/olpc/mmp2camera
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 07:21:03 2012 New Revision: 3116 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3116 Log: OLPC CL4 - Turn on power island for MMP3 camera controller. Modified: dev/olpc/mmp2camera/ccic.fth Modified: dev/olpc/mmp2camera/ccic.fth ============================================================================== --- dev/olpc/mmp2camera/ccic.fth Fri Aug 3 07:19:13 2012 (r3115) +++ dev/olpc/mmp2camera/ccic.fth Fri Aug 3 07:21:03 2012 (r3116) @@ -79,7 +79,51 @@ 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

1 0

[commit] r3115 - cpu/arm/mmp2
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 07:19:13 2012 New Revision: 3115 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3115 Log: OLPC ARM - New convenience functions for setting bit fields in I/O registers. Modified: cpu/arm/mmp2/socregs.fth Modified: cpu/arm/mmp2/socregs.fth ============================================================================== --- cpu/arm/mmp2/socregs.fth Wed Aug 1 10:49:33 2012 (r3114) +++ cpu/arm/mmp2/socregs.fth Fri Aug 3 07:19:13 2012 (r3115) @@ -14,6 +14,7 @@ : io-set ( mask offset -- ) dup io@ rot or swap io! ; : io-clr ( mask offset -- ) dup io@ rot invert and swap io! ; +: io-fld ( clr-mask set-mask offset -- ) >r r@ io@ rot invert and or r> io! ; : icu@ ( offset -- value ) +icu io@ ; : icu! ( value offset -- ) +icu io! ; @@ -24,6 +25,10 @@ : pmua@ ( offset -- l ) +pmua io@ ; : pmua! ( l offset -- ) +pmua io! ; +: pmua-set ( bits reg# -- ) +pmua io-set ; +: pmua-clr ( bits reg# -- ) +pmua io-clr ; +: pmua-fld ( clr set reg# -- ) +pmua io-fld ; + : apbc@ ( offset -- l ) +apbc io@ ; : apbc! ( l offset -- ) +apbc io! ;

1 0

[commit] r3114 - cpu/arm/olpc/cl4
by repository service 01 Aug '12

01 Aug '12

Author: wmb Date: Wed Aug 1 10:49:33 2012 New Revision: 3114 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3114 Log: OLPC CL4 - Set expected-ec-version to 7 Modified: cpu/arm/olpc/cl4/config.fth Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Wed Aug 1 10:26:59 2012 (r3113) +++ cpu/arm/olpc/cl4/config.fth Wed Aug 1 10:49:33 2012 (r3114) @@ -24,7 +24,7 @@ d# 10001 constant machine-type \ Backwards compatibility with non-device-tree kernel -char 5 constant expected-ec-version +char 7 constant expected-ec-version h# ec00 constant /ec-flash h# eb80 constant ec-flags-offset \ don't program or verify this page

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware