Changeset 3260

Timestamp:

Aug 31, 2012 2:22:06 AM (9 months ago)

Author:

wmb

Message:

OLPC ARM - Converted the MMP2 DCON driver to call it's I2C parent bus for I2C services, instead of using the bit-banged SMBUS driver directly. Also added I2C methods to the parent node for the image sensor, paving the way for later conversion of that driver.

Files:

• cpu/arm/olpc/build-fw.fth (modified) (2 diffs)
• cpu/arm/olpc/gpio-i2c.fth (modified) (5 diffs)
• dev/olpc/dcon/mmp2dcon.fth (modified) (6 diffs)

cpu/arm/olpc/build-fw.fth

@@ -102 +102 @@
 fload ${BP}/cpu/arm/mmp2/watchdog.fth   \ reset-all using watchdog timer
 
+fload ${BP}/cpu/arm/olpc/smbus.fth         \ Bit-banged SMBUS (I2C) using GPIOs
+
 fload ${BP}/cpu/arm/olpc/gpio-i2c.fth
 fload ${BP}/cpu/arm/olpc/twsi-i2c.fth
@@ -134 +136 @@
 
 \needs md5init  fload ${BP}/ofw/ppp/md5.fth                \ MD5 hash
-
-fload ${BP}/cpu/arm/olpc/smbus.fth         \ Bit-banged SMBUS (I2C) using GPIOs
 
 fload ${BP}/dev/olpc/spiflash/flashif.fth  \ Generic FLASH interface

cpu/arm/olpc/gpio-i2c.fth

@@ -37 +37 @@
       : 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
@@ -44 +42 @@
           cam-scl-gpio# 0 encode-gpio
       " gpios" property
+
+      0 instance value slave-address
+      : set-address  ( slave -- )  to slave-address  ;
+      : smb-setup
+         1 to smb-dly-us cam-scl-gpio# to smb-clock-gpio#
+         cam-sda-gpio# to smb-data-gpio#
+         slave-address to smb-slave
+      ;
+      \ Since this I2C bus is dedicated to the DCON, we save space by
+      \ implementing only the methods that the DCON uses
+      : reg-b@  ( reg# -- b )  smb-setup smb-byte@  ;
+      : reg-b!  ( b reg# -- )  smb-setup smb-byte!  ;
+      : open  ( -- flag )  true  ;
+      : close  ( -- )  ;
 
       new-device
@@ -57 +69 @@
             cam-rst-gpio# 0 encode-gpio
          " gpios" property
-
       finish-device
    finish-device
@@ -68 +79 @@
       : 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
@@ -75 +84 @@
          dcon-scl-gpio# 0 encode-gpio
       " gpios" property
+
+      0 instance value slave-address
+      : set-address  ( slave -- )  to slave-address  ;
+      : smb-setup  ( -- )
+         dcon-scl-gpio# to smb-clock-gpio#
+         dcon-sda-gpio# to smb-data-gpio#
+         slave-address to smb-slave
+      ;
+
+      \ Since this I2C bus is dedicated to the DCON, we save space by
+      \ implementing only the methods that the DCON uses
+
+      : reg-w@  ( reg# -- w )  smb-setup smb-word@  ;
+      : reg-w!  ( w reg# -- )  smb-setup smb-word!  ;
+
+      : bus-reset  ( -- )  smb-setup smb-stop 1 ms  smb-off  1 ms  smb-on  ;
+      : bus-init  ( -- )  smb-setup  smb-on  smb-pulses  ;
+
+      : open  ( -- flag )  true  ;
+      : close  ( -- )  ;
    finish-device
 device-end

dev/olpc/dcon/mmp2dcon.fth

@@ -54 +54 @@
 \ h# 8000 constant DM_SELFTEST
 
-: set-dcon-slave  ( -- )
-   dcon-scl-gpio# to smb-clock-gpio#
-   dcon-sda-gpio# to smb-data-gpio#
-
-   h# 0d to smb-slave
-;
-
-: smb-init    ( -- )  set-dcon-slave  smb-on  smb-pulses  ;
-: smb-reset   ( -- )  smb-stop 1 ms  smb-off  1 ms  smb-on   ;
-
-: dcon@  ( reg# -- word )  set-dcon-slave  smb-word@  ;
-: dcon!  ( word reg# -- )  set-dcon-slave  smb-word!  ;
+: bus-init  ( -- )  " bus-init" $call-parent  ;
+: bus-reset  ( -- )  " bus-reset" $call-parent  ;
+
+: dcon@  ( reg# -- word )  " reg-w@" $call-parent  ;
+: dcon!  ( word reg# -- )  " reg-w!" $call-parent  ;
 
 : dcon-load  ( -- )  dcon-load-gpio# gpio-set  ;
@@ -135 +128 @@
 
 : try-dcon!  ( w reg# -- )
-   ['] dcon!  catch  if  2drop  smb-reset  then
+   ['] dcon!  catch  if  2drop  bus-reset  then
 ;
 
@@ -172 +165 @@
 
 \ Setup so it can be called by execute-device-method
-: dcon-off  ( -- )  smb-init  h# 12 ['] mode!  catch  if  drop  then  ;
+: dcon-off  ( -- )  bus-init  h# 12 ['] mode!  catch  if  drop  then  ;
 
 : dcon2?  ( -- flag )
@@ -179 +172 @@
          h# dc02 =  unloop exit
       then                         ( x )
-      drop   d# 50 ms  smb-init    ( )
+      drop   d# 50 ms  bus-init    ( )
    loop
    false
@@ -218 +211 @@
 [ifdef] old-way
 : init-dcon  ( -- )
-   smb-init
+   bus-init
 
 \ Unnecessary because CForth has already done it
@@ -227 +220 @@
 [else]
 : open  ( -- flag )
-   smb-init
+   my-unit " set-address" $call-parent
+   bus-init
 \ Unnecessary because CForth has already done it
 \   dcon-load  dcon-enable  ( maybe-set-cmos )