13 files changed, 528 insertions, 20 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 246650673010..f60b2b6a0931 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -204,6 +204,7 @@ static void amba_device_release(struct device *dev)
 int amba_device_register(struct amba_device *dev, struct resource *parent)
 {
         u32 pid, cid;
+        u32 size;
         void __iomem *tmp;
         int i, ret;
 
@@ -229,16 +230,25 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
         if (ret)
                 goto err_out;
 
-        tmp = ioremap(dev->res.start, SZ_4K);
+        /*
+         * Dynamically calculate the size of the resource
+         * and use this for iomap
+         */
+        size = resource_size(&dev->res);
+        tmp = ioremap(dev->res.start, size);
         if (!tmp) {
                 ret = -ENOMEM;
                 goto err_release;
         }
 
+        /*
+         * Read pid and cid based on size of resource
+         * they are located at end of region
+         */
         for (pid = 0, i = 0; i < 4; i++)
-                pid |= (readl(tmp + 0xfe0 + 4 * i) & 255) << (i * 8);
+                pid |= (readl(tmp + size - 0x20 + 4 * i) & 255) << (i * 8);
         for (cid = 0, i = 0; i < 4; i++)
-                cid |= (readl(tmp + 0xff0 + 4 * i) & 255) << (i * 8);
+                cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) << (i * 8);
 
         iounmap(tmp);
 
