Changeset 3187

Timestamp:

Aug 17, 2012 1:27:49 AM (9 months ago)

Author:

wmb

Message:

OLPC ARM - Added I2C GPIO device nodes.

Files:

• cpu/arm/mmp2/gpio.fth (modified) (1 diff)
• cpu/arm/mmp2/twsi.fth (modified) (2 diffs)
• cpu/arm/olpc/1.75/gpiopins.fth (modified) (1 diff)
• cpu/arm/olpc/cl4/gpiopins.fth (modified) (1 diff)
• dev/olpc/dcon/mmp2dcon.fth (modified) (1 diff)
• dev/olpc/mmp2camera/platform.fth (modified) (1 diff)

cpu/arm/mmp2/gpio.fth

@@ -79 +79 @@
 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

cpu/arm/mmp2/twsi.fth

@@ -189 +189 @@
 \     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
@@ -224 +224 @@
    " accelerometer" name
    " lis3lv02d" +compatible
+   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

cpu/arm/olpc/1.75/gpiopins.fth

@@ -15 +15 @@
 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#

cpu/arm/olpc/cl4/gpiopins.fth

@@ -15 +15 @@
 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#

dev/olpc/dcon/mmp2dcon.fth

@@ -18 +18 @@
    " 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

dev/olpc/mmp2camera/platform.fth

@@ -4 +4 @@
 headers
 hex
+
+" /camera-i2c" encode-phandle  " i2c-parent" property
 
 0 value camera-smb-slave