openfirmware

openfirmware@openfirmware.info

3007 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

[commit] r3404 - cpu/arm/olpc
by repository service 31 Oct '12

31 Oct '12

Author: quozl Date: Thu Nov 1 00:32:08 2012 New Revision: 3404 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3404 Log: OLPC XO-4 - touchscreen rework for firmware 0.0.0.6, which contained new behaviours not previously advised by Neonode Modified: cpu/arm/olpc/nn-touchscreen.fth cpu/arm/olpc/nnflash.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Oct 31 23:38:29 2012 (r3403) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Nov 1 00:32:08 2012 (r3404) @@ -17,7 +17,6 @@ create nn-os \ open short test create nn-fll \ forced LED levels test -create nn-version \ version display create nn-watch \ graphical signal tests create nn-fss \ optional fixed signal strength test @@ -29,6 +28,17 @@ d# 15 value xleds d# 11 value yleds +0. 2value version# +: get-version ( -- version.d ) version# ; + +: (.)' ( version-segment.w -- ) (.) type [char] . emit ; + +: .version ( version.d -- ) lwsplit (.)' (.)' lwsplit (.)' (.)' ; + +: show-version ( -- ) + ." Neonode zForce Touch Driver firmware version " version# .version cr +; + \ 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 ; @@ -43,7 +53,9 @@ : 2u.x base @ >r hex 0 <# # # #> type r> base ! ; [then] -: x>x' ( x -- x' ) screen-w swap - ; \ reverse x coordinate +defer x>x' ' noop to x>x' +: (x>x') ( x -- x' ) screen-w swap - ; \ reverse x coordinate +: set-reverse-x ['] (x>x') to x>x' ; : set-gpios [ifdef] olpc-cl2 @@ -55,11 +67,7 @@ ; \ Neonode requested 250 ms -\ we observe for 0.0.0.5 -\ less than 38 ms yields no response to reset, -\ 40 ms yields 100 ms overall version check, and -\ 45 ms yields 84 ms overall version check. -: reset ( -- ) touch-rst-gpio# dup gpio-clr gpio-set d# 50 ms ; +: 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@ ; @@ -104,6 +112,13 @@ : read-boot-complete ( -- ) h# 07 d# 0 anticipate ; +: read-version + h# 1e h# 01 h# ee 3 bytes-out h# 1e d# 100 anticipate + pbuf 2+ c@ h# 1e <> abort" bad response" + pbuf 9 + le-w@ pbuf 7 + le-w@ wljoin pbuf 5 + le-w@ pbuf 3 + le-w@ wljoin + to version# +; + : initialise ( -- ) h# 01 h# 01 h# ee 3 bytes-out h# 01 d# 20 anticipate ; : set-resolution ( -- ) @@ -125,6 +140,8 @@ : configure ( -- ) configure? if + read-version + version# h# 6. d< if set-reverse-x then initialise set-resolution start @@ -202,42 +219,6 @@ -[ifdef] nn-version \ version display -: (.version) ( addr -- ) - dup c@ over 1+ c@ bwjoin ( addr version ) - (.) type -; - -: .version ( -- ) - pbuf 3 + 3 0 do ( addr ) - (.version) 2+ - [char] . emit - loop ( addr ) - (.version) drop ( ) -; - -: (version) ( -- ) - h# 1e h# 01 h# ee 3 bytes-out - h# 1e d# 30 anticipate - pbuf 2+ c@ h# 1e <> abort" bad response" -; - -: test-version ( -- ) - (version) - ." Neonode zForce Touch Driver firmware version " - .version - cr -; - -: get-version ( -- version.d ) - (version) - pbuf 9 + le-w@ pbuf 7 + le-w@ wljoin pbuf 5 + le-w@ pbuf 3 + le-w@ wljoin -; - -[then] - - - [ifdef] nn-os \ open short test [ifdef] nn-components @@ -1003,7 +984,7 @@ : mb-smt ( -- error? ) open 0= if true exit then - test-version + show-version close false ; @@ -1034,7 +1015,7 @@ diagnostic-mode? if 0 to faults - [ifdef] nn-version test-version [then] + show-version [ifdef] nn-os test-os [then] [ifdef] nn-fss test-fss [then] [ifdef] nn-fll test-fll [then] Modified: cpu/arm/olpc/nnflash.fth ============================================================================== --- cpu/arm/olpc/nnflash.fth Wed Oct 31 23:38:29 2012 (r3403) +++ cpu/arm/olpc/nnflash.fth Thu Nov 1 00:32:08 2012 (r3404) @@ -17,7 +17,7 @@ : flash-nn! ( "filename" -- ) safe-parse-word reflash-nn ; : nn-up-to-date? ( file$ -- flag ) 2drop h# 0000.0000.0000.0006. \ FIXME: get version from file - get-touchscreen-version + get-touchscreen-version \ 20ms first time, 270ms subsequent d<= ;

