5 files changed, 51 insertions, 25 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b46442d7d66e..d8d0cda2641d 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -100,18 +100,21 @@ config GPIO_VR41XX
           Say yes here to support the NEC VR4100 series General-purpose I/O Uint
 
 config GPIO_SCH
-        tristate "Intel SCH GPIO"
+        tristate "Intel SCH/TunnelCreek GPIO"
         depends on GPIOLIB && PCI && X86
         select MFD_CORE
         select LPC_SCH
         help
-          Say yes here to support GPIO interface on Intel Poulsbo SCH.
+          Say yes here to support GPIO interface on Intel Poulsbo SCH
+          or Intel Tunnel Creek processor.
           The Intel SCH contains a total of 14 GPIO pins. Ten GPIOs are
           powered by the core power rail and are turned off during sleep
           modes (S3 and higher). The remaining four GPIOs are powered by
           the Intel SCH suspend power supply. These GPIOs remain
           active during S3. The suspend powered GPIOs can be used to wake the
           system from the Suspend-to-RAM state.
+          The Intel Tunnel Creek processor has 5 GPIOs powered by the
+          core power rail and 9 from suspend power supply.
 
           This driver can also be built as a module. If so, the module
           will be called sch-gpio.
diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c
index 813ac077e5d7..2514fb075f4a 100644
--- a/drivers/gpio/janz-ttl.c
+++ b/drivers/gpio/janz-ttl.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/core.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
@@ -149,7 +150,7 @@ static int __devinit ttl_probe(struct platform_device *pdev)
         struct resource *res;
         int ret;
 
-        pdata = pdev->dev.platform_data;
+        pdata = mfd_get_data(pdev);
         if (!pdata) {
                 dev_err(dev, "no platform data\n");
                 ret = -ENXIO;
diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index 897e0577e65e..a9bda881935a 100644
--- a/drivers/gpio/rdc321x-gpio.c
+++ b/drivers/gpio/rdc321x-gpio.c
@@ -27,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/gpio.h>
 #include <linux/mfd/rdc321x.h>
+#include <linux/mfd/core.h>
 #include <linux/slab.h>
 
 struct rdc321x_gpio {
@@ -135,7 +136,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)
         struct rdc321x_gpio *rdc321x_gpio_dev;
         struct rdc321x_gpio_pdata *pdata;
 
-        pdata = platform_get_drvdata(pdev);
+        pdata = mfd_get_data(pdev);
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 return -ENODEV;
diff --git a/drivers/gpio/sch_gpio.c b/drivers/gpio/sch_gpio.c
index 583521352c16..56060421cdff 100644
--- a/drivers/gpio/sch_gpio.c
+++ b/drivers/gpio/sch_gpio.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/acpi.h>
 #include <linux/platform_device.h>
+#include <linux/pci_ids.h>
 
 #include <linux/gpio.h>
 
@@ -187,7 +188,11 @@ static struct gpio_chip sch_gpio_resume = {
 static int __devinit sch_gpio_probe(struct platform_device *pdev)
 {
         struct resource *res;
-        int err;
+        int err, id;
+
+        id = pdev->id;
+        if (!id)
+                return -ENODEV;
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
         if (!res)
@@ -198,12 +203,40 @@ static int __devinit sch_gpio_probe(struct platform_device *pdev)
 
         gpio_ba = res->start;
 
-        sch_gpio_core.base = 0;
-        sch_gpio_core.ngpio = 10;
-        sch_gpio_core.dev = &pdev->dev;
+        switch (id) {
+                case PCI_DEVICE_ID_INTEL_SCH_LPC:
+                        sch_gpio_core.base = 0;
+                        sch_gpio_core.ngpio = 10;
+
+                        sch_gpio_resume.base = 10;
+                        sch_gpio_resume.ngpio = 4;
+
+                        /*
+                         * GPIO[6:0] enabled by default
+                         * GPIO7 is configured by the CMC as SLPIOVR
+                         * Enable GPIO[9:8] core powered gpios explicitly
+                         */
+                        outb(0x3, gpio_ba + CGEN + 1);
+                        /*
+                         * SUS_GPIO[2:0] enabled by default
+                         * Enable SUS_GPIO3 resume powered gpio explicitly
+                         */
+                        outb(0x8, gpio_ba + RGEN);
+                        break;
+
+                case PCI_DEVICE_ID_INTEL_ITC_LPC:
+                        sch_gpio_core.base = 0;
+                        sch_gpio_core.ngpio = 5;
+
+                        sch_gpio_resume.base = 5;
+                        sch_gpio_resume.ngpio = 9;
+                        break;
+
+                default:
+                        return -ENODEV;
+        }
 
-        sch_gpio_resume.base = 10;
-        sch_gpio_resume.ngpio = 4;
+        sch_gpio_core.dev = &pdev->dev;
         sch_gpio_resume.dev = &pdev->dev;
 
         err = gpiochip_add(&sch_gpio_core);
@@ -214,18 +247,6 @@ static int __devinit sch_gpio_probe(struct platform_device *pdev)
         if (err < 0)
                 goto err_sch_gpio_resume;
 
-        /*
-         * GPIO[6:0] enabled by default
-         * GPIO7 is configured by the CMC as SLPIOVR
-         * Enable GPIO[9:8] core powered gpios explicitly
-         */
-        outb(0x3, gpio_ba + CGEN + 1);
-        /*
-         * SUS_GPIO[2:0] enabled by default
-         * Enable SUS_GPIO3 resume powered gpio explicitly
-         */
-        outb(0x8, gpio_ba + RGEN);
-
         return 0;
 
 err_sch_gpio_resume:
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c
index 0265872e57d1..edbe1eae531f 100644
--- a/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/core.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/timb_gpio.h>
@@ -228,7 +229,7 @@ static int __devinit timbgpio_probe(struct platform_device *pdev)
         struct gpio_chip *gc;
         struct timbgpio *tgpio;
         struct resource *iomem;
-        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timbgpio_platform_data *pdata = mfd_get_data(pdev);
         int irq = platform_get_irq(pdev, 0);
 
         if (!pdata || pdata->nr_pins > 32) {
@@ -319,14 +320,13 @@ err_mem:
 static int __devexit timbgpio_remove(struct platform_device *pdev)
 {
         int err;
-        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
         struct timbgpio *tgpio = platform_get_drvdata(pdev);
         struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         int irq = platform_get_irq(pdev, 0);
 
         if (irq >= 0 && tgpio->irq_base > 0) {
                 int i;
-                for (i = 0; i < pdata->nr_pins; i++) {
+                for (i = 0; i < tgpio->gpio.ngpio; i++) {
                         irq_set_chip(tgpio->irq_base + i, NULL);
                         irq_set_chip_data(tgpio->irq_base + i, NULL);
                 }