openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3191 - cpu/arm/mmp2
by repository service 17 Aug '12

17 Aug '12

Author: wmb Date: Fri Aug 17 19:20:39 2012 New Revision: 3191 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3191 Log: OLPC ARM - Changed the unit numbers for some TWSI nodes so they don't conflict with auto-assigned unit numbers of i2c gpio nodes. Modified: cpu/arm/mmp2/twsi.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Fri Aug 17 19:19:25 2012 (r3190) +++ cpu/arm/mmp2/twsi.fth Fri Aug 17 19:20:39 2012 (r3191) @@ -190,9 +190,9 @@ 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 0 make-twsi-node \ TWSI4 + 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 1 make-twsi-node \ TWSI6 + h# d4034000 d# 31 4 true true 4 make-twsi-node \ TWSI6 0 0 " 1a" " /i2c@d4011000" begin-package \ TWSI1

1 0

[commit] r3190 - cpu/arm/mmp2
by repository service 17 Aug '12

17 Aug '12

Author: wmb Date: Fri Aug 17 19:19:25 2012 New Revision: 3190 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3190 Log: OLPC ARM - Added #address-cells, #size-cells, encode-unit, and decode-unit methods to i2c-gpio device nodes so they can have children with reg properties. Modified: cpu/arm/mmp2/gpio.fth Modified: cpu/arm/mmp2/gpio.fth ============================================================================== --- cpu/arm/mmp2/gpio.fth Fri Aug 17 06:11:00 2012 (r3189) +++ cpu/arm/mmp2/gpio.fth Fri Aug 17 19:19:25 2012 (r3190) @@ -96,6 +96,13 @@ 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 @@ -106,6 +113,12 @@ 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

1 0

[commit] r3189 - dev
by repository service 17 Aug '12

17 Aug '12

Author: quozl Date: Fri Aug 17 06:11:00 2012 New Revision: 3189 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3189 Log: OLPC - libertas antenna test, translate baseband processor register antenna numbers to the same numbering as used by the user interface. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Fri Aug 17 05:53:07 2012 (r3188) +++ dev/libertas.fth Fri Aug 17 06:11:00 2012 (r3189) @@ -2203,8 +2203,8 @@ : .rx-antenna ( antenna -- ) 6 rshift case - b# 00 of ." 0" endof - b# 01 of ." 1" endof + b# 00 of ." 1" endof + b# 01 of ." 2" endof b# 10 of ." d" endof \ diversity b# 11 of ." ?" endof endcase @@ -2213,8 +2213,8 @@ : .tx-antenna ( antenna -- ) 6 rshift case - b# 00 of ." 0" endof - b# 01 of ." 1" endof + b# 00 of ." 1" endof + b# 01 of ." 2" endof b# 10 of ." r" endof \ same antenna as receive antenna b# 11 of ." ?" endof endcase

1 0

[commit] r3188 - dev
by repository service 17 Aug '12

17 Aug '12