1 0

[commit] r3403 - in cpu/arm: mmp3 olpc
by repository service 31 Oct '12

31 Oct '12

Author: wmb Date: Wed Oct 31 23:38:29 2012 New Revision: 3403 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3403 Log: OLPC XO-4 - Added HDMI driver. Added: cpu/arm/mmp3/hdmi.fth Modified: cpu/arm/olpc/lcd.fth Added: cpu/arm/mmp3/hdmi.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp3/hdmi.fth Wed Oct 31 23:38:29 2012 (r3403) @@ -0,0 +1,467 @@ +\ See license at end of file +purpose: MMP3 HDMI driver + +: +hdmi h# 20bc00 + ; +: hdmi! +hdmi io! ; +: hdmi@ +hdmi io@ ; + +: hdmi-i! ( b reg# -- ) swap 0 hdmi! h# 8000.0000 or 4 hdmi! ; +: hdmi-i@ ( reg# -- b ) h# 4000.0000 or 4 hdmi! 0 hdmi@ ; + +: phy-cfg0@ ( -- n ) h# 08 hdmi@ ; : phy-cfg0! ( n -- ) h# 08 hdmi! ; +: phy-cfg1@ ( -- n ) h# 0c hdmi@ ; : phy-cfg1! ( n -- ) h# 0c hdmi! ; +: phy-cfg2@ ( -- n ) h# 10 hdmi@ ; : phy-cfg2! ( n -- ) h# 10 hdmi! ; +: phy-cfg3@ ( -- n ) h# 14 hdmi@ ; : phy-cfg3! ( n -- ) h# 14 hdmi! ; + +: audio-cfg@ ( -- n ) h# 18 hdmi@ ; : audio-cfg! ( n -- ) h# 18 hdmi! ; +: clock-cfg@ ( -- n ) h# 1c hdmi@ ; : clock-cfg! ( n -- ) h# 1c hdmi! ; + +: pll-cfg0@ ( -- n ) h# 20 hdmi@ ; : pll-cfg0! ( n -- ) h# 20 hdmi! ; +: pll-cfg1@ ( -- n ) h# 24 hdmi@ ; : pll-cfg1! ( n -- ) h# 24 hdmi! ; +: pll-cfg2@ ( -- n ) h# 28 hdmi@ ; : pll-cfg2! ( n -- ) h# 28 hdmi! ; +: pll-cfg3@ ( -- n ) h# 2c hdmi@ ; : pll-cfg3! ( n -- ) h# 2c hdmi! ; + +: -bits ( n value bit# -- n' ) lshift invert and ; +: +bits ( n value bit# -- n' ) lshift or ; + +[ifdef] debug-words +h# f090099 value pll3-ctrl1 +h# 9b value pll3-fbdiv +h# 3 value pll3-refdiv +: pll3-on + h# 20000000 h# 58 mpmu-clr \ Reset PLL3 reset + h# 100 h# 50 mpmu-clr \ Ensure PLL3 off + 1 h# 60 mpmu-set \ set SEL_VCO_CLK_SE in PMUM_PLL3_CTRL2 + 0 pll3-refdiv d# 19 +bits pll3-fbdiv d# 10 +bits 1 d# 9 +bits h# 50 mpmu! + pll3-ctrl1 h# 58 mpmu! + h# 100 h# 50 mpmu-set \ Power up PLL3 + d# 50 us + h# 20000000 h# 58 mpmu-set \ Release PLL3 reset +; + +create pll-table-mmp2 + decimal +\ f div offset fb ref kvco + 25 , 4 , h# 4ec5 , 38 , 16 , h# c , + 27 , 4 , h# 35cb , 41 , 16 , h# b , + 54 , 2 , h# 35cb , 41 , 16 , h# b , + 74 , 2 , h# 84b , 57 , 16 , h# 3 , + 108 , 1 , h# 35cb , 41 , 16 , h# b , + 148 , 1 , h# 84b , 57 , 16 , h# 3 , + -1 , +hex +[then] + +create pll-table + decimal +\ 0 1 2 3 4 5 +\ f post offset fb ref kvco + 25 , 3 , h# 11c47 , 39 , 0 , h# 4 , + 27 , 3 , h# 12d03 , 42 , 0 , h# 4 , + 54 , 2 , h# 12d02 , 42 , 0 , h# 4 , + 74 , 2 , h# 0084b , 57 , 0 , h# 4 , + 108 , 1 , h# 12d03 , 42 , 0 , h# 4 , + 148 , 1 , h# 0084b , 57 , 0 , h# 4 , + -1 , +hex + +: find-pll ( freq -- adr ) + pll-table begin dup @ -1 <> while ( freq adr ) + 2dup @ = if nip exit then ( freq adr ) + 6 na+ ( freq adr' ) + repeat ( freq adr ) + -6 na+ +; + +1 value vpll-calclk-div +1 value vddm +9 value vddl +9 value icp +2 value vreg-ivref +0 value reset-offset +1 value clk-det-en +5 value intpi +0 value reset-intp-ext +1 value pll-mode +2 value vth-vpll-ca + +: pll-cfg ( freq -- ) + find-pll >r ( table-adr ) + + pll-cfg3@ 3 invert and pll-cfg3! \ Power off and reset + + 0 + intpi d# 27 +bits + clk-det-en d# 26 +bits + r@ 5 na+ @ d# 20 +bits \ KVCO + vreg-ivref d# 17 +bits + r@ 1 na+ @ d# 14 +bits \ POSTDIV + icp d# 10 +bits + vddl d# 6 +bits + vddm d# 4 +bits + vpll-calclk-div d# 1 +bits + 1 d# 0 +bits \ "Chicken bit" to enable PHY register access + pll-cfg0! + + 0 + vth-vpll-ca d# 29 +bits + 1 d# 24 +bits \ EN_PANEL + 1 d# 23 +bits \ EN_HDMI + r@ 2 na+ @ d# 4 +bits \ FREQ_OFFSET_INNER + pll-mode d# 3 +bits \ MODE + pll-cfg1! + + 0 \ FREQ_OFFSET_ADJ + pll-cfg2! + + pll-cfg3@ + h# fffc invert and \ Clear FBDIV and REFDIV fields + r@ 3 na+ @ d# 7 +bits + r@ 4 na+ @ d# 2 +bits + dup pll-cfg3! \ Set divisors + 1 or dup pll-cfg3! 1 ms \ Power up + 2 or pll-cfg3! \ Release reset + + d# 100 0 do + pll-cfg3@ h# 400000 and ?leave + 1 ms + i 9 = if ." HDMI PLL failed to lock" cr then + loop + + r> drop +; + +: send-packet ( adr len packet# -- ) + >r ( adr len r: packet# ) + r@ d# 32 * h# 60 + ( adr len index ) + + \ Clear trailing bytes + over d# 31 swap ?do ( adr len index ) + 0 i hdmi-i! ( adr len index ) + loop + + 0 swap 2swap ( sum index adr len ) + 0 ?do ( sum index adr ) + 2dup i + c@ ( sum index adr index byte ) + tuck swap c! ( sum index adr byte ) + 3 roll + -rot ( sum' index adr ) + loop ( sum index adr ) + drop ( sum index ) + swap negate h# ff and ( index sum' ) + over 3 + hdmi-i! ( index ) + + \ I'm not sure what this is for; one of the drivers did it + 1 over d# 31 + hdmi-i! ( index ) + drop ( ) + + 1 r> lshift dup h# 5f hdmi-i! h# 5e hdmi-i! \ HDTX_HOST_PKT_CTRL1/0 +; + +create avi-packet + h# 82 c, h# 2 c, h# 0d c, 0 c, \ 0-3: header + h# 10 c, \ 4: 10 is active format, validates bits 3:0 of next byte + h# a8 c, \ 5: 80 is ITU709 colors, 20 is 16:9, 8 is same aspect ratio + h# 00 c, \ 6: 80 bit means computer display ... + h# 00 c, \ 7: panel type + 0 c, \ 8: pixel repetition factor + \ The rest would be top, bottom, left, right bars +here avi-packet - constant /avi-packet + +\ The columns up to "Code" are from CEA-861-D (the DVI spec) +\ The remaining columns (sync parameters) are from Marvell bringup code - lcd0_tv.c + +create hdmi-resolutions +decimal +\ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +\ Hact Vact Refr Htot Hblnk Vtotal Vblnk PxMHz Code Hsync Hfp Hbp Vsync Vfp Vbp + 640 , 480 , 60 , 800 , 160 , 525 , 45 , 25 , 1 , 96 , 48 , 16 , 2 , 33 , 10 , + 720 , 480 , 60 , 858 , 138 , 525 , 45 , 27 , 3 , 62 , 60 , 16 , 6 , 30 , 9 , + 1280 , 720 , 60 , 1650 , 370 , 750 , 30 , 74 , 4 , 40 , 220 , 110 , 5 , 20 , 5 , + 1440 , 240 , 60 , 1716 , 276 , 262 , 22 , 27 , 9 , 124 , 114 , 38 , 3 , 15 , 4 , +\ 2880 , 240 , 60 , 3432 , 552 , 262 , 22 , 54 , 13 , ??? \ Sync values unknown ... +\ 1440 , 480 , 60 , 1716 , 276 , 525 , 45 , 54 , 15 , ??? + 1920 , 1080 , 60 , 2200 , 280 , 1125 , 45 , 148 , 16 , 44 , 148 , 88 , 5 , 36 , 4 , + 720 , 576 , 50 , 864 , 144 , 625 , 49 , 27 , 18 , 64 , 68 , 12 , 5 , 39 , 5 , + 1440 , 288 , 50 , 1728 , 288 , 312 , 24 , 27 , 24 , 126 , 138 , 24 , 3 , 18 , 3 , +\ 2880 , 288 , 50 , 3456 , 576 , 312 , 24 , 54 , 28 , ??? +\ 2880 , 480 , 60 , 3432 , 552 , 525 , 45 , 108 , 36 , ??? +\ 2880 , 576 , 50 , 3456 , 576 , 625 , 49 , 108 , 38 , ??? +-1 , +hex + +0 value res-adr +: res@ ( index -- value ) res-adr swap na+ @ ; + +: find-resolution ( h v -- error? ) + hdmi-resolutions begin ( h v adr ) + dup @ -1 <> ( h v adr flag ) + while ( h v adr ) + 3dup 2@ swap d= if ( h v adr ) + to res-adr 2drop ( ) + false exit ( -- adr false ) + then ( h v adr ) + d# 15 na+ ( h v adr' ) + repeat ( h v adr ) + 3drop true +; + +: set-hdmi-clock-cfg ( -- ) +\ 3 \ The docs say to write 0 to bits 0:3 but the code writes 3 + \ On MMP2 this is the the FIFO read and write timing + 0 + 1 4 +bits \ HDMI_ENABLE + 6 5 +bits \ MCLK_DIV + 5 9 +bits \ TCLK_DIV + 5 d# 13 +bits \ PRCLK_DIV + clock-cfg! +; +: hdmi-set-detection ( on/off -- ) + h# 14 hdmi@ h# 400 ( on/off value bitmask ) + rot if or else invert and then ( value' ) + h# 14 hdmi! +; + +: select-phy ( -- ) pll-cfg0@ 1 or pll-cfg0! ; \ alias phy select-phy +: 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 + +: setup-phy ( freq -- ) + drop \ We may need to retune the phy for different frequencies + + select-phy + + damp o# 1111 * + eamp o# 11110000 * or + cp h# 55000000 * or + phy-cfg0! + + ajd h# f0000000 * + svtx o# 1111 * d# 16 +bits + idrv h# 1111 * 0 +bits + phy-cfg1! +; +: setup-fifo ( -- ) + 1 h# 3a hdmi-i! \ HDMI, not DCI, Mode. No pixel repetition + 1 h# 48 hdmi-i! \ DC_FIFO_WR_PTR \ Alt value: 0 + h# 1a h# 49 hdmi-i! \ DC_FIFO_RD_PTR \ Alt value: 1f + + 1 h# 47 hdmi-i! \ DC_FIFO_SFT_RST + 0 h# 47 hdmi-i! \ DC_FIFO_SFT_RST + + 8 h# 131 hdmi-i! \ PHY_FIFO_PTRS \ Alt value: 80 + + 1 h# 130 hdmi-i! \ PHY_FIFO_SOFT_RST + 0 h# 130 hdmi-i! \ PHY_FIFO_SOFT_RST + + 0 h# 39 hdmi-i! \ VIDEO_CTRL + h# 40 h# 39 hdmi-i! \ VIDEO_CTRL (set INT_FRM_SEL) \ Alt value: 58 +; + +: hdmi-video-cfg ( -- ) + true hdmi-set-detection + + 7 res@ pll-cfg + + set-hdmi-clock-cfg + + 0 phy-cfg2! \ Unreset TX + h# 0001.0000 phy-cfg2! \ RESET_TX + h# 10 phy-cfg2! \ Termination + + 8 res@ avi-packet 7 + c! + avi-packet /avi-packet 1 send-packet + + h# e0 h# 58 hdmi-i! \ HDTX_TDATA3_0 + h# 83 h# 59 hdmi-i! \ HDTX_TDATA3_1 + h# 0f h# 5a hdmi-i! \ HDTX_TDATA3_2 + + 7 res@ setup-phy + setup-fifo +; + +: init-tv-clock ( -- ) + h# 4c pmua@ dup h# 10 and 0= if ( val ) +\ h# f8fc0 invert and \ Clear prescaler and divisor fields +\ h# d0280 or \ DSI PHY Prescaler to default value 1a, /2, PLL2 +\ dup h# 4c pmua! ( val ) +\ h# 103f or ( val' ) +\ dup h# 4c pmua! ( val ) + then ( val ) + h# 2000 or h# 4c pmua! ( ) \ Enable HDMI ref clock + + \ Integer divisor (5), reserved (1<<16), select HDMI CLK (3<<29) +\ 5 1 d# 16 +bits 3 d# 29 +bits h# 9c lcd! \ LCD_TCLK_DIV + 5 3 d# 29 +bits h# 9c lcd! \ LCD_TCLK_DIV +; + +: lcd-xy! ( hor vert reg# -- ) >r wljoin r> lcd! ; +\ : tv-video-src-res! ( hor vert -- ) wljoin h# 2c lcd! ; +\ : tv-video-dst-res! ( hor vert -- ) wljoin h# 30 lcd! ; +: tv-gfx-base! ( adr -- ) h# 34 lcd! ; +: tv-gfx-pitch! ( pitch -- ) h# 3c lcd! ; +: tv-gfx-offset! ( hor vert -- ) h# 40 lcd-xy! ; +: tv-gfx-src-res! ( hor vert -- ) h# 44 lcd-xy! ; +: tv-gfx-dst-res! ( hor vert -- ) h# 48 lcd-xy! ; +: tv-cursor-pos! ( hor vert -- ) h# 4c lcd-xy! ; +: tv-cursor-size! ( hor vert -- ) h# 50 lcd-xy! ; +: tv-size! ( hor vert -- ) h# 54 lcd-xy! ; +: tv-active! ( hor vert -- ) h# 58 lcd-xy! ; +: tv-porch! ( hfront hback vfront vback -- ) h# 60 lcd-xy! h# 5c lcd-xy! ; +: tv-blank-color! ( color -- ) h# 64 lcd! ; +: tv-vsync! ( rising falling -- ) h# 7c lcd-xy! ; +: tv-dma-ctrl0! ( n -- ) h# 80 lcd! ; : tv-dma-ctrl0@ ( -- n ) h# 80 lcd@ ; +: tv-dma-ctrl1! ( n -- ) h# 84 lcd! ; +: tv-contrast! ( contrast brightness -- ) h# 88 lcd-xy! ; +: tv-saturation! ( saturation mult -- ) h# 8c lcd-xy! ; +: tv-hue! ( cos sin -- ) h# 90 lcd-xy! ; +: tv-tvif! ( n -- ) h# 94 lcd! ; : tv-tvif@ ( -- n ) h# 94 lcd@ ; +: tv-divider! ( n -- ) h# 9c lcd! ; + +\ : 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 + + 0 tv-dma-ctrl0! \ Start with graphics DMA off + + 0 res@ 1 res@ tv-active! + + tv-dma-ctrl0@ + 1 d# 8 +bits \ DMA enable + + h# f d# 16 -bits + 0 d# 16 +bits \ Pixel format RGB565 + + 7 d# 9 -bits \ Turn off YUV422PACK, YVYU422P, UYVY422P + + 1 d# 12 -bits \ RGBswap +\ 1 d# 12 +bits \ RGBswap + + 1 d# 27 +bits \ DMA AXI arbiter enable + tv-dma-ctrl0! + +\ tv-dma-ctrl1@ h# a00eff00 or tv-dma-ctrl1! \ or h# 2000FF04; +\ h# 283eff00 tv-dma-ctrl1! + h# 2803ff00 tv-dma-ctrl1! + + h# f4 lcd@ tv-gfx-base! \ Same base address as DCON panel + hdisp vdisp tv-gfx-src-res! \ Same source res as DCON panel + + hdisp bytes/pixel * tv-gfx-pitch! + + 0 res@ 1 res@ tv-gfx-dst-res! + + h# 00ff1000 tv-tvif! \ XXX check this + + \ hbp hres+hbp + d# 11 res@ dup 0 res@ + tv-vsync! + + \ htotal vtotal + 3 res@ 5 res@ tv-size! + + \ hfp hbp vfp vbp + d# 10 res@ d# 11 res@ d# 13 res@ d# 14 res@ tv-porch! + +\ /* deafult registers */ +\ BU_REG_WRITE( LCD_SRAM_CTRL, 0 ); +\ BU_REG_WRITE( LCD_SRAM_WRDAT, 0 ); +\ BU_REG_WRITE( LCD_SRAM_PARA0, 0 ); +\ BU_REG_WRITE( LCD_SRAM_PARA1, 0x0 ); + + h# 4000 0 tv-contrast! + h# 4000 h# 2000 tv-saturation! + h# 4000 0 tv-hue! + + h# 1bc lcd@ h# 30 or h# 1bc lcd! \ PN_IOPAD_CONTROL - 1K boundary, burst 16 + + h# 1dc lcd@ h# fff0 or h# 1dc lcd! \ LCD_TOP_CTRL - burst lengths + + tv-tvif@ 1 or tv-tvif! \ Enable +; + +: start-hdmi ( h v -- ) + \ XXX need to do monitor detection and use EDID to find its resolutions + find-resolution abort" Unsupported resolution" ( ) + init-tv-graphics + hdmi-video-cfg +; + +: 720p d# 1280 d# 720 start-hdmi ; +: 1080p d# 1920 d# 1080 start-hdmi ; + +also forth definitions +: 1080p ( -- ) " 1080p" $call-screen ; +: 720p ( -- ) " 720p" $call-screen ; +previous definitions + +\ /* A:B means that g_res_support[B] = 1 if videoID == A */ +\ /* 1:3 2:0 3:0 4:1 8:4 9:4 12:7 13:7 14:8 15:8 16:2 17:2 18:2 */ +\ /* 21:10 22:10 23:6 24:6 27:9 28:9 35:11 36:11 37:12 38:12 */ +\ static enum edid_returns edid_parseSVD(unsigned char *data_buf,unsigned char svd_len) // Short Video Descriptor +\ { +\ for (unsigned char dataOfs = 0; ++dataOfs <= svd_len; ) { // Skip the header +\ unsigned char videoID = (data_buf[dataOfs] & 0x7F); // Parse SVD +\ if (videoID == 0 || videoID >= sizeof(video_code_map)/sizeof(struct cea_res_info)) { continue; } /* Don't add it */ +\ switch (videoID){ +\ /* See comment above */ +\ } +\ } +\ return EDID_ERR_OK; +\ } + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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/lcd.fth ============================================================================== --- cpu/arm/olpc/lcd.fth Wed Oct 31 22:38:19 2012 (r3402) +++ cpu/arm/olpc/lcd.fth Wed Oct 31 23:38:29 2012 (r3403) @@ -355,6 +355,10 @@ ' display-install is-install ' display-remove is-remove ' display-selftest is-selftest + +[ifdef] mmp3 +fload ${BP}/cpu/arm/mmp3/hdmi.fth +[then] end-package devalias screen /display @@ -367,6 +371,7 @@ ' 15x30pc to romfont [then] + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \

