Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

* 'sr@denx.de' of git://git.denx.de/u-boot-staging:
  Makefile: Add the missing dependency for spl target
  gpio: Adapt PCA9698 to standard GPIO API

diff --git a/Makefile b/Makefile
index fb658f4e43eac9e60318da2472c398a40cd2abe4..7afd35b98cd7efc471b53bee2d1927a7ea6eff79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -483,7 +483,7 @@ mmc_spl:    $(TIMESTAMP_FILE) $(VERSION_FILE) depend
 
 $(obj)mmc_spl/u-boot-mmc-spl.bin:      mmc_spl
 
-$(obj)spl/u-boot-spl.bin:              depend
+$(obj)spl/u-boot-spl.bin:      $(SUBDIR_TOOLS) depend
                $(MAKE) -C spl all
 
 updater:

diff --git a/drivers/gpio/pca9698.c b/drivers/gpio/pca9698.c
index b946efa7a98379e6de82e44cb7b299f343cc90af..fe6d2c668070adcd111631ed69418ecd7a0b676e 100644 (file)
--- a/drivers/gpio/pca9698.c
+++ b/drivers/gpio/pca9698.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/errno.h>
 #include <pca9698.h>
 
 /*
@@ -39,19 +40,20 @@
 #define PCA9698_REG_CONFIG             0x18
 
 #define PCA9698_BUFFER_SIZE            5
+#define PCA9698_GPIO_COUNT             40
 
-static int pca9698_read40(u8 chip, u8 offset, u8 *buffer)
+static int pca9698_read40(u8 addr, u8 offset, u8 *buffer)
 {
        u8 command = offset | 0x80;  /* autoincrement */
 
-       return i2c_read(chip, command, 1, buffer, PCA9698_BUFFER_SIZE);
+       return i2c_read(addr, command, 1, buffer, PCA9698_BUFFER_SIZE);
 }
 
-static int pca9698_write40(u8 chip, u8 offset, u8 *buffer)
+static int pca9698_write40(u8 addr, u8 offset, u8 *buffer)
 {
        u8 command = offset | 0x80;  /* autoincrement */
 
-       return i2c_write(chip, command, 1, buffer, PCA9698_BUFFER_SIZE);
+       return i2c_write(addr, command, 1, buffer, PCA9698_BUFFER_SIZE);
 }
 
 static void pca9698_set_bit(unsigned gpio, u8 *buffer, unsigned value)
@@ -65,41 +67,59 @@ static void pca9698_set_bit(unsigned gpio, u8 *buffer, unsigned value)
                buffer[byte] &= ~(1 << bit);
 }
 
-int pca9698_direction_input(u8 chip, unsigned offset)
+int pca9698_request(unsigned gpio, const char *label)
+{
+       if (gpio >= PCA9698_GPIO_COUNT)
+               return -EINVAL;
+
+       return 0;
+}
+
+void pca9698_free(unsigned gpio)
+{
+}
+
+int pca9698_direction_input(u8 addr, unsigned gpio)
 {
        u8 data[PCA9698_BUFFER_SIZE];
        int res;
 
-       res = pca9698_read40(chip, PCA9698_REG_CONFIG, data);
+       res = pca9698_read40(addr, PCA9698_REG_CONFIG, data);
        if (res)
                return res;
 
-       pca9698_set_bit(offset, data, 1);
-       return pca9698_write40(chip, PCA9698_REG_CONFIG, data);
+       pca9698_set_bit(gpio, data, 1);
+
+       return pca9698_write40(addr, PCA9698_REG_CONFIG, data);
 }
 
-int pca9698_direction_output(u8 chip, unsigned offset)
+int pca9698_direction_output(u8 addr, unsigned gpio, int value)
 {
        u8 data[PCA9698_BUFFER_SIZE];
        int res;
 
-       res = pca9698_read40(chip, PCA9698_REG_CONFIG, data);
+       res = pca9698_set_value(addr, gpio, value);
+       if (res)
+               return res;
+
+       res = pca9698_read40(addr, PCA9698_REG_CONFIG, data);
        if (res)
                return res;
 
-       pca9698_set_bit(offset, data, 0);
-       return pca9698_write40(chip, PCA9698_REG_CONFIG, data);
+       pca9698_set_bit(gpio, data, 0);
+
+       return pca9698_write40(addr, PCA9698_REG_CONFIG, data);
 }
 
-int pca9698_get_input(u8 chip, unsigned offset)
+int pca9698_get_value(u8 addr, unsigned gpio)
 {
-       unsigned config_byte = offset / 8;
-       unsigned config_bit = offset % 8;
+       unsigned config_byte = gpio / 8;
+       unsigned config_bit = gpio % 8;
        unsigned value;
        u8 data[PCA9698_BUFFER_SIZE];
        int res;
 
-       res = pca9698_read40(chip, PCA9698_REG_INPUT, data);
+       res = pca9698_read40(addr, PCA9698_REG_INPUT, data);
        if (res)
                return -1;
 
@@ -108,16 +128,16 @@ int pca9698_get_input(u8 chip, unsigned offset)
        return !!value;
 }
 
-int pca9698_set_output(u8 chip, unsigned offset, int value)
+int pca9698_set_value(u8 addr, unsigned gpio, int value)
 {
        u8 data[PCA9698_BUFFER_SIZE];
        int res;
 
-       res = pca9698_read40(chip, PCA9698_REG_OUTPUT, data);
+       res = pca9698_read40(addr, PCA9698_REG_OUTPUT, data);
        if (res)
                return res;
 
-       memset(data, sizeof(data), 0);
-       pca9698_set_bit(offset, data, value);
-       return pca9698_write40(chip, PCA9698_REG_OUTPUT, data);
+       pca9698_set_bit(gpio, data, value);
+
+       return pca9698_write40(addr, PCA9698_REG_OUTPUT, data);
 }

diff --git a/include/pca9698.h b/include/pca9698.h
index 2506088b4f535087beb55fdbd38dbb95ad72c3cd..67b364e6ab1a9e0139a34da9a39371fe8e131e82 100644 (file)
--- a/include/pca9698.h
+++ b/include/pca9698.h
@@ -1,9 +1,34 @@
+/*
+ * (C) Copyright 2011
+ * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
 #ifndef __PCA9698_H_
 #define __PCA9698_H_
 
-int pca9698_direction_input(u8 chip, unsigned offset);
-int pca9698_direction_output(u8 chip, unsigned offset);
-int pca9698_get_input(u8 chip, unsigned offset);
-int pca9698_set_output(u8 chip, unsigned offset, int value);
+int pca9698_request(unsigned gpio, const char *label);
+void pca9698_free(unsigned gpio);
+int pca9698_direction_input(u8 addr, unsigned gpio);
+int pca9698_direction_output(u8 addr, unsigned gpio, int value);
+int pca9698_get_value(u8 addr, unsigned gpio);
+int pca9698_set_value(u8 addr, unsigned gpio, int value);
 
 #endif /* __PCA9698_H_ */