@@ -353,11 +363,14 @@ amba_find_device(const char *busid, struct device *parent, unsigned int id,
 int amba_request_regions(struct amba_device *dev, const char *name)
 {
         int ret = 0;
+        u32 size;
 
         if (!name)
                 name = dev->dev.driver->name;
 
-        if (!request_mem_region(dev->res.start, SZ_4K, name))
+        size = resource_size(&dev->res);
+
+        if (!request_mem_region(dev->res.start, size, name))
                 ret = -EBUSY;
 
         return ret;
@@ -371,7 +384,10 @@ int amba_request_regions(struct amba_device *dev, const char *name)
  */
 void amba_release_regions(struct amba_device *dev)
 {
-        release_mem_region(dev->res.start, SZ_4K);
+        u32 size;
+
+        size = resource_size(&dev->res);
+        release_mem_region(dev->res.start, size);
 }
 
 EXPORT_SYMBOL(amba_driver_register);
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
index 6071f5882572..937dfe4e9b12 100644
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -326,7 +326,7 @@ static struct platform_driver w90x900ts_driver = {
         .probe          = w90x900ts_probe,
         .remove         = __devexit_p(w90x900ts_remove),
         .driver         = {
-                .name   = "w90x900-ts",
+                .name   = "nuc900-ts",
                 .owner  = THIS_MODULE,
         },
 };
@@ -347,4 +347,4 @@ module_exit(w90x900ts_exit);
 MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
 MODULE_DESCRIPTION("w90p910 touch screen driver!");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:w90p910-ts");
+MODULE_ALIAS("platform:nuc900-ts");
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 68ab39d7cb35..df1f86b5c83e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -233,6 +233,19 @@ config ISL29003
           This driver can also be built as a module.  If so, the module
           will be called isl29003.
 
+config EP93XX_PWM
+        tristate "EP93xx PWM support"
+        depends on ARCH_EP93XX
+        help
+          This option enables device driver support for the PWM channels
+          on the Cirrus EP93xx processors.  The EP9307 chip only has one
+          PWM channel all the others have two, the second channel is an
+          alternate function of the EGPIO14 pin.  A sysfs interface is
+          provided to control the PWM channels.
+
+          To compile this driver as a module, choose M here: the module will
+          be called ep93xx_pwm.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 36f733cd60e6..f982d2ecfde7 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SGI_XP)		+= sgi-xp/
 obj-$(CONFIG_SGI_GRU)           += sgi-gru/
 obj-$(CONFIG_HP_ILO)            += hpilo.o
 obj-$(CONFIG_ISL29003)          += isl29003.o
+obj-$(CONFIG_EP93XX_PWM)        += ep93xx_pwm.o
 obj-$(CONFIG_C2PORT)            += c2port/
 obj-y                           += eeprom/
 obj-y                           += cb710/
diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c
new file mode 100644
index 000000000000..ba4694169d79
--- /dev/null
+++ b/drivers/misc/ep93xx_pwm.c
@@ -0,0 +1,384 @@
+/*
+ *  Simple PWM driver for EP93XX
+ *
+ *      (c) Copyright 2009  Matthieu Crapet <mcrapet@gmail.com>
+ *      (c) Copyright 2009  H Hartley Sweeten <hsweeten@visionengravers.com>
+ *
+ *      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.
+ *
+ *  EP9307 has only one channel:
+ *    - PWMOUT
+ *
+ *  EP9301/02/12/15 have two channels:
+ *    - PWMOUT
+ *    - PWMOUT1 (alternate function for EGPIO14)
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/io.h>
+
+#include <mach/platform.h>
+
+#define EP93XX_PWMx_TERM_COUNT  0x00
+#define EP93XX_PWMx_DUTY_CYCLE  0x04
+#define EP93XX_PWMx_ENABLE      0x08
+#define EP93XX_PWMx_INVERT      0x0C
+
+#define EP93XX_PWM_MAX_COUNT    0xFFFF
+
+struct ep93xx_pwm {
+        void __iomem    *mmio_base;
+        struct clk      *clk;
+        u32             duty_percent;
+};
+
+static inline void ep93xx_pwm_writel(struct ep93xx_pwm *pwm,
+                unsigned int val, unsigned int off)
+{
+        __raw_writel(val, pwm->mmio_base + off);
+}
+
+static inline unsigned int ep93xx_pwm_readl(struct ep93xx_pwm *pwm,
+                unsigned int off)
+{
+        return __raw_readl(pwm->mmio_base + off);
+}
+
+static inline void ep93xx_pwm_write_tc(struct ep93xx_pwm *pwm, u16 value)
+{
+        ep93xx_pwm_writel(pwm, value, EP93XX_PWMx_TERM_COUNT);
+}
+
+static inline u16 ep93xx_pwm_read_tc(struct ep93xx_pwm *pwm)
+{
+        return ep93xx_pwm_readl(pwm, EP93XX_PWMx_TERM_COUNT);
+}
+
+static inline void ep93xx_pwm_write_dc(struct ep93xx_pwm *pwm, u16 value)
+{
+        ep93xx_pwm_writel(pwm, value, EP93XX_PWMx_DUTY_CYCLE);
+}
+
+static inline void ep93xx_pwm_enable(struct ep93xx_pwm *pwm)
+{
+        ep93xx_pwm_writel(pwm, 0x1, EP93XX_PWMx_ENABLE);
+}
+
+static inline void ep93xx_pwm_disable(struct ep93xx_pwm *pwm)
+{
+        ep93xx_pwm_writel(pwm, 0x0, EP93XX_PWMx_ENABLE);
+}
+
+static inline int ep93xx_pwm_is_enabled(struct ep93xx_pwm *pwm)
+{
+        return ep93xx_pwm_readl(pwm, EP93XX_PWMx_ENABLE) & 0x1;
+}
+
+static inline void ep93xx_pwm_invert(struct ep93xx_pwm *pwm)
+{
+        ep93xx_pwm_writel(pwm, 0x1, EP93XX_PWMx_INVERT);
+}
+
+static inline void ep93xx_pwm_normal(struct ep93xx_pwm *pwm)
+{
+        ep93xx_pwm_writel(pwm, 0x0, EP93XX_PWMx_INVERT);
+}
+
+static inline int ep93xx_pwm_is_inverted(struct ep93xx_pwm *pwm)
+{
+        return ep93xx_pwm_readl(pwm, EP93XX_PWMx_INVERT) & 0x1;
+}
+
+/*
+ * /sys/devices/platform/ep93xx-pwm.N
+ *   /min_freq      read-only   minimum pwm output frequency
+ *   /max_req       read-only   maximum pwm output frequency
+ *   /freq          read-write  pwm output frequency (0 = disable output)
+ *   /duty_percent  read-write  pwm duty cycle percent (1..99)
+ *   /invert        read-write  invert pwm output
+ */
+
+static ssize_t ep93xx_pwm_get_min_freq(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+        unsigned long rate = clk_get_rate(pwm->clk);
+
+        return sprintf(buf, "%ld\n", rate / (EP93XX_PWM_MAX_COUNT + 1));
+}
+
+static ssize_t ep93xx_pwm_get_max_freq(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+        unsigned long rate = clk_get_rate(pwm->clk);
+
+        return sprintf(buf, "%ld\n", rate / 2);
+}
+
+static ssize_t ep93xx_pwm_get_freq(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+
+        if (ep93xx_pwm_is_enabled(pwm)) {
+                unsigned long rate = clk_get_rate(pwm->clk);
+                u16 term = ep93xx_pwm_read_tc(pwm);
+
+                return sprintf(buf, "%ld\n", rate / (term + 1));
+        } else {
+                return sprintf(buf, "disabled\n");
+        }
+}
+
+static ssize_t ep93xx_pwm_set_freq(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+        long val;
+        int err;
+
+        err = strict_strtol(buf, 10, &val);
+        if (err)
+                return -EINVAL;
+
+        if (val == 0) {
+                ep93xx_pwm_disable(pwm);
+        } else if (val <= (clk_get_rate(pwm->clk) / 2)) {
+                u32 term, duty;
+
+                val = (clk_get_rate(pwm->clk) / val) - 1;
+                if (val > EP93XX_PWM_MAX_COUNT)
+                        val = EP93XX_PWM_MAX_COUNT;
+                if (val < 1)
+                        val = 1;
+
+                term = ep93xx_pwm_read_tc(pwm);
+                duty = ((val + 1) * pwm->duty_percent / 100) - 1;
+
+                /* If pwm is running, order is important */
+                if (val > term) {
+                        ep93xx_pwm_write_tc(pwm, val);
+                        ep93xx_pwm_write_dc(pwm, duty);
+                } else {
+                        ep93xx_pwm_write_dc(pwm, duty);
+                        ep93xx_pwm_write_tc(pwm, val);
+                }
+
+                if (!ep93xx_pwm_is_enabled(pwm))
+                        ep93xx_pwm_enable(pwm);
+        } else {
+                return -EINVAL;
+        }
+
+        return count;
+}
+
+static ssize_t ep93xx_pwm_get_duty_percent(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+
+        return sprintf(buf, "%d\n", pwm->duty_percent);
+}
+
+static ssize_t ep93xx_pwm_set_duty_percent(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+        long val;
+        int err;
+
+        err = strict_strtol(buf, 10, &val);
+        if (err)
+                return -EINVAL;
+
+        if (val > 0 && val < 100) {
+                u32 term = ep93xx_pwm_read_tc(pwm);
+                ep93xx_pwm_write_dc(pwm, ((term + 1) * val / 100) - 1);
+                pwm->duty_percent = val;
+                return count;
+        }
+
+        return -EINVAL;
+}
+
+static ssize_t ep93xx_pwm_get_invert(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+
+        return sprintf(buf, "%d\n", ep93xx_pwm_is_inverted(pwm));
+}
+
+static ssize_t ep93xx_pwm_set_invert(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+        long val;
+        int err;
+
+        err = strict_strtol(buf, 10, &val);
+        if (err)
+                return -EINVAL;
+
+        if (val == 0)
+                ep93xx_pwm_normal(pwm);
+        else if (val == 1)
+                ep93xx_pwm_invert(pwm);
+        else
+                return -EINVAL;
+
+        return count;
+}
+
+static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL);
+static DEVICE_ATTR(max_freq, S_IRUGO, ep93xx_pwm_get_max_freq, NULL);
+static DEVICE_ATTR(freq, S_IWUGO | S_IRUGO,
+                   ep93xx_pwm_get_freq, ep93xx_pwm_set_freq);
+static DEVICE_ATTR(duty_percent, S_IWUGO | S_IRUGO,
+                   ep93xx_pwm_get_duty_percent, ep93xx_pwm_set_duty_percent);
+static DEVICE_ATTR(invert, S_IWUGO | S_IRUGO,
+                   ep93xx_pwm_get_invert, ep93xx_pwm_set_invert);
+
+static struct attribute *ep93xx_pwm_attrs[] = {
+        &dev_attr_min_freq.attr,
+        &dev_attr_max_freq.attr,
+        &dev_attr_freq.attr,
+        &dev_attr_duty_percent.attr,
+        &dev_attr_invert.attr,
+        NULL
+};
+
+static const struct attribute_group ep93xx_pwm_sysfs_files = {
+        .attrs  = ep93xx_pwm_attrs,
+};
+
+static int __init ep93xx_pwm_probe(struct platform_device *pdev)
+{
+        struct ep93xx_pwm *pwm;
+        struct resource *res;
+        int err;
+
+        err = ep93xx_pwm_acquire_gpio(pdev);
+        if (err)
+                return err;
+
+        pwm = kzalloc(sizeof(struct ep93xx_pwm), GFP_KERNEL);
+        if (!pwm) {
+                err = -ENOMEM;
+                goto fail_no_mem;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                err = -ENXIO;
+                goto fail_no_mem_resource;
+        }
+
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
+        if (res == NULL) {
+                err = -EBUSY;
+                goto fail_no_mem_resource;
+        }
+
+        pwm->mmio_base = ioremap(res->start, resource_size(res));
+        if (pwm->mmio_base == NULL) {
+                err = -ENXIO;
+                goto fail_no_ioremap;
+        }
+
+        err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
+        if (err)
+                goto fail_no_sysfs;
+
+        pwm->clk = clk_get(&pdev->dev, "pwm_clk");
+        if (IS_ERR(pwm->clk)) {
+                err = PTR_ERR(pwm->clk);
+                goto fail_no_clk;
+        }
+
+        pwm->duty_percent = 50;
+
+        platform_set_drvdata(pdev, pwm);
+
+        /* disable pwm at startup. Avoids zero value. */
+        ep93xx_pwm_disable(pwm);
+        ep93xx_pwm_write_tc(pwm, EP93XX_PWM_MAX_COUNT);
+        ep93xx_pwm_write_dc(pwm, EP93XX_PWM_MAX_COUNT / 2);
+
+        clk_enable(pwm->clk);
+
+        return 0;
+
+fail_no_clk:
+        sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
+fail_no_sysfs:
+        iounmap(pwm->mmio_base);
+fail_no_ioremap:
+        release_mem_region(res->start, resource_size(res));
+fail_no_mem_resource:
+        kfree(pwm);
+fail_no_mem:
+        ep93xx_pwm_release_gpio(pdev);
+        return err;
+}
+
+static int __exit ep93xx_pwm_remove(struct platform_device *pdev)
+{
+        struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        ep93xx_pwm_disable(pwm);
+        clk_disable(pwm->clk);
+        clk_put(pwm->clk);
+        platform_set_drvdata(pdev, NULL);
+        sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
+        iounmap(pwm->mmio_base);
+        release_mem_region(res->start, resource_size(res));
+        kfree(pwm);
+        ep93xx_pwm_release_gpio(pdev);
+
+        return 0;
+}
+
+static struct platform_driver ep93xx_pwm_driver = {
+        .driver         = {
+                .name   = "ep93xx-pwm",
+                .owner  = THIS_MODULE,
+        },
+        .remove         = __exit_p(ep93xx_pwm_remove),
+};
+
+static int __init ep93xx_pwm_init(void)
+{
+        return platform_driver_probe(&ep93xx_pwm_driver, ep93xx_pwm_probe);
+}
+
+static void __exit ep93xx_pwm_exit(void)
+{
+        platform_driver_unregister(&ep93xx_pwm_driver);
+}
+
+module_init(ep93xx_pwm_init);
+module_exit(ep93xx_pwm_exit);
+
+MODULE_AUTHOR("Matthieu Crapet <mcrapet@gmail.com>, "
+              "H Hartley Sweeten <hsweeten@visionengravers.com>");
+MODULE_DESCRIPTION("EP93xx PWM driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ep93xx-pwm");
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index e1aa8471ab1c..a923ee27c09e 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -21,6 +21,7 @@
 #include <linux/amba/bus.h>
 #include <linux/clk.h>
 #include <linux/scatterlist.h>