1 0

[commit] r3402 - in cpu/arm/olpc: . 4.0
by repository service 31 Oct '12

31 Oct '12

Author: quozl Date: Wed Oct 31 22:38:19 2012 New Revision: 3402 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3402 Log: OLPC XO-4 - new touchscreen firmware 0.0.0.6 Modified: cpu/arm/olpc/4.0/nn-version.fth cpu/arm/olpc/nnflash.fth Modified: cpu/arm/olpc/4.0/nn-version.fth ============================================================================== --- cpu/arm/olpc/4.0/nn-version.fth Wed Oct 31 03:14:54 2012 (r3401) +++ cpu/arm/olpc/4.0/nn-version.fth Wed Oct 31 22:38:19 2012 (r3402) @@ -1,5 +1,5 @@ \ The Neonode touchscreen firmware -macro: NN_VERSION 0_0_0_5 +macro: NN_VERSION 0_0_0_6 \ FIXME: change in nnflash.fth too, until it knows how to read it \ using Neonode's instructions. Modified: cpu/arm/olpc/nnflash.fth ============================================================================== --- cpu/arm/olpc/nnflash.fth Wed Oct 31 03:14:54 2012 (r3401) +++ cpu/arm/olpc/nnflash.fth Wed Oct 31 22:38:19 2012 (r3402) @@ -16,7 +16,7 @@ : flash-nn ( "filename" -- ) safe-parse-word ?enough-power reflash-nn ; : flash-nn! ( "filename" -- ) safe-parse-word reflash-nn ; : nn-up-to-date? ( file$ -- flag ) - 2drop h# 0000.0000.0000.0005. \ FIXME: get version from file + 2drop h# 0000.0000.0000.0006. \ FIXME: get version from file get-touchscreen-version d<= ;