Author: quozl Date: Fri Aug 17 05:53:07 2012 New Revision: 3188 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3188 Log: OLPC - libertas antenna test, comply with new firmware specification that requires ordering of antenna selection commands. Now works on XO-4 A2. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Fri Aug 17 01:27:49 2012 (r3187) +++ dev/libertas.fth Fri Aug 17 05:53:07 2012 (r3188) @@ -1692,12 +1692,18 @@ outbuf-wait drop ; +\ When changing from antenna diversity to single antenna, +\ issue ACT_SET_TX before ACT_SET_RX. : set-antenna ( antenna -- ) - 1 ( ACT_SET_RX ) rf-antenna ( ) + dup 2 ( ACT_SET_TX ) rf-antenna ( antenna ) + 1 ( ACT_SET_RX ) rf-antenna ( ) ; +\ When changing from single antenna to antenna diversity, +\ issue ACT_SET_RX before ACT_SET_TX. : set-antenna-diversity ( -- ) h# ffff 1 ( ACT_SET_RX ) rf-antenna + h# ffff 2 ( ACT_SET_TX ) rf-antenna ; : get-antenna ( -- antenna ) @@ -2197,18 +2203,20 @@ : .rx-antenna ( antenna -- ) 6 rshift case - b# 00 of ." 0" endof - b# 01 of ." 1" endof - b# 10 of ." d" endof + b# 00 of ." 0" endof + b# 01 of ." 1" endof + b# 10 of ." d" endof \ diversity + b# 11 of ." ?" endof endcase ; : .tx-antenna ( antenna -- ) 6 rshift case - b# 00 of ." 0" endof - b# 01 of ." 1" endof - b# 10 of ." r" endof + b# 00 of ." 0" endof + b# 01 of ." 1" endof + b# 10 of ." r" endof \ same antenna as receive antenna + b# 11 of ." ?" endof endcase ; @@ -2221,8 +2229,8 @@ get-antenna ( base antenna ) hex ." ant" .antenna ( base ) - ." rx " h# 3f bbp-reg@ .rx-antenna - ." tx " h# 40 bbp-reg@ .tx-antenna + ." rx " h# 3f bbp-reg@ .rx-antenna ( base ) + ." tx " h# 40 bbp-reg@ .tx-antenna ( base ) base ! ; @@ -2236,16 +2244,16 @@ ." keys: (0,1,2,3,d,a,s,q)" cr begin d# 100 ms show-antenna key? if - cr show-antenna key + cr key case - h# 71 ( q ) of cr exit endof - h# 1b of cr exit endof - h# 30 ( 0 ) of ." antenna to 0" 0 set-antenna endof - h# 31 ( 1 ) of ." antenna to 1" 1 set-antenna endof - h# 32 ( 2 ) of ." antenna to 2" 2 set-antenna endof - h# 33 ( 3 ) of ." antenna to 3" 3 set-antenna endof - h# 64 ( d ) of ." diversity" cr set-antenna-diversity endof - h# 61 ( a ) of ." associate" cr close open drop endof + h# 71 ( q ) of ." quit" exit endof + h# 1b of exit endof + h# 30 ( 0 ) of ." antenna to 0 " 0 set-antenna cr endof + h# 31 ( 1 ) of ." antenna to 1 " 1 set-antenna cr endof + h# 32 ( 2 ) of ." antenna to 2 " 2 set-antenna cr endof + h# 33 ( 3 ) of ." antenna to 3 " 3 set-antenna cr endof + h# 64 ( d ) of ." diversity " set-antenna-diversity cr endof + h# 61 ( a ) of ." associate " close open drop endof h# 73 ( s ) of ta-scan endof endcase then

1 0

[commit] r3187 - cpu/arm/mmp2 cpu/arm/olpc/1.75 cpu/arm/olpc/cl4 dev/olpc/dcon dev/olpc/mmp2camera
by repository service 16 Aug '12

16 Aug '12