+#include <linux/gpio.h>
 
 #include <asm/cacheflush.h>
 #include <asm/div64.h>
@@ -472,17 +473,41 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         }
 }
 
+static int mmci_get_ro(struct mmc_host *mmc)
+{
+        struct mmci_host *host = mmc_priv(mmc);
+
+        if (host->gpio_wp == -ENOSYS)
+                return -ENOSYS;
+
+        return gpio_get_value(host->gpio_wp);
+}
+
+static int mmci_get_cd(struct mmc_host *mmc)
+{
+        struct mmci_host *host = mmc_priv(mmc);
+        unsigned int status;
+
+        if (host->gpio_cd == -ENOSYS)
+                status = host->plat->status(mmc_dev(host->mmc));
+        else
+                status = gpio_get_value(host->gpio_cd);
+
+        return !status;
+}
+
 static const struct mmc_host_ops mmci_ops = {
         .request        = mmci_request,
         .set_ios        = mmci_set_ios,
+        .get_ro         = mmci_get_ro,
+        .get_cd         = mmci_get_cd,
 };
 
 static void mmci_check_status(unsigned long data)
 {
         struct mmci_host *host = (struct mmci_host *)data;
-        unsigned int status;
+        unsigned int status = mmci_get_cd(host->mmc);
 
-        status = host->plat->status(mmc_dev(host->mmc));
         if (status ^ host->oldstat)
                 mmc_detect_change(host->mmc, 0);
 
@@ -515,12 +540,15 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
 
         host = mmc_priv(mmc);
         host->mmc = mmc;
-        /* Bits 12 thru 19 is the designer */
-        host->hw_designer = (dev->periphid >> 12) & 0xff;
-        /* Bits 20 thru 23 is the revison */
-        host->hw_revision = (dev->periphid >> 20) & 0xf;
+
+        host->gpio_wp = -ENOSYS;
+        host->gpio_cd = -ENOSYS;
+
+        host->hw_designer = amba_manf(dev);
+        host->hw_revision = amba_rev(dev);
         DBG(host, "designer ID = 0x%02x\n", host->hw_designer);
         DBG(host, "revision = 0x%01x\n", host->hw_revision);
+
         host->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(host->clk)) {
                 ret = PTR_ERR(host->clk);
@@ -591,6 +619,27 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
         writel(0, host->base + MMCIMASK1);
         writel(0xfff, host->base + MMCICLEAR);
 
+#ifdef CONFIG_GPIOLIB
+        if (gpio_is_valid(plat->gpio_cd)) {
+                ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)");
+                if (ret == 0)
+                        ret = gpio_direction_input(plat->gpio_cd);
+                if (ret == 0)
+                        host->gpio_cd = plat->gpio_cd;
+                else if (ret != -ENOSYS)
+                        goto err_gpio_cd;
+        }
+        if (gpio_is_valid(plat->gpio_wp)) {
+                ret = gpio_request(plat->gpio_wp, DRIVER_NAME " (wp)");
+                if (ret == 0)
+                        ret = gpio_direction_input(plat->gpio_wp);
+                if (ret == 0)
+                        host->gpio_wp = plat->gpio_wp;
+                else if (ret != -ENOSYS)
+                        goto err_gpio_wp;
+        }
+#endif
+
         ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);
         if (ret)
                 goto unmap;
