[openfirmware] [commit] r3171 - cpu/arm/mmp2

[repository service]

Author: wmb
Date: Tue Aug 14 22:42:28 2012
New Revision: 3171
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3171

Log:
OLPC - Renamed gpio-prop to gpio-property and changed the argument order for conformance with Forth conventions.

Modified:
   cpu/arm/mmp2/gpio.fth
   cpu/arm/mmp2/twsi.fth

Modified: cpu/arm/mmp2/gpio.fth
==============================================================================
--- cpu/arm/mmp2/gpio.fth	Tue Aug 14 22:41:15 2012	(r3170)
+++ cpu/arm/mmp2/gpio.fth	Tue Aug 14 22:42:28 2012	(r3171)
@@ -78,11 +78,10 @@
    h# 108 make-gpio-mux-node
 end-package
 
-: gpio-prop ( $gpioname low? gpionum -- )
-   " /gpio"  encode-phandle        ( $gpioname low? gpionum propval$ )
-   rot    encode-int encode+         ( $gpioname low? propval$' )
-   rot    encode-int encode+         ( $gpioname propval$' )
-   2swap property
+: 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$ )
+   2r> property                 ( )
 ;
-
-

Modified: cpu/arm/mmp2/twsi.fth
==============================================================================
--- cpu/arm/mmp2/twsi.fth	Tue Aug 14 22:41:15 2012	(r3170)
+++ cpu/arm/mmp2/twsi.fth	Tue Aug 14 22:42:28 2012	(r3171)
@@ -213,10 +213,10 @@
    " touchscreen" name
    " zforce" +compatible
    my-address my-space 1 reg
-   " reset-gpio" 1  d# 98  gpio-prop
-   " test-gpio"  1  d# 139 gpio-prop
-   " hd-gpio"    1  d# 12  gpio-prop
-   " dr-gpio"    1  d# 99  gpio-prop
+   touch-rst-gpio# 1  " reset-gpio" gpio-property
+   touch-tck-gpio# 1  " test-gpio"  gpio-property
+   touch-hd-gpio#  1  " hd-gpio"    gpio-property
+   touch-int-gpio# 1  " dr-gpio"    gpio-property
 end-package
 [then]