openfirmware November 2012

openfirmware@openfirmware.info

3 participants
66 discussions

[commit] r3410 - cpu/arm/mmp3
by repository service 02 Nov '12

02 Nov '12

Author: wmb Date: Fri Nov 2 21:43:10 2012 New Revision: 3410 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3410 Log: OLPC XO-4 - suspend/resume code: (a) Mask off reserved bits in pcr! (b) Use icu! instead of incorrect addresses in interrupt controller fiddling code (c) Mask global IRQs in suspend path instead of resume path; not sure why Linux did it in resume Modified: cpu/arm/mmp3/dramrecal.fth Modified: cpu/arm/mmp3/dramrecal.fth ============================================================================== --- cpu/arm/mmp3/dramrecal.fth Fri Nov 2 21:27:13 2012 (r3409) +++ cpu/arm/mmp3/dramrecal.fth Fri Nov 2 21:43:10 2012 (r3410) @@ -158,7 +158,7 @@ : port>bit ( port# -- ) wakeup-masks swap na+ @ ; -: pcr! ( value -- ) dup h# 00 mpmu! h# 1000 mpmu! ; +: pcr! ( value -- ) dup h# 00 mpmu! h# 7fff invert and h# 1000 mpmu! ; : pcr-set ( mask -- ) dup h# 00 mpmu-set h# 1000 mpmu-set ; : pcr-clr ( mask -- ) dup h# 00 mpmu-clr h# 1000 mpmu-clr ; : wucrm-set ( mask -- ) dup h# 4c mpmu-set h# 104c mpmu-set ; @@ -232,23 +232,23 @@ c; : wakeup-irqs-on ( -- ) \ 2f is high priority (f), directed to PJ (20) -\ h# 2f h# 82010 io! \ IRQ 4 - PMIC - h# 2f h# 82014 io! \ IRQ 5 - RTC -\ h# 2f h# 820c4 io! \ IRQ 49 - GPIO +\ h# 2f h# 10 icu! \ IRQ 4 - PMIC + h# 2f h# 14 icu! \ IRQ 5 - RTC +\ h# 2f h# c4 icu! \ IRQ 49 - GPIO ; : wakeup-irqs-off ( -- ) -\ h# 0 h# 82010 io! \ IRQ 4 - PMIC - h# 0 h# 82014 io! \ IRQ 5 - RTC -\ h# 0 h# 820c4 io! \ IRQ 49 - GPIO +\ h# 0 h# 10 icu! \ IRQ 4 - PMIC + h# 0 h# 14 icu! \ IRQ 5 - RTC +\ h# 0 h# c4 icu! \ IRQ 49 - GPIO ; : global-irqs-off ( -- ) \ disable global irq of ICU for MP1, MP2, MM - 1 h# 82110 io! \ ICU_GBL_IRQ1_MSK - 1 h# 82114 io! \ ICU_GBL_IRQ2_MSK - 1 h# 8410c io! \ ICU_GBL_IRQ3_MSK - 1 h# 84110 io! \ ICU_GBL_IRQ4_MSK - 1 h# 84114 io! \ ICU_GBL_IRQ5_MSK - 1 h# 84190 io! \ ICU_GBL_IRQ6_MSK + 1 h# 110 icu! \ ICU_GBL_IRQ1_MSK + 1 h# 114 icu! \ ICU_GBL_IRQ2_MSK + 1 h# 210c icu! \ ICU_GBL_IRQ3_MSK + 1 h# 2110 icu! \ ICU_GBL_IRQ4_MSK + 1 h# 2114 icu! \ ICU_GBL_IRQ5_MSK + 1 h# 2190 icu! \ ICU_GBL_IRQ6_MSK ; 0 value apcr @@ -260,7 +260,7 @@ h# 1000 mpmu@ to apcr deep-sleep-on - rtc-wakeup-on +\ rtc-wakeup-on \ Unnecessary; alarm-in-3 does it h# 462 set-idle \ D2_L2_PWD @@ -270,7 +270,9 @@ \ I don't think we need this because L2 is off \ h# 8000 cc4-set \ workaround: keep SL2 power on - wakeup-irqs-on +\ wakeup-irqs-on \ Unnecessary; alarm-in-3 does it + + global-irqs-off flush-cache-all \ outer-flush-all @@ -287,8 +289,6 @@ \ I don't think we need this because L2 is off \ h# 8000 cc4-clr \ workaround: keep SL2 power on - global-irqs-off - apcr h# 1000 mpmu! h# 8000.0000 idle-cfg-set \ Workaround: restore AT clock

1 0

[commit] r3409 - cpu/arm/mmp2
by repository service 02 Nov '12

02 Nov '12

Author: wmb Date: Fri Nov 2 21:27:13 2012 New Revision: 3409 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3409 Log: OLPC XO-4 - fixed incorrect base address for IRQ57 mux. Modified: cpu/arm/mmp2/irq.fth Modified: cpu/arm/mmp2/irq.fth ============================================================================== --- cpu/arm/mmp2/irq.fth Fri Nov 2 21:25:58 2012 (r3408) +++ cpu/arm/mmp2/irq.fth Fri Nov 2 21:27:13 2012 (r3409) @@ -91,7 +91,7 @@ h# 1cc h# 1b4 d# 42 2 make-mux-node \ intcmux42 - CCIC2, CCIC1 h# 160 h# 178 d# 51 2 make-mux-node \ intcmux51 - SSP1_SRDY, SSP3_SRDY h# 184 h# 17c d# 55 4 make-mux-node \ intcmux55 - MMC5, res, res, HSI_INT_1 - h# 188 h# 188 d# 55 d# 20 make-mux-node \ intcmux57 - (various) + h# 188 h# 180 d# 57 d# 20 make-mux-node \ intcmux57 - (various) h# 1d0 h# 1b8 d# 58 5 make-mux-node \ intcmux58 - MSP_CARD, KERMIT_INT_0, KERMIT_INT_1, res, HSI_INT_0 [else] h# 150 h# 168 4 2 make-mux-node \ intcmux4 - USB_CHARGER, PMIC

1 0

[commit] r3408 - cpu/arm/mmp2
by repository service 02 Nov '12

02 Nov '12

Author: wmb Date: Fri Nov 2 21:25:58 2012 New Revision: 3408 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3408 Log: OLPC - Converted some GPIO numbers to symbolic names in unused test code for wakeups. Modified: cpu/arm/mmp2/wakeups.fth Modified: cpu/arm/mmp2/wakeups.fth ============================================================================== --- cpu/arm/mmp2/wakeups.fth Fri Nov 2 21:08:05 2012 (r3407) +++ cpu/arm/mmp2/wakeups.fth Fri Nov 2 21:25:58 2012 (r3408) @@ -11,7 +11,7 @@ \ How to wakeup from SP: : setup-key-wakeup ( -- ) - d# 24 d# 15 do h# b0 i af! loop \ Wake SoC on game keys + rotate-gpio# 8 bounds do h# b0 i af! loop \ Wake SoC on game keys [ifdef] soc-kbd-clk-gpio# h# 220 soc-kbd-clk-gpio# af! \ Wake SoC on KBD CLK falling edge h# 221 soc-tpd-clk-gpio# af! \ Wake SoC on TPD CLK falling edge @@ -30,7 +30,7 @@ ; : gpio-wakeup? ( gpio# -- flag ) - h# 019800 over 5 rshift la+ l@ ( gpio# mask ) + h# 019800 over 5 rshift la+ io@ ( gpio# mask ) swap h# 1f and ( mask bit# ) 1 swap lshift and 0<> ( flag ) ; @@ -38,8 +38,8 @@ \ !!! The problem right now is that I have woken from keyboard, but the interrupt is still asserted \ So perhaps the interrupt handler didn't fire : rotate-wakeup? ( -- flag ) d# 15 gpio-wakeup? ; -: kbd-wakeup? ( -- flag ) d# 71 gpio-wakeup? ; -: tpd-wakeup? ( -- flag ) d# 160 gpio-wakeup? ; +: kbd-wakeup? ( -- flag ) soc-kbd-clk-gpio# gpio-wakeup? ; +: tpd-wakeup? ( -- flag ) soc-tpd-clk-gpio# gpio-wakeup? ; string-array wakeup-bit-names ," WU0 "

1 0

[commit] r3407 - cpu/arm/olpc
by repository service 02 Nov '12

02 Nov '12

Author: wmb Date: Fri Nov 2 21:08:05 2012 New Revision: 3407 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3407 Log: OLPC XO-4 - Trac #12169 - Isolate eMMC pins to avoid back-driving the eMMC voltage rail from the signal lines. Modified: cpu/arm/olpc/sdhci.fth Modified: cpu/arm/olpc/sdhci.fth ============================================================================== --- cpu/arm/olpc/sdhci.fth Thu Nov 1 22:02:34 2012 (r3406) +++ cpu/arm/olpc/sdhci.fth Fri Nov 2 21:08:05 2012 (r3407) @@ -21,21 +21,54 @@ ; ' olpc-card-inserted? to card-inserted? +[ifdef] olpc-cl4 +also forth definitions +: isolate-mmc3-pins ( gpio# #gpios -- ) + bounds do + i af@ 7 invert and 1 or i af! + i gpio-dir-out i gpio-clr + loop +; +: connect-mmc3-pins ( gpio# #gpios -- ) + bounds do + i af@ 7 invert and 2 or i af! + loop +; +: isolate-emmc ( -- ) + d# 108 4 isolate-mmc3-pins + d# 161 4 isolate-mmc3-pins + d# 145 2 isolate-mmc3-pins +; +: connect-emmc ( -- ) + d# 108 4 connect-mmc3-pins + d# 161 4 connect-mmc3-pins + d# 145 2 connect-mmc3-pins +; +previous definitions +[then] + \ Base-addr:power_GPIO - 1:35, 2:34, 3:33 : gpio-power-on ( -- ) sdhci-card-power-on [ifdef] en-emmc-pwr-gpio# - base-addr h# d428.1000 = if en-emmc-pwr-gpio# gpio-clr then + base-addr h# d428.1000 = if + [ifdef] connect-emmc connect-emmc [then] + en-emmc-pwr-gpio# gpio-clr + then [then] [ifdef] en-wlan-pwr-gpio# base-addr h# d428.0800 = if en-wlan-pwr-gpio# gpio-set then [then] +[then] ; ' gpio-power-on to card-power-on : gpio-power-off ( -- ) [ifdef] en-emmc-pwr-gpio# - base-addr h# d428.1000 = if en-emmc-pwr-gpio# gpio-set then + base-addr h# d428.1000 = if + en-emmc-pwr-gpio# gpio-set + [ifdef] isolate-emmc isolate-emmc [then] + then [then] [ifdef] en-wlan-pwr-gpio# base-addr h# d428.0800 = if en-wlan-pwr-gpio# gpio-clr then

1 0

[commit] r3406 - cpu/arm/mmp3
by repository service 01 Nov '12

01 Nov '12

Author: wmb Date: Thu Nov 1 22:02:34 2012 New Revision: 3406 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3406 Log: OLPC XO-4 - Fixed OLPC trac #12265 (HDMI colors swapped). Also changed the PHY tuning parameters per wad's recommendations. Modified: cpu/arm/mmp3/hdmi.fth Modified: cpu/arm/mmp3/hdmi.fth ============================================================================== --- cpu/arm/mmp3/hdmi.fth Thu Nov 1 05:59:36 2012 (r3405) +++ cpu/arm/mmp3/hdmi.fth Thu Nov 1 22:02:34 2012 (r3406) @@ -225,11 +225,11 @@ : select-3d ( -- ) pll-cfg0@ 1 invert and pll-cfg0! ; \ Tune these for best eye diagram -5 value damp 1 value eamp 0 value cp -0 value ajd 1 value svtx h# c value idrv +6 value damp 2 value eamp 0 value cp +0 value ajd 1 value svtx 8 value idrv : setup-phy ( freq -- ) - drop \ We may need to retune the phy for different frequencies + d# 148 = if 9 else 8 then to idrv select-phy @@ -323,34 +323,6 @@ \ : dither! ( n -- ) h# a0 lcd! ; \ : dither-table! ( n -- ) h# a4 lcd! ; -[ifdef] notdef -: tv-clear ( reg# -- ) 0 swap lcd! ; -: tv-unused-clear ( -- ) - h# 00 tv-clear h# 04 tv-clear h# 08 tv-clear \ Y0, U0, V0 start address - h# 10 tv-clear h# 14 tv-clear h# 18 tv-clear \ Y1, U1, V1 start address - h# 20 tv-clear h# 24 tv-clear \ Y+C pitch, U+V pitch - h# 28 tv-clear \ Video starting point on screen - h# 2c tv-clear h# 30 tv-clear \ Video source size, dest size - h# 38 tv-clear \ Graphic frame 1 start address - 0 0 tv-gfx-offset! - 0 0 tv-cursor-pos! - h# 68 tv-clear h# 6c tv-clear \ Cursor color 1, 2 - h# 70 tv-clear h# 74 tv-clear h# 78 tv-clear \ Y, U, V color keys -; -: tv-enable ( -- ) h# 5140 tv-dma-ctrl0! ; -: tv-misc ( -- ) - tv-unused-clear - h# 283eff00 tv-dma-ctrl1! - h# 00ff1001 tv-tvif! - h# 60010005 tv-divider! -; -: tv-base-res! ( hres vres -- ) - over bytes/pixel * tv-pitch! ( hres vres ) - 2dup tv-gfx-dst-res! ( hres vres ) - tv-active! ( ) -; -[then] - d# 16 value tv-bpp : init-tv-graphics ( -- ) init-tv-clock @@ -367,8 +339,7 @@ 7 d# 9 -bits \ Turn off YUV422PACK, YVYU422P, UYVY422P - 1 d# 12 -bits \ RGBswap -\ 1 d# 12 +bits \ RGBswap + 1 d# 12 +bits \ RGBswap (RGB, not BGR) 1 d# 27 +bits \ DMA AXI arbiter enable tv-dma-ctrl0!

1 0

[commit] r3405 - cpu/arm/olpc
by repository service 01 Nov '12

01 Nov '12

Author: quozl Date: Thu Nov 1 05:59:36 2012 New Revision: 3405 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3405 Log: OLPC XO-4 - nn-touchscreen, watch-fss, compensate for X coordinate reversal in firmware 0.0.0.6, slightly breaks rendering of previous firmware versions, add signal strength control with keyboard keys Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Thu Nov 1 00:32:08 2012 (r3404) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Nov 1 05:59:36 2012 (r3405) @@ -672,9 +672,10 @@ ; : xs>xy ( signal# -- x y ) - 2+ screen-w xleds 2* / * r - ( x ) - x>x' ( x' ) + screen-w xleds 2* / * ( x ) r 2/ + + x>x' ( x' ) + d# 10 - xy ( x y ) ; @@ -761,14 +762,30 @@ then ; +: watch-fss-sig ( ) + d# 50 d# 18 at-xy ." signal strength: " fs .d + d# 50 d# 20 at-xy ." d down " + d# 50 d# 21 at-xy ." u up " + d# 50 d# 22 at-xy ." q quit " +; + +: watch-fss-key ( stop-flag key -- stop-flag' ) + case + h# 1b of drop true endof + [char] q of drop true endof + [char] u of fs 2* d# 64 min to fs watch-fss-sig endof + [char] d of fs 2/ d# 1 max to fs watch-fss-sig endof + endcase +; + : watch-fss - empty - begin + watch-fss-sig empty watch-fss-sig false + begin ( stop-flag ) 0 watch-fss-axis - 1 watch-fss-axis key? + 1 watch-fss-axis key? if key watch-fss-key then + dup until - key drop - page + drop page ; [then]

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware November 2012