[commit] r3434 - in cpu/arm/olpc: . cl4

[repository service]

Author: wmb
Date: Thu Nov 15 23:22:25 2012
New Revision: 3434
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3434

Log:
OLPC XO-4 - added support for new SD_PWROFF and SD_1.8VSEL GPIOs

Modified:
   cpu/arm/olpc/cl4/gpiopins.fth
   cpu/arm/olpc/cl4/sdhci.fth
   cpu/arm/olpc/sdhci.fth

Modified: cpu/arm/olpc/cl4/gpiopins.fth
==============================================================================
--- cpu/arm/olpc/cl4/gpiopins.fth	Thu Nov 15 22:40:18 2012	(r3433)
+++ cpu/arm/olpc/cl4/gpiopins.fth	Thu Nov 15 23:22:25 2012	(r3434)
@@ -72,3 +72,6 @@

d#  15 constant rotate-gpio#
 d#  17 constant check-gpio#
+
+d# 115 constant sd-pwroff-gpio#
+d# 116 constant sd-1.8vsel-gpio#

Modified: cpu/arm/olpc/cl4/sdhci.fth
==============================================================================
--- cpu/arm/olpc/cl4/sdhci.fth	Thu Nov 15 22:40:18 2012	(r3433)
+++ cpu/arm/olpc/cl4/sdhci.fth	Thu Nov 15 23:22:25 2012	(r3434)
@@ -13,6 +13,8 @@
       d# 40 encode-int  1 encode-int encode+  " power-delay-ms" property
       \ Active low
       " /gpio" encode-phandle  d# 31 encode-int encode+  1 encode-int encode+  " cd-gpios"  property
+      \ Active low
+      " /gpio" encode-phandle  sd-pwroff-gpio# encode-int encode+  1 encode-int encode+  " power-gpios" property

\ MMP3 
       0 0  " wp-inverted" property

Modified: cpu/arm/olpc/sdhci.fth
==============================================================================
--- cpu/arm/olpc/sdhci.fth	Thu Nov 15 22:40:18 2012	(r3433)
+++ cpu/arm/olpc/sdhci.fth	Thu Nov 15 23:22:25 2012	(r3434)
@@ -59,6 +59,8 @@
 [ifdef] en-wlan-pwr-gpio#
       base-addr h# d428.0800 =  if  en-wlan-pwr-gpio# gpio-set  then
 [then]
+[ifdef] sd-pwroff-gpio#
+      base-addr h# d428.0000 =  if  sd-pwroff-gpio# gpio-clr  then
 [then]
    ;
    ' gpio-power-on to card-power-on
@@ -73,6 +75,9 @@
 [ifdef] en-wlan-pwr-gpio#
       base-addr h# d428.0800 =  if  en-wlan-pwr-gpio# gpio-clr  then
 [then]
+[ifdef] sd-pwroff-gpio#
+      base-addr h# d428.0000 =  if  sd-pwroff-gpio# gpio-set  then
+[then]
       sdhci-card-power-off
    ;
    ' gpio-power-off to card-power-off