Author: wmb Date: Mon Oct 3 23:27:28 2011 New Revision: 2570 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2570
Log: OLPC XO-1.75 - Use apbc! instead of explict numeric address.
Modified: cpu/arm/mmp2/devices.fth cpu/arm/mmp2/keypad.fth cpu/arm/mmp2/mfpr.fth cpu/arm/mmp2/spimaster.fth cpu/arm/mmp2/thermal.fth dev/olpc/kb3700/spicmd.fth
Modified: cpu/arm/mmp2/devices.fth ============================================================================== --- cpu/arm/mmp2/devices.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/devices.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -3,13 +3,13 @@ d# 26000000 to uart-clock-frequency
: init-clocks - -1 h# 051024 io! \ PMUM_CGR_PJ - everything on - h# 07 h# 015064 io! \ APBC_AIB_CLK_RST - reset, functional and APB clock on - h# 03 h# 015064 io! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on - h# 13 h# 015034 io! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# c1 h# 01e120 io! \ GPIO51 = af1 for UART3 RXD - h# c1 h# 01e124 io! \ GPIO52 = af1 for UART3 TXD - h# 1b h# 282854 io! \ SD0 clocks + -1 h# 1024 mpmu! \ PMUM_CGR_PJ - everything on + h# 07 h# 64 apbc! \ APBC_AIB_CLK_RST - reset, functional and APB clock on + h# 03 h# 64 apbc! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on + h# 13 h# 34 apbc! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) + h# c1 d# 51 af! \ GPIO51 = af1 for UART3 RXD + h# c1 d# 51 af! \ GPIO52 = af1 for UART3 TXD + h# 1b h# 54 pmua! \ SD0 clocks ;
: inituarts ( -- )
Modified: cpu/arm/mmp2/keypad.fth ============================================================================== --- cpu/arm/mmp2/keypad.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/keypad.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -2,8 +2,8 @@ purpose: Driver for Armada 610/MMP2 keypad controller
: keypad-on ( -- ) - 5 h# 015018 io! \ Clock on with reset asserted - 1 h# 015018 io! \ Clock on, release reset + 5 h# 18 apbc! \ Clock on with reset asserted + 1 h# 18 apbc! \ Clock on, release reset 1 ms ; : kp! ( n offset -- ) h# 012000 + io! ;
Modified: cpu/arm/mmp2/mfpr.fth ============================================================================== --- cpu/arm/mmp2/mfpr.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/mfpr.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -1,8 +1,8 @@ purpose: Pin multiplexing for ARMADA 610 chip (no board details)
: aib-unlock - h# baba h# 015068 io! \ Unlock sequence - h# eb10 h# 01506c io! + h# baba h# 68 apbc! \ Unlock sequence + h# eb10 h# 6c apbc! ; : acgr-clocks-on ( -- ) h# 0818.F33C acgr-pa io! \ Turn on all clocks
Modified: cpu/arm/mmp2/spimaster.fth ============================================================================== --- cpu/arm/mmp2/spimaster.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/spimaster.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -39,10 +39,10 @@ enable ;
-: ssp1-clk-on 7 h# 015050 io! 3 h# 015050 io! ; -\ : ssp2-clk-on 7 h# 015054 io! 3 h# 015052 io! ; -\ : ssp3-clk-on 7 h# 015058 io! 3 h# 015058 io! ; -\ : ssp4-clk-on 7 h# 01505c io! 3 h# 01505c io! ; +: ssp1-clk-on 7 h# 50 apbc! 3 h# 50 apbc! ; +\ : ssp2-clk-on 7 h# 54 apbc! 3 h# 52 apbc! ; +\ : ssp3-clk-on 7 h# 58 apbc! 3 h# 58 apbc! ; +\ : ssp4-clk-on 7 h# 5c apbc! 3 h# 5c apbc! ;
: wb ( byte -- ) ssp-ssdr rl! ; : rb ( -- byte ) ssp-ssdr rl@ . ;
Modified: cpu/arm/mmp2/thermal.fth ============================================================================== --- cpu/arm/mmp2/thermal.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/thermal.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -4,8 +4,8 @@ h# 013200 value thermal-base : init-thermal-sensor ( -- ) thermal-base io@ h# 400 and if exit then - 3 h# 015090 io! \ Enable clocks to thermal sensor - h# 10000 thermal-base io! \ Enable sensing + 7 h# 90 apbc! 3 h# 90 apbc! \ Enable clocks to thermal sensor + h# 10000 thermal-base io! \ Enable sensing ;
\ thermal watchdog is enabled by CForth
Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Mon Oct 3 23:17:21 2011 (r2569) +++ dev/olpc/kb3700/spicmd.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -114,10 +114,10 @@ enable ;
-\ : ssp1-clk-on 7 h# 015050 io! 3 h# 015050 io! ; -\ : ssp2-clk-on 7 h# 015054 io! 3 h# 015052 io! ; -: ssp3-clk-on 7 h# 015058 io! 3 h# 015058 io! ; -\ : ssp4-clk-on 7 h# 01505c io! 3 h# 01505c io! ; +\ : ssp1-clk-on 7 h# 50 apbc! 3 h# 50 apbc! ; +\ : ssp2-clk-on 7 h# 54 apbc! 3 h# 52 apbc! ; +: ssp3-clk-on 7 h# 58 apbc! 3 h# 58 apbc! ; +\ : ssp4-clk-on 7 h# 5c apbc! 3 h# 5c apbc! ;
: wb ( byte -- ) ssp-ssdr rl! ; \ Debugging tool : rb ( -- byte ) ssp-ssdr rl@ . ; \ Debugging tool
openfirmware@openfirmware.info
-
repository service