@@ -602,6 +651,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
         writel(MCI_IRQENABLE, host->base + MMCIMASK0);
 
         amba_set_drvdata(dev, mmc);
+        host->oldstat = mmci_get_cd(host->mmc);
 
         mmc_add_host(mmc);
 
@@ -620,6 +670,12 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
  irq0_free:
         free_irq(dev->irq[0], host);
  unmap:
+        if (host->gpio_wp != -ENOSYS)
+                gpio_free(host->gpio_wp);
+ err_gpio_wp:
+        if (host->gpio_cd != -ENOSYS)
+                gpio_free(host->gpio_cd);
+ err_gpio_cd:
         iounmap(host->base);
  clk_disable:
         clk_disable(host->clk);
@@ -655,6 +711,11 @@ static int __devexit mmci_remove(struct amba_device *dev)
                 free_irq(dev->irq[0], host);
                 free_irq(dev->irq[1], host);
 
+                if (host->gpio_wp != -ENOSYS)
+                        gpio_free(host->gpio_wp);
+                if (host->gpio_cd != -ENOSYS)
+                        gpio_free(host->gpio_cd);
+
                 iounmap(host->base);
                 clk_disable(host->clk);
                 clk_put(host->clk);
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 0441bac1c0ec..839f264c9725 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -151,6 +151,8 @@ struct mmci_host {
         struct mmc_data         *data;
         struct mmc_host         *mmc;
         struct clk              *clk;
+        int                     gpio_cd;
+        int                     gpio_wp;
 
         unsigned int            data_xfered;
 
diff --git a/drivers/mtd/nand/ts7250.c b/drivers/mtd/nand/ts7250.c
index 2c410a011317..0f5562aeedc1 100644
--- a/drivers/mtd/nand/ts7250.c
+++ b/drivers/mtd/nand/ts7250.c
@@ -24,8 +24,11 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
-#include <asm/io.h>
+#include <linux/io.h>
+
 #include <mach/hardware.h>
+#include <mach/ts72xx.h>
+
 #include <asm/sizes.h>
 #include <asm/mach-types.h>
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c155bd3ec9f1..f053ba5c37ba 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -209,7 +209,7 @@ config MII
 
 config MACB
         tristate "Atmel MACB support"
-        depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9
+        depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
         select PHYLIB
         help
           The Atmel MACB ethernet interface is found on many AT32 and AT91
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index bf82e28770a9..72ba0c6d3551 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -826,6 +826,28 @@ static int pl011_remove(struct amba_device *dev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int pl011_suspend(struct amba_device *dev, pm_message_t state)
+{
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
+
+        if (!uap)
+                return -EINVAL;
+
+        return uart_suspend_port(&amba_reg, &uap->port);
+}
+
+static int pl011_resume(struct amba_device *dev)
+{
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
+
+        if (!uap)
+                return -EINVAL;
+
+        return uart_resume_port(&amba_reg, &uap->port);
+}
+#endif
+
 static struct amba_id pl011_ids[] __initdata = {
         {
                 .id     = 0x00041011,
@@ -847,6 +869,10 @@ static struct amba_driver pl011_driver = {
         .id_table       = pl011_ids,
         .probe          = pl011_probe,
         .remove         = pl011_remove,
+#ifdef CONFIG_PM
+        .suspend        = pl011_suspend,
+        .resume         = pl011_resume,
+#endif
 };
 
 static int __init pl011_init(void)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8afcf08eba98..41296a6807e2 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -935,7 +935,7 @@ config FB_S1D13XXX
 
 config FB_ATMEL
         tristate "AT91/AT32 LCD Controller support"
-        depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || AVR32)
+        depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -951,7 +951,7 @@ config FB_INTSRAM
 
 config FB_ATMEL_STN
         bool "Use a STN display with AT91/AT32 LCD Controller"
-        depends on FB_ATMEL && MACH_AT91SAM9261EK
+        depends on FB_ATMEL && (MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK)
         default n
         help
           Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index da05f0801bb7..2830ffd72976 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -182,7 +182,8 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)
 {
         unsigned long value;
 
-        if (!(cpu_is_at91sam9261() || cpu_is_at32ap7000()))
+        if (!(cpu_is_at91sam9261() || cpu_is_at91sam9g10()
+                || cpu_is_at32ap7000()))
                 return xres;
 
         value = xres;
@@ -824,7 +825,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         info->fix = atmel_lcdfb_fix;
 
         /* Enable LCDC Clocks */
-        if (cpu_is_at91sam9261() || cpu_is_at32ap7000()) {
+        if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()
+         || cpu_is_at32ap7000()) {
                 sinfo->bus_clk = clk_get(dev, "hck1");
                 if (IS_ERR(sinfo->bus_clk)) {
                         ret = PTR_ERR(sinfo->bus_clk);
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index f9d19be05540..90861cd93165 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -110,7 +110,7 @@ config BACKLIGHT_CLASS_DEVICE
 config BACKLIGHT_ATMEL_LCDC
         bool "Atmel LCDC Contrast-as-Backlight control"
         depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL
-        default y if MACH_SAM9261EK || MACH_SAM9263EK
+        default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK
         help
           This provides a backlight control internal to the Atmel LCDC
           driver.  If the LCD "contrast control" on your board is wired