Author: wmb Date: Fri Aug 17 01:27:49 2012 New Revision: 3187 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3187 Log: OLPC ARM - Added I2C GPIO device nodes. Modified: cpu/arm/mmp2/gpio.fth cpu/arm/mmp2/twsi.fth cpu/arm/olpc/1.75/gpiopins.fth cpu/arm/olpc/cl4/gpiopins.fth dev/olpc/dcon/mmp2dcon.fth dev/olpc/mmp2camera/platform.fth Modified: cpu/arm/mmp2/gpio.fth ============================================================================== --- cpu/arm/mmp2/gpio.fth Fri Aug 17 01:27:02 2012 (r3186) +++ cpu/arm/mmp2/gpio.fth Fri Aug 17 01:27:49 2012 (r3187) @@ -78,10 +78,38 @@ 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 swap ( low? gpionum r: gpioname$ ) - " /gpio" encode-phandle ( low? gpionum propval$ r: gpioname$ ) - rot encode-int encode+ ( low? propval$' r: gpioname$ ) - rot encode-int encode+ ( propval$' r: 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 + + 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 + + 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 Fri Aug 17 01:27:02 2012 (r3186) +++ cpu/arm/mmp2/twsi.fth Fri Aug 17 01:27:49 2012 (r3187) @@ -188,7 +188,7 @@ \ baseadr clk irq mux? fast? unit# h# d4011000 1 7 false true 2 make-twsi-node \ TWSI1 -\ h# d4031000 2 0 true true N make-twsi-node \ TWSI2 + 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 0 make-twsi-node \ TWSI4 \ h# d4038000 d# 30 3 true true N make-twsi-node \ TWSI5 @@ -226,6 +226,12 @@ my-address my-space 1 reg end-package +0 0 " 68" " /i2c@d4031000" begin-package \ TWSI2 + " rtc" name + " idt,idt1338-rtc" +compatible + my-address my-space 1 reg +end-package + 0 0 " " " /" begin-package " twsi" name Modified: cpu/arm/olpc/1.75/gpiopins.fth ============================================================================== --- cpu/arm/olpc/1.75/gpiopins.fth Fri Aug 17 01:27:02 2012 (r3186) +++ cpu/arm/olpc/1.75/gpiopins.fth Fri Aug 17 01:27:49 2012 (r3187) @@ -15,6 +15,9 @@ d# 161 constant dcon-scl-gpio# d# 110 constant dcon-sda-gpio# +d# 100 constant dcon-stat0-gpio# +d# 101 constant dcon-stat1-gpio# + d# 124 constant dcon-irq-gpio# d# 142 constant dcon-load-gpio# Modified: cpu/arm/olpc/cl4/gpiopins.fth ============================================================================== --- cpu/arm/olpc/cl4/gpiopins.fth Fri Aug 17 01:27:02 2012 (r3186) +++ cpu/arm/olpc/cl4/gpiopins.fth Fri Aug 17 01:27:49 2012 (r3187) @@ -15,6 +15,9 @@ d# 168 constant dcon-scl-gpio# d# 167 constant dcon-sda-gpio# +d# 100 constant dcon-stat0-gpio# +d# 101 constant dcon-stat1-gpio# + d# 126 constant dcon-irq-gpio# d# 142 constant dcon-load-gpio# Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Fri Aug 17 01:27:02 2012 (r3186) +++ dev/olpc/dcon/mmp2dcon.fth Fri Aug 17 01:27:49 2012 (r3187) @@ -18,6 +18,21 @@ " OLPC DCON panel" model : +i encode-int encode+ ; + 0 0 encode-bytes + dcon-stat0-gpio# 0 encode-gpio + dcon-stat1-gpio# 0 encode-gpio + dcon-load-gpio# 0 encode-gpio + dcon-irq-gpio# 0 encode-gpio + " gpios" property + + " stat0" encode-string + " stat1" encode-string encode+ + " load" encode-string encode+ + " irq" encode-string encode+ + " gpio-names" property + + " /dcon-i2c" encode-phandle " i2c-parent" property + decimal 0 0 encode-bytes \ xres, yres, refresh, clockhz, left, right, top, bottom, hsync, vsync, flags, widthmm, heightmm Modified: dev/olpc/mmp2camera/platform.fth ============================================================================== --- dev/olpc/mmp2camera/platform.fth Fri Aug 17 01:27:02 2012 (r3186) +++ dev/olpc/mmp2camera/platform.fth Fri Aug 17 01:27:49 2012 (r3187) @@ -4,6 +4,8 @@ headers hex +" /camera-i2c" encode-phandle " i2c-parent" property + 0 value camera-smb-slave : camera-smb-setup ( -- ) 1 to smb-dly-us

1 0

[commit] r3186 - cpu/arm/olpc/cl4
by repository service 16 Aug '12

16 Aug '12

Author: wmb Date: Fri Aug 17 01:27:02 2012 New Revision: 3186 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3186 Log: OLPC ARM - Finished adding USB properties. Added: cpu/arm/olpc/cl4/usb.fth Modified: cpu/arm/olpc/cl4/fw.bth Modified: cpu/arm/olpc/cl4/fw.bth ============================================================================== --- cpu/arm/olpc/cl4/fw.bth Fri Aug 17 01:25:00 2012 (r3185) +++ cpu/arm/olpc/cl4/fw.bth Fri Aug 17 01:27:02 2012 (r3186) @@ -17,7 +17,7 @@ fload ${BP}/cpu/arm/olpc/cl4/uart.fth fload ${BP}/cpu/arm/olpc/cl4/sdhci.fth fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth -fload ${BP}/cpu/arm/olpc/1.75/usb.fth +fload ${BP}/cpu/arm/olpc/cl4/usb.fth fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth fload ${BP}/cpu/arm/olpc/cl4/switches.fth fload ${BP}/cpu/arm/olpc/cl4/leds.fth Added: cpu/arm/olpc/cl4/usb.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/cl4/usb.fth Fri Aug 17 01:27:02 2012 (r3186) @@ -0,0 +1,17 @@ +purpose: Platform-specific USB elaborations +\ See license at end of file + +dev /usb@d4208000 + \ Port 1 on the hub is connected to unused pins on the WLAN connector, + \ so testing it is confusing + \ Port 2 is right upper + \ Port 3 is left + " 3,2" " usb-hub-test-list" string-property +device-end + +: (reset-usb-hub) ( -- ) + usb-hub-reset-gpio# gpio-clr d# 10 ms usb-hub-reset-gpio# gpio-set +; +' (reset-usb-hub) to reset-usb-hub + +devalias u /usb/disk

1 0

[commit] r3185 - cpu/arm/marvell cpu/arm/mmp2 cpu/arm/mmp3 cpu/arm/olpc cpu/arm/olpc/3.0 dev/usb2/hcd/ehci
by repository service 16 Aug '12

16 Aug '12

Author: wmb Date: Fri Aug 17 01:25:00 2012 New Revision: 3185 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3185 Log: OLPC ARM - Added USB properties. Modified: cpu/arm/marvell/utmiphy.fth cpu/arm/mmp2/ulpiphy.fth cpu/arm/mmp3/usb2phy.fth cpu/arm/olpc/3.0/usb.fth cpu/arm/olpc/usb.fth dev/usb2/hcd/ehci/ehci.fth Modified: cpu/arm/marvell/utmiphy.fth ============================================================================== --- cpu/arm/marvell/utmiphy.fth Thu Aug 16 22:17:14 2012 (r3184) +++ cpu/arm/marvell/utmiphy.fth Fri Aug 17 01:25:00 2012 (r3185) @@ -1,6 +1,13 @@ \ See license at end of file purpose: Init UTMI USB Phy in Marvell SoC +0 0 " d4207000" " /" begin-package + +" usb2-phy" device-name + +my-address my-space h# 100 reg +" mrvl,mmp2-utmiphy" +compatible + : +utmi ( offset -- offset' ) h# 20.7000 + ; h# 04 +utmi constant utmi-ctrl @@ -36,7 +43,7 @@ h# 0000.00f0 value rx-clr \ RX_SQ_THRESH h# 0000.00a0 value rx-set \ a -: init-usb-phy ( -- ) +: init ( -- ) [ifdef] notdef ." Interacting before USB PHY init." cr ." Change pll-set, tx-set, rx-set as desired then type 'resume'" cr @@ -83,3 +90,8 @@ ; : enable-ulpi-phy ( -- ) h# 100 utmi-ctl1 io-set ; : select-ulpi-data ( -- ) h# 200 utmi-ctl1 io-set ; + +: open ( -- true ) true ; +: close ; + +end-package Modified: cpu/arm/mmp2/ulpiphy.fth ============================================================================== --- cpu/arm/mmp2/ulpiphy.fth Thu Aug 16 22:17:14 2012 (r3184) +++ cpu/arm/mmp2/ulpiphy.fth Fri Aug 17 01:25:00 2012 (r3185) @@ -1,6 +1,10 @@ \ See license at end of file purpose: Access to miscellaneous control/enable registers for the ULPI PHY portion of the USB SPH controller +0 0 " d4207000" " /" begin-package + +" mrvl,mmp2-ulpiphy" +compatible + h# 3800 io2-va + constant usbsph-misc-va : usbsph-misc@ ( -- n ) usbsph-misc-va 4 + l@ ; : usbsph-misc! ( n -- ) usbsph-misc-va 4 + l! ; @@ -13,6 +17,17 @@ : ulpi-clock-on ( -- ) usbsph-ctrl@ 1 or usbsph-ctrl! ; : ulpi-clock-select ( -- ) usbsph-ctrl@ h# 400 or usbsph-ctrl! ; +: init ( -- ) + ulpi-clock-on + ulpi-clock-select + ulpi-on +; + +: open ( -- true ) true ; +: close ; + +end-package + \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks \ Modified: cpu/arm/mmp3/usb2phy.fth ============================================================================== --- cpu/arm/mmp3/usb2phy.fth Thu Aug 16 22:17:14 2012 (r3184) +++ cpu/arm/mmp3/usb2phy.fth Fri Aug 17 01:25:00 2012 (r3185) @@ -1,6 +1,13 @@ \ See license at end of file purpose: Init USB2 Phy in Marvell SoC +0 0 " d4207000" " /" begin-package + +" usb2-phy" device-name + +my-address my-space h# 100 reg +" mrvl,mmp3-usb2phy" +compatible + : +usb2 ( offset -- offset' ) h# 20.7000 + ; h# 04 +usb2 constant pll-reg0 @@ -36,7 +43,7 @@ ." PLL calibrate timeout" cr ; -: init-usb-phy ( -- ) +: init ( -- ) h# f00 h# 100 +pmua io-clr \ h# d00 h# 100 +pmua io-set \ Select 26 MHz VCXO clock h# 000 h# 100 +pmua io-set \ Select crystal @@ -85,3 +92,8 @@ d# 100 wait-cal ; + +: open ( -- true ) true ; +: close ; + +end-package Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Thu Aug 16 22:17:14 2012 (r3184) +++ cpu/arm/olpc/3.0/usb.fth Fri Aug 17 01:25:00 2012 (r3185) @@ -17,6 +17,16 @@ my-space swap " map-in" $call-parent h# 100 + ( adr ) ; : my-map-out ( adr len -- ) swap h# 100 - swap " map-out" $call-parent ; + " /pmua" encode-phandle d# 18 encode-int encode+ " clocks" property + d# 34 " interrupts" integer-property + + " mrvl,mmp3-fsic" +compatible + + " host" " dr_mode" string-property + " ulpi" " phy_type" string_property + + " /usb-phy" encode-phandle " transceiver" property + false constant has-dbgp-regs? false constant needs-dummy-qh? : grab-controller ( config-adr -- error? ) drop false ; @@ -42,9 +52,7 @@ : (reset-usb-hub) ( -- ) d# 146 gpio-clr d# 10 ms d# 146 gpio-set \ Resets ULPI hub - ulpi-clock-on - ulpi-clock-select - ulpi-on + " /usb2-phy" " init" execute-device-method ; ' (reset-usb-hub) to reset-usb-hub Modified: cpu/arm/olpc/usb.fth ============================================================================== --- cpu/arm/olpc/usb.fth Thu Aug 16 22:17:14 2012 (r3184) +++ cpu/arm/olpc/usb.fth Fri Aug 17 01:25:00 2012 (r3185) @@ -11,6 +11,14 @@ " /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 + + " /usb2-phy" encode-phandle " transceiver" property + false constant has-dbgp-regs? false constant needs-dummy-qh? : grab-controller ( config-adr -- error? ) drop false ; @@ -29,7 +37,7 @@ : init-usb ( -- ) h# 9 h# 5c pmua! \ Enable clock to USB block reset-usb-hub - init-usb-phy + " /usb2-phy" " init" execute-device-method drop ; stand-init: Init USB Phy Modified: dev/usb2/hcd/ehci/ehci.fth ============================================================================== --- dev/usb2/hcd/ehci/ehci.fth Thu Aug 16 22:17:14 2012 (r3184) +++ dev/usb2/hcd/ehci/ehci.fth Fri Aug 17 01:25:00 2012 (r3185) @@ -3,6 +3,8 @@ " ehci" encode-string " device_type" property +" usb-ehci" +compatible + hex headers

1 0

[commit] r3184 - cpu/arm/olpc/cl4
by repository service 16 Aug '12

16 Aug '12

Author: wmb Date: Thu Aug 16 22:17:14 2012 New Revision: 3184 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3184 Log: OLPC XO-4 - Cope with inverted write protect on external SD. Modified: cpu/arm/olpc/cl4/sdhci.fth Modified: cpu/arm/olpc/cl4/sdhci.fth ============================================================================== --- cpu/arm/olpc/cl4/sdhci.fth Thu Aug 16 22:15:40 2012 (r3183) +++ cpu/arm/olpc/cl4/sdhci.fth Thu Aug 16 22:17:14 2012 (r3184) @@ -14,6 +14,10 @@ \ Active low " /gpio" encode-phandle d# 31 encode-int encode+ 1 encode-int encode+ " cd-gpios" property + \ MMP3 + 0 0 " wp-inverted" property + : write-protected? ( -- flag ) write-protected? 0= ; + new-device fload ${BP}/dev/mmc/sdhci/sdmmc.fth fload ${BP}/dev/mmc/sdhci/selftest.fth

1 0

[commit] r3183 - in cpu/arm: mmp2 mmp3/thunderstone olpc olpc/1.75
by repository service 16 Aug '12

16 Aug '12

Author: wmb Date: Thu Aug 16 22:15:40 2012 New Revision: 3183 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3183 Log: OLPC ARM - Change all uses of I2C addresses for TWSI-connected devices to use the unshifted address form. Modified: cpu/arm/mmp2/boardtwsi.fth cpu/arm/mmp2/dsi.fth cpu/arm/mmp2/twsi.fth cpu/arm/mmp3/thunderstone/boardtwsi.fth cpu/arm/olpc/1.75/compass.fth cpu/arm/olpc/accelerometer.fth cpu/arm/olpc/nn-touchscreen.fth cpu/arm/olpc/rtc.fth cpu/arm/olpc/sound.fth Modified: cpu/arm/mmp2/boardtwsi.fth ============================================================================== --- cpu/arm/mmp2/boardtwsi.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/mmp2/boardtwsi.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -8,7 +8,7 @@ \ 5 TC358762 MIPI bridge 16, TM-1210 or TM1414 touchscreen 40 \ 6 HDMI DDC EDID a0 -: select-touch-panel ( -- ) h# 40 5 set-twsi-target ; +: select-touch-panel ( -- ) h# 20 5 set-twsi-target ; : touch-panel-type ( -- n ) select-touch-panel h# bd twsi-b@ ; : get-tm1414-data ( -- x y finger-mask ) select-touch-panel ( ) @@ -29,7 +29,7 @@ ; : compass@ ( -- x y z temp id ) - h# 3c 4 set-twsi-target + h# 1e 4 set-twsi-target 0 0 twsi-b! \ Config register A h# 50 1 twsi-b! \ Config register B 0 2 twsi-b! \ Mode register @@ -40,7 +40,7 @@ h# a twsi-b@ 9 twsi-b@ bwjoin ( x y z temp id ) ; -: select-pmic ( -- ) h# 78 1 set-twsi-target ; +: select-pmic ( -- ) h# 3c 1 set-twsi-target ; : accel-power-on ( -- ) \ LDO8 - vout is 36, ctl is 34 select-pmic @@ -52,7 +52,7 @@ h# 1e h# 34 twsi-b! ; : accel@ ( -- x y z temp id ) - h# 70 4 set-twsi-target + h# 38 4 set-twsi-target 2 twsi-b@ 6 rshift ( x-low ) 3 twsi-b@ 2 lshift or ( x ) @@ -67,24 +67,24 @@ ; : init-pals ( -- ) - h# b0 4 set-twsi-target \ Set PS parameters address + h# 58 4 set-twsi-target \ Set PS parameters address 0 1 twsi-out \ clear interrupt settings - h# 22 4 set-twsi-target \ Device init address + h# 11 4 set-twsi-target \ Device init address h# 10 1 twsi-out \ Init device - h# 20 4 set-twsi-target \ Ambient Light Sensor address + h# 10 4 set-twsi-target \ Ambient Light Sensor address 2 1 twsi-out \ Enable ALS in most sensitive mode, 16-bit data ; : als@ ( -- n ) - h# 22 4 set-twsi-target \ Ambient Light Sensor LSB address + h# 11 4 set-twsi-target \ Ambient Light Sensor LSB address 0 1 twsi-get ( low ) - h# 20 4 set-twsi-target \ Ambient Light Sensor MSB address + h# 10 4 set-twsi-target \ Ambient Light Sensor MSB address 0 1 twsi-get bwjoin ( n ) ; : proximity@ ( -- byte ) - h# b0 4 set-twsi-target \ Proximity Sensor address + h# 58 4 set-twsi-target \ Proximity Sensor address 0 1 twsi-get ( byte ) ; @@ -128,7 +128,7 @@ ; : twsi-bcd@ ( reg# -- binary ) twsi-b@ bcd> ; : get-rtc ( -- ) - h# d0 1 set-twsi-target + h# 68 1 set-twsi-target \ 3 twsi-b@ ( dow ) \ @@ -142,7 +142,7 @@ ; : core-voltage! ( mv -- ) - h# c0 1 set-twsi-target \ MAX8649 power management IC + h# 60 1 set-twsi-target \ MAX8649 power management IC d# 750 umax d# 1350 umin \ Clipped voltage d# 750 - d# 10 / ( offset-in-mv/10 ) @@ -150,7 +150,7 @@ 2 twsi-b! ; : core-voltage@ ( -- mv ) - h# c0 1 set-twsi-target \ MAX8649 power management IC + h# 60 1 set-twsi-target \ MAX8649 power management IC 2 twsi-b@ ( code ) h# 7f and ( offset-mv/10 ) d# 10 * ( offset-mv ) Modified: cpu/arm/mmp2/dsi.fth ============================================================================== --- cpu/arm/mmp2/dsi.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/mmp2/dsi.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -45,7 +45,7 @@ 2 ms d# 83 gpio-clr 1 ms d# 83 gpio-set 1 ms \ LCD_RST_N line resets DSI bridge - h# 16 5 set-twsi-target \ TWSI address of TC358762 MIPI DSI bridge + h# 0b 5 set-twsi-target \ TWSI address of TC358762 MIPI DSI bridge \ Data Reg#....... 0 h# 047c dsi-twsi! \ Turn off sleep mode 2 ms @@ -142,7 +142,7 @@ : .dsi ( index -- ) dup 3 u.r space dsi-twsi@ 8 u.r cr ; : .dsiw ( index -- ) dup 3 u.r space dsi-twsi-w@ 8 u.r cr ; : dump-dsi ( -- ) - 16 5 set-twsi-target + 0b 5 set-twsi-target 47c .dsi 210 .dsi 470 .dsi Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/mmp2/twsi.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -42,7 +42,7 @@ ; : set-twsi-target ( slave channel -- ) \ Channel numbers range from 1 to 6 set-twsi-channel - to slave-address + 2* to slave-address ; \ Bit defines @@ -195,7 +195,7 @@ h# d4034000 d# 31 4 true true 1 make-twsi-node \ TWSI6 -0 0 " 34" " /i2c@d4011000" begin-package \ TWSI1 +0 0 " 1a" " /i2c@d4011000" begin-package \ TWSI1 " audio-codec" name " realtek,alc5631" +compatible " realtek,rt5631" +compatible Modified: cpu/arm/mmp3/thunderstone/boardtwsi.fth ============================================================================== --- cpu/arm/mmp3/thunderstone/boardtwsi.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/mmp3/thunderstone/boardtwsi.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -8,7 +8,7 @@ \ 5 TC358762 MIPI bridge 16, TM-1210 or TM1414 touchscreen 40 \ 6 HDMI DDC EDID a0 -: select-touch-panel ( -- ) h# 40 5 set-twsi-target ; +: select-touch-panel ( -- ) h# 20 5 set-twsi-target ; : touch-panel-type ( -- n ) select-touch-panel h# bd twsi-b@ ; : get-tm1414-data ( -- x y finger-mask ) select-touch-panel ( ) @@ -29,7 +29,7 @@ ; : compass@ ( -- x y z temp id ) - h# 3c 4 set-twsi-target + h# 1e 4 set-twsi-target 0 0 twsi-b! \ Config register A h# 50 1 twsi-b! \ Config register B 0 2 twsi-b! \ Mode register @@ -40,7 +40,7 @@ h# a twsi-b@ 9 twsi-b@ bwjoin ( x y z temp id ) ; -: select-pmic ( -- ) h# 78 1 set-twsi-target ; +: select-pmic ( -- ) h# 3c 1 set-twsi-target ; : accel-power-on ( -- ) \ LDO8 - vout is 36, ctl is 34 select-pmic @@ -52,7 +52,7 @@ h# 1e h# 34 twsi-b! ; : accel@ ( -- x y z temp id ) - h# 70 4 set-twsi-target + h# 38 4 set-twsi-target 2 twsi-b@ 6 rshift ( x-low ) 3 twsi-b@ 2 lshift or ( x ) @@ -67,24 +67,24 @@ ; : init-pals ( -- ) - h# b0 4 set-twsi-target \ Set PS parameters address + h# 58 4 set-twsi-target \ Set PS parameters address 0 1 twsi-out \ clear interrupt settings - h# 22 4 set-twsi-target \ Device init address + h# 11 4 set-twsi-target \ Device init address h# 10 1 twsi-out \ Init device - h# 20 4 set-twsi-target \ Ambient Light Sensor address + h# 10 4 set-twsi-target \ Ambient Light Sensor address 2 1 twsi-out \ Enable ALS in most sensitive mode, 16-bit data ; : als@ ( -- n ) - h# 22 4 set-twsi-target \ Ambient Light Sensor LSB address + h# 11 4 set-twsi-target \ Ambient Light Sensor LSB address 0 1 twsi-get ( low ) - h# 20 4 set-twsi-target \ Ambient Light Sensor MSB address + h# 10 4 set-twsi-target \ Ambient Light Sensor MSB address 0 1 twsi-get bwjoin ( n ) ; : proximity@ ( -- byte ) - h# b0 4 set-twsi-target \ Proximity Sensor address + h# 58 4 set-twsi-target \ Proximity Sensor address 0 1 twsi-get ( byte ) ; @@ -128,7 +128,7 @@ ; : twsi-bcd@ ( reg# -- binary ) twsi-b@ bcd> ; : get-rtc ( -- ) - h# d0 1 set-twsi-target + h# 68 1 set-twsi-target \ 3 twsi-b@ ( dow ) \ @@ -142,7 +142,7 @@ ; : core-voltage! ( mv -- ) - h# c0 1 set-twsi-target \ MAX8649 power management IC + h# 60 1 set-twsi-target \ MAX8649 power management IC d# 750 umax d# 1350 umin \ Clipped voltage d# 750 - d# 10 / ( offset-in-mv/10 ) @@ -150,7 +150,7 @@ 2 twsi-b! ; : core-voltage@ ( -- mv ) - h# c0 1 set-twsi-target \ MAX8649 power management IC + h# 60 1 set-twsi-target \ MAX8649 power management IC 2 twsi-b@ ( code ) h# 7f and ( offset-mv/10 ) d# 10 * ( offset-mv ) Modified: cpu/arm/olpc/1.75/compass.fth ============================================================================== --- cpu/arm/olpc/1.75/compass.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/olpc/1.75/compass.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -4,7 +4,7 @@ : set-compass-slave ( -- ) compass-scl-gpio# to smb-clock-gpio# compass-sda-gpio# to smb-data-gpio# - h# 3c to smb-slave + h# 1e to smb-slave smb-data-gpio# gpio-dir-out ; : smb-init ( -- ) set-compass-slave smb-on smb-pulses ; @@ -35,11 +35,11 @@ 0 0 " " " /" begin-package " combo-accelerometer" name -\ : set-sensor-slave ( -- ) h# 30 6 set-twsi-target ; +\ : set-sensor-slave ( -- ) h# 18 6 set-twsi-target ; : set-sensor-slave ( -- ) 4 to smb-clock-gpio# 5 to smb-data-gpio# - h# 30 to smb-slave + h# 18 to smb-slave smb-data-gpio# gpio-dir-out ; Modified: cpu/arm/olpc/accelerometer.fth ============================================================================== --- cpu/arm/olpc/accelerometer.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/olpc/accelerometer.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -2,6 +2,7 @@ 0 0 " " " /twsi" begin-package " accelerometer" name +\ reg is set dynamically by probing to find which chip is present \ my-address my-space encode-phys " reg" property \ This is for the stand-alone accelerometers LIS3DHTR and LIS33DETR @@ -149,7 +150,7 @@ d# 400,000 to bus-speed d# 50 to min-x d# 50 to min-y d# 50 to min-z d# 150 to max-x d# 150 to max-y d# 450 to max-z - h# 32 6 encode-phys " reg" property + h# 19 6 encode-phys " reg" property ['] lis3dhtr-selftest to lis-selftest else accelerometer-off @@ -158,7 +159,7 @@ d# 25,000 to bus-speed d# 20 to min-x d# 20 to min-y d# 20 to min-z d# 400 to max-x d# 400 to max-y d# 400 to max-z - h# 3a 6 encode-phys " reg" property + h# 1d 6 encode-phys " reg" property ['] lis33de-selftest to lis-selftest then ; Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -1,7 +1,7 @@ \ See license at end of file purpose: Driver and diagnostic for Neonode zForce MultiSensing I2C Touchscreen -0 0 " 4,a0" " /twsi" begin-package +0 0 " 4,50" " /twsi" begin-package my-space encode-int my-address encode-int encode+ " reg" property \ XXX these are really platform-related, not touchscreen-related Modified: cpu/arm/olpc/rtc.fth ============================================================================== --- cpu/arm/olpc/rtc.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/olpc/rtc.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -22,7 +22,7 @@ : rtc@ ( reg# -- byte ) set-address smb-byte@ ; : rtc! ( byte reg# -- ) set-address smb-byte! ; [else] -: set-address ( -- ) h# d0 2 set-twsi-target ; +: set-address ( -- ) h# 68 2 set-twsi-target ; : rtc@ ( reg# -- byte ) set-address twsi-b@ ; : rtc! ( byte reg# -- ) set-address twsi-b! ; [then] Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Thu Aug 16 04:19:35 2012 (r3182) +++ cpu/arm/olpc/sound.fth Thu Aug 16 22:15:40 2012 (r3183) @@ -264,9 +264,9 @@ ; [ifdef] cl2-a1 -: choose-smbus ( -- ) h# 30 1 set-twsi-target ; +: choose-smbus ( -- ) h# 18 1 set-twsi-target ; [else] -: choose-smbus ( -- ) h# 34 1 set-twsi-target ; +: choose-smbus ( -- ) h# 1a 1 set-twsi-target ; [then] \ Reset is unconnected on current boards

1 0

[commit] r3182 - cpu/arm/olpc/cl4
by repository service 16 Aug '12

16 Aug '12

Author: wmb Date: Thu Aug 16 04:19:35 2012 New Revision: 3182 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3182 Log: Q7A04 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 16 04:16:12 2012 (r3181) +++ cpu/arm/olpc/cl4/fw-version.fth Thu Aug 16 04:19:35 2012 (r3182) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware