Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (212 commits)
  [ARM] pxa: Phycore pcm-990-specific code for the PXA270 Quick Capture driver
  [ARM] pxa: V4L2 soc_camera driver for PXA270
  [ARM] pxa: restrict availability of pxa2xx PCMCIA drivers
  [ARM] 5005/1: BAST: Fix kset_name initialiser
  [ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410
  [ARM] 4988/1: Add GPIO lib support to the EP93xx
  [ARM] Add initial sparsemem support
  [ARM] pxa: initialise PXA devices before platform init code
  [ARM] 5002/1: tosa: add two more leds
  [ARM] 5004/1: Tosa: make several unreferenced structures static.
  [ARM] 5003/1: Shut up sparse warnings
  [ARM] 4977/2: soc - pxa2xx-ac97 - Add missing clk_enable()
  [ARM] 4976/1: zylonite: Configure GPIO for WM9713 IRQ line
  [ARM] 4974/1: Drop unused leds-tosa.
  [ARM] 4973/1: Tosa: use leds-gpio driver.
  [ARM] 4972/1: Tosa: convert scoop GPIOs usage to generic gpio code
  [ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks
  [ARM] pxa: lubbock: move mis-placed SPI info
  [ARM] 4970/1: tosa: correct gpio used for wake up.
  [ARM] 4966/1: magician: add MFP pin configuration
  ...

4 files changed, 103 insertions, 2 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 5fa9c3c67e0c..b04c99580d0d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -645,7 +645,7 @@ config I2C_PCA_ISA
 
 config I2C_MV64XXX
         tristate "Marvell mv64xxx I2C Controller"
-        depends on (MV64X60 || ARCH_ORION) && EXPERIMENTAL
+        depends on (MV64X60 || PLAT_ORION) && EXPERIMENTAL
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the Marvell 64xxx line of host bridges.
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 2d2087ad708f..6fd2d6a84eff 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -39,6 +39,7 @@
 #include <asm/io.h>
 #include <asm/arch/i2c.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-gpio.h>
 
 struct pxa_i2c {
         spinlock_t              lock;
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index b21593f93586..2da2edfa68ec 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -93,6 +93,7 @@ config ISP1301_OMAP
 
 config TPS65010
         tristate "TPS6501x Power Management chips"
+        depends on HAVE_GPIO_LIB
         default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
         help
           If you say yes here you get support for the TPS6501x series of
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 4154a9108859..b67f69c2e7f3 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -30,9 +30,13 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
+#include <linux/platform_device.h>
 
 #include <linux/i2c/tps65010.h>
 
+#include <asm/gpio.h>
+
+
 /*-------------------------------------------------------------------------*/
 
 #define DRIVER_VERSION  "2 May 2005"
@@ -84,7 +88,9 @@ struct tps65010 {
         u8                      chgstatus, regstatus, chgconf;
         u8                      nmask1, nmask2;
 
-        /* not currently tracking GPIO state */
+        u8                      outmask;
+        struct gpio_chip        chip;
+        struct platform_device  *leds;
 };
 
 #define POWER_POLL_DELAY        msecs_to_jiffies(5000)
@@ -449,12 +455,72 @@ static irqreturn_t tps65010_irq(int irq, void *_tps)
 
 /*-------------------------------------------------------------------------*/
 
+/* offsets 0..3 == GPIO1..GPIO4
+ * offsets 4..5 == LED1/nPG, LED2 (we set one of the non-BLINK modes)
+ */
+static void
+tps65010_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        if (offset < 4)
+                tps65010_set_gpio_out_value(offset + 1, value);
+        else
+                tps65010_set_led(offset - 3, value ? ON : OFF);
+}
+
+static int
+tps65010_output(struct gpio_chip *chip, unsigned offset, int value)
+{
+        /* GPIOs may be input-only */
+        if (offset < 4) {
+                struct tps65010         *tps;
+
+                tps = container_of(chip, struct tps65010, chip);
+                if (!(tps->outmask & (1 << offset)))
+                        return -EINVAL;
+                tps65010_set_gpio_out_value(offset + 1, value);
+        } else
+                tps65010_set_led(offset - 3, value ? ON : OFF);
+
+        return 0;
+}
+
+static int tps65010_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+        int                     value;
+        struct tps65010         *tps;
+
+        tps = container_of(chip, struct tps65010, chip);
+
+        if (offset < 4) {
+                value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
+                if (value < 0)
+                        return 0;
+                if (value & (1 << (offset + 4)))        /* output */
+                        return !(value & (1 << offset));
+                else                                    /* input */
+                        return (value & (1 << offset));
+        }
+
+        /* REVISIT we *could* report LED1/nPG and LED2 state ... */
+        return 0;
+}
+
+
+/*-------------------------------------------------------------------------*/
+
 static struct tps65010 *the_tps;
 
 static int __exit tps65010_remove(struct i2c_client *client)
 {
         struct tps65010         *tps = i2c_get_clientdata(client);
+        struct tps65010_board   *board = client->dev.platform_data;
 
+        if (board && board->teardown) {
+                int status = board->teardown(client, board->context);
+                if (status < 0)
+                        dev_dbg(&client->dev, "board %s %s err %d\n",
+                                "teardown", client->name, status);
+        }
         if (client->irq > 0)
                 free_irq(client->irq, tps);
         cancel_delayed_work(&tps->work);
@@ -469,6 +535,7 @@ static int tps65010_probe(struct i2c_client *client)
 {
         struct tps65010         *tps;
         int                     status;
+        struct tps65010_board   *board = client->dev.platform_data;
 
         if (the_tps) {
                 dev_dbg(&client->dev, "only one tps6501x chip allowed\n");
@@ -577,6 +644,38 @@ static int tps65010_probe(struct i2c_client *client)
 
         tps->file = debugfs_create_file(DRIVER_NAME, S_IRUGO, NULL,
                                 tps, DEBUG_FOPS);
+
+        /* optionally register GPIOs */
+        if (board && board->base > 0) {
+                tps->outmask = board->outmask;
+
+                tps->chip.label = client->name;
+
+                tps->chip.set = tps65010_gpio_set;
+                tps->chip.direction_output = tps65010_output;
+
+                /* NOTE:  only partial support for inputs; nyet IRQs */
+                tps->chip.get = tps65010_gpio_get;
+
+                tps->chip.base = board->base;
+                tps->chip.ngpio = 6;
+                tps->chip.can_sleep = 1;
+
+                status = gpiochip_add(&tps->chip);
+                if (status < 0)
+                        dev_err(&client->dev, "can't add gpiochip, err %d\n",
+                                        status);
+                else if (board->setup) {
+                        status = board->setup(client, board->context);
+                        if (status < 0) {
+                                dev_dbg(&client->dev,
+                                        "board %s %s err %d\n",
+                                        "setup", client->name, status);
+                                status = 0;
+                        }
+                }
+        }
+
         return 0;
 fail1:
         kfree(tps);