1 0

[commit] r3401 - in cpu/arm/olpc: . 4.0
by repository service 31 Oct '12

31 Oct '12

Author: quozl Date: Wed Oct 31 03:14:54 2012 New Revision: 3401 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3401 Log: OLPC XO-4 - touchscreen firmware ship, automatic upgrade infrastructure for post-B1, enable full touchscreen diagnostics. Modified: cpu/arm/olpc/4.0/olpc.bth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/nn-touchscreen.fth cpu/arm/olpc/nnflash.fth Modified: cpu/arm/olpc/4.0/olpc.bth ============================================================================== --- cpu/arm/olpc/4.0/olpc.bth Wed Oct 31 00:26:46 2012 (r3400) +++ cpu/arm/olpc/4.0/olpc.bth Wed Oct 31 03:14:54 2012 (r3401) @@ -2,7 +2,7 @@ command: &builder &this in: ${BP}/cpu/arm/olpc/4.0/build/ec.img -\ in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex +in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex in: ${BP}/cpu/arm/olpc/4.0/build/fw.img in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img in: ${BP}/cpu/arm/olpc/4.0/build/mcastnand.bin @@ -155,7 +155,7 @@ " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin " ec.img" " ecimage.bin" $add-deflated-dropin -\ " nn.hex" " nn.hex" $add-deflated-dropin + " nn.hex" " nn.hex" $add-deflated-dropin " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Wed Oct 31 00:26:46 2012 (r3400) +++ cpu/arm/olpc/build-fw.fth Wed Oct 31 03:14:54 2012 (r3401) @@ -366,7 +366,7 @@ fload ${BP}/cpu/arm/mmp2/fuse.fth [ifdef] bsl-uart-base fload ${BP}/cpu/arm/olpc/bsl.fth -\ fload ${BP}/cpu/arm/olpc/nnflash.fth +fload ${BP}/cpu/arm/olpc/nnflash.fth [then] [ifndef] virtual-mode Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Oct 31 00:26:46 2012 (r3400) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Oct 31 03:14:54 2012 (r3401) @@ -20,11 +20,11 @@ create nn-version \ version display create nn-watch \ graphical signal tests -\ create nn-fss \ optional fixed signal strength test +create nn-fss \ optional fixed signal strength test \ create nn-ls \ optional low signals test -\ create nn-fss-all \ fixed signal strength test, all power levels +create nn-fss-all \ fixed signal strength test, all power levels -\ create nn-components \ isolate test results to failed component identifier +create nn-components \ isolate test results to failed component identifier d# 15 value xleds d# 11 value yleds @@ -53,7 +53,13 @@ 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 ; + +\ Neonode requested 250 ms +\ we observe for 0.0.0.5 +\ less than 38 ms yields no response to reset, +\ 40 ms yields 100 ms overall version check, and +\ 45 ms yields 84 ms overall version check. +: reset ( -- ) touch-rst-gpio# dup gpio-clr gpio-set d# 50 ms ; : hold-reset ( -- ) touch-rst-gpio# gpio-clr ; : no-data? ( -- no-data? ) touch-int-gpio# gpio-pin@ ; Modified: cpu/arm/olpc/nnflash.fth ============================================================================== --- cpu/arm/olpc/nnflash.fth Wed Oct 31 00:26:46 2012 (r3400) +++ cpu/arm/olpc/nnflash.fth Wed Oct 31 03:14:54 2012 (r3401) @@ -30,6 +30,9 @@ ; : update-nn-flash? ( -- flag ) + \ XO-4 B1 have clear lightguides incompatible with later versions + \ of touchscreen firmware. + board-revision h# 4b20 < if false exit then nn-image$ nn-up-to-date? 0= ;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware