9 files changed, 151 insertions, 55 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 54eaf96ab217..01c2cf4efcdd 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -497,37 +497,22 @@ static void amba_device_release(struct device *dev)
 }
 
 /**
- *      amba_device_register - register an AMBA device
- *      @dev: AMBA device to register
- *      @parent: parent memory resource
+ *      amba_device_add - add a previously allocated AMBA device structure
+ *      @dev: AMBA device allocated by amba_device_alloc
+ *      @parent: resource parent for this devices resources
  *
- *      Setup the AMBA device, reading the cell ID if present.
- *      Claim the resource, and register the AMBA device with
- *      the Linux device manager.
+ *      Claim the resource, and read the device cell ID if not already
+ *      initialized.  Register the AMBA device with the Linux device
+ *      manager.
  */
-int amba_device_register(struct amba_device *dev, struct resource *parent)
+int amba_device_add(struct amba_device *dev, struct resource *parent)
 {
         u32 size;
         void __iomem *tmp;
         int i, ret;
 
-        device_initialize(&dev->dev);
-
-        /*
-         * Copy from device_add
-         */
-        if (dev->dev.init_name) {
-                dev_set_name(&dev->dev, "%s", dev->dev.init_name);
-                dev->dev.init_name = NULL;
-        }
-
-        dev->dev.release = amba_device_release;
-        dev->dev.bus = &amba_bustype;
-        dev->dev.dma_mask = &dev->dma_mask;
-        dev->res.name = dev_name(&dev->dev);
-
-        if (!dev->dev.coherent_dma_mask && dev->dma_mask)
-                dev_warn(&dev->dev, "coherent dma mask is unset\n");
+        WARN_ON(dev->irq[0] == (unsigned int)-1);
+        WARN_ON(dev->irq[1] == (unsigned int)-1);
 
         ret = request_resource(parent, &dev->res);
         if (ret)
@@ -582,9 +567,9 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
         if (ret)
                 goto err_release;
 
-        if (dev->irq[0] != NO_IRQ)
+        if (dev->irq[0] && dev->irq[0] != NO_IRQ)
                 ret = device_create_file(&dev->dev, &dev_attr_irq0);
-        if (ret == 0 && dev->irq[1] != NO_IRQ)
+        if (ret == 0 && dev->irq[1] && dev->irq[1] != NO_IRQ)
                 ret = device_create_file(&dev->dev, &dev_attr_irq1);
         if (ret == 0)
                 return ret;
@@ -596,6 +581,74 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
  err_out:
         return ret;
 }
+EXPORT_SYMBOL_GPL(amba_device_add);
+
+static void amba_device_initialize(struct amba_device *dev, const char *name)
+{
+        device_initialize(&dev->dev);
+        if (name)
+                dev_set_name(&dev->dev, "%s", name);
+        dev->dev.release = amba_device_release;
+        dev->dev.bus = &amba_bustype;
+        dev->dev.dma_mask = &dev->dma_mask;
+        dev->res.name = dev_name(&dev->dev);
+}
+
+/**
+ *      amba_device_alloc - allocate an AMBA device
+ *      @name: sysfs name of the AMBA device
+ *      @base: base of AMBA device
+ *      @size: size of AMBA device
+ *
+ *      Allocate and initialize an AMBA device structure.  Returns %NULL
+ *      on failure.
+ */
+struct amba_device *amba_device_alloc(const char *name, resource_size_t base,
+        size_t size)
+{
+        struct amba_device *dev;
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (dev) {
+                amba_device_initialize(dev, name);
+                dev->res.start = base;
+                dev->res.end = base + size - 1;
+                dev->res.flags = IORESOURCE_MEM;
+        }
+
+        return dev;
+}
+EXPORT_SYMBOL_GPL(amba_device_alloc);
+
+/**
+ *      amba_device_register - register an AMBA device
+ *      @dev: AMBA device to register
+ *      @parent: parent memory resource
+ *
+ *      Setup the AMBA device, reading the cell ID if present.
+ *      Claim the resource, and register the AMBA device with
+ *      the Linux device manager.
+ */
+int amba_device_register(struct amba_device *dev, struct resource *parent)
+{
+        amba_device_initialize(dev, dev->dev.init_name);
+        dev->dev.init_name = NULL;
+
+        if (!dev->dev.coherent_dma_mask && dev->dma_mask)
+                dev_warn(&dev->dev, "coherent dma mask is unset\n");
+
+        return amba_device_add(dev, parent);
+}
+
+/**
+ *      amba_device_put - put an AMBA device
+ *      @dev: AMBA device to put
+ */
+void amba_device_put(struct amba_device *dev)
+{
+        put_device(&dev->dev);
+}
+EXPORT_SYMBOL_GPL(amba_device_put);
 
 /**
  *      amba_device_unregister - unregister an AMBA device
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 58832e578fff..8d1ab6fa88e1 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -196,7 +196,7 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
 
         dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
 
-        clk_enable(i2c_imx->clk);
+        clk_prepare_enable(i2c_imx->clk);
         writeb(i2c_imx->ifdr, i2c_imx->base + IMX_I2C_IFDR);
         /* Enable I2C controller */
         writeb(0, i2c_imx->base + IMX_I2C_I2SR);
@@ -245,7 +245,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
 
         /* Disable I2C controller */
         writeb(0, i2c_imx->base + IMX_I2C_I2CR);
-        clk_disable(i2c_imx->clk);
+        clk_disable_unprepare(i2c_imx->clk);
 }
 
 static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 947faa5d2ce4..efdb81d21c44 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -86,7 +86,6 @@ static inline int at91mci_is_mci1rev2xx(void)
 {
         return (   cpu_is_at91sam9260()
                 || cpu_is_at91sam9263()
-                || cpu_is_at91cap9()
                 || cpu_is_at91sam9rl()
                 || cpu_is_at91sam9g10()
                 || cpu_is_at91sam9g20()
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 0d955ffaf44e..304f2f98b680 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1325,7 +1325,7 @@ static int __devinit mmci_probe(struct amba_device *dev,
         if (ret)
                 goto unmap;
 
-        if (dev->irq[1] == NO_IRQ)
+        if (dev->irq[1] == NO_IRQ || !dev->irq[1])
                 host->singleirq = true;
         else {
                 ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED,
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index d601e41af282..f4e82d45cafa 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -463,7 +463,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
                 err = PTR_ERR(clk);
                 goto err_clk_get;
         }
-        clk_enable(clk);
+        clk_prepare_enable(clk);
         pltfm_host->clk = clk;
 
         if (!is_imx25_esdhc(imx_data))
@@ -558,7 +558,7 @@ no_card_detect_irq:
                 gpio_free(boarddata->wp_gpio);
 no_card_detect_pin:
 no_board_data:
-        clk_disable(pltfm_host->clk);
+        clk_disable_unprepare(pltfm_host->clk);
         clk_put(pltfm_host->clk);
 err_clk_get:
         kfree(imx_data);
@@ -585,7 +585,7 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev)
                 gpio_free(boarddata->cd_gpio);
         }
 
-        clk_disable(pltfm_host->clk);
+        clk_disable_unprepare(pltfm_host->clk);
         clk_put(pltfm_host->clk);
         kfree(imx_data);
 
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 63b3ec48c203..cae9477a6ed3 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -253,7 +253,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
         if (!of_device_is_available(node))
                 return NULL;
 
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        dev = amba_device_alloc(NULL, 0, 0);
         if (!dev)
                 return NULL;
 
@@ -283,14 +283,14 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
         if (ret)
                 goto err_free;
 
-        ret = amba_device_register(dev, &iomem_resource);
+        ret = amba_device_add(dev, &iomem_resource);
         if (ret)
                 goto err_free;
 
         return dev;
 
 err_free:
-        kfree(dev);
+        amba_device_put(dev);
         return NULL;
 }
 #else /* CONFIG_ARM_AMBA */
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index aef40bd2957b..78951866f8ab 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -35,6 +35,8 @@
 
 enum s3c_cpu_type {
         TYPE_S3C2410,
+        TYPE_S3C2416,
+        TYPE_S3C2443,
         TYPE_S3C64XX,
 };
 
@@ -132,6 +134,7 @@ static int s3c_rtc_setfreq(struct device *dev, int freq)
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
         unsigned int tmp = 0;
+        int val;
 
         if (!is_power_of_2(freq))
                 return -EINVAL;
@@ -139,12 +142,22 @@ static int s3c_rtc_setfreq(struct device *dev, int freq)
         clk_enable(rtc_clk);
         spin_lock_irq(&s3c_rtc_pie_lock);
 
-        if (s3c_rtc_cpu_type == TYPE_S3C2410) {
+        if (s3c_rtc_cpu_type != TYPE_S3C64XX) {
                 tmp = readb(s3c_rtc_base + S3C2410_TICNT);
                 tmp &= S3C2410_TICNT_ENABLE;
         }
 
-        tmp |= (rtc_dev->max_user_freq / freq)-1;
+        val = (rtc_dev->max_user_freq / freq) - 1;
+
+        if (s3c_rtc_cpu_type == TYPE_S3C2416 || s3c_rtc_cpu_type == TYPE_S3C2443) {
+                tmp |= S3C2443_TICNT_PART(val);
+                writel(S3C2443_TICNT1_PART(val), s3c_rtc_base + S3C2443_TICNT1);
+
+                if (s3c_rtc_cpu_type == TYPE_S3C2416)
+                        writel(S3C2416_TICNT2_PART(val), s3c_rtc_base + S3C2416_TICNT2);
+        } else {
+                tmp |= val;
+        }
 
         writel(tmp, s3c_rtc_base + S3C2410_TICNT);
         spin_unlock_irq(&s3c_rtc_pie_lock);
@@ -371,7 +384,7 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
                 tmp &= ~S3C2410_RTCCON_RTCEN;
                 writew(tmp, base + S3C2410_RTCCON);
 
-                if (s3c_rtc_cpu_type == TYPE_S3C2410) {
+                if (s3c_rtc_cpu_type != TYPE_S3C64XX) {
                         tmp = readb(base + S3C2410_TICNT);
                         tmp &= ~S3C2410_TICNT_ENABLE;
                         writeb(tmp, base + S3C2410_TICNT);
@@ -428,12 +441,27 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
         return 0;
 }
 
+static const struct of_device_id s3c_rtc_dt_match[];
+
+static inline int s3c_rtc_get_driver_data(struct platform_device *pdev)
+{
+#ifdef CONFIG_OF
+        if (pdev->dev.of_node) {
+                const struct of_device_id *match;
+                match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
+                return match->data;
+        }
+#endif
+        return platform_get_device_id(pdev)->driver_data;
+}
+
 static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
         struct rtc_time rtc_tm;
         struct resource *res;
         int ret;
+        int tmp;
 
         pr_debug("%s: probe=%p\n", __func__, pdev);
 
@@ -508,13 +536,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 goto err_nortc;
         }
 
-#ifdef CONFIG_OF
-        if (pdev->dev.of_node)
-                s3c_rtc_cpu_type = of_device_is_compatible(pdev->dev.of_node,
-                        "samsung,s3c6410-rtc") ? TYPE_S3C64XX : TYPE_S3C2410;
-        else
-#endif
-                s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+        s3c_rtc_cpu_type = s3c_rtc_get_driver_data(pdev);
 
         /* Check RTC Time */
 
@@ -533,11 +555,17 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
         }
 
-        if (s3c_rtc_cpu_type == TYPE_S3C64XX)
+        if (s3c_rtc_cpu_type != TYPE_S3C2410)
                 rtc->max_user_freq = 32768;
         else
                 rtc->max_user_freq = 128;
 
+        if (s3c_rtc_cpu_type == TYPE_S3C2416 || s3c_rtc_cpu_type == TYPE_S3C2443) {
+                tmp = readw(s3c_rtc_base + S3C2410_RTCCON);
+                tmp |= S3C2443_RTCCON_TICSEL;
+                writew(tmp, s3c_rtc_base + S3C2410_RTCCON);
+        }
+
         platform_set_drvdata(pdev, rtc);
 
         s3c_rtc_setfreq(&pdev->dev, 1);
@@ -638,8 +666,19 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id s3c_rtc_dt_match[] = {
-        { .compatible = "samsung,s3c2410-rtc" },
-        { .compatible = "samsung,s3c6410-rtc" },
+        {
+                .compatible = "samsung,s3c2410-rtc"
+                .data = TYPE_S3C2410,
+        }, {
+                .compatible = "samsung,s3c2416-rtc"
+                .data = TYPE_S3C2416,
+        }, {
+                .compatible = "samsung,s3c2443-rtc"
+                .data = TYPE_S3C2443,
+        }, {
+                .compatible = "samsung,s3c6410-rtc"
+                .data = TYPE_S3C64XX,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
@@ -652,6 +691,12 @@ static struct platform_device_id s3c_rtc_driver_ids[] = {
                 .name           = "s3c2410-rtc",
                 .driver_data    = TYPE_S3C2410,
         }, {
+                .name           = "s3c2416-rtc",
+                .driver_data    = TYPE_S3C2416,
+        }, {
+                .name           = "s3c2443-rtc",
+                .driver_data    = TYPE_S3C2443,
+        }, {
                 .name           = "s3c64xx-rtc",
                 .driver_data    = TYPE_S3C64XX,
         },
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 0b7fed746b27..e7feceeebc2f 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1508,7 +1508,7 @@ static int serial_imx_probe(struct platform_device *pdev)
                 ret = PTR_ERR(sport->clk);
                 goto unmap;
         }
-        clk_enable(sport->clk);
+        clk_prepare_enable(sport->clk);
 
         sport->port.uartclk = clk_get_rate(sport->clk);
 
@@ -1531,8 +1531,8 @@ deinit:
         if (pdata && pdata->exit)
                 pdata->exit(pdev);
 clkput:
+        clk_disable_unprepare(sport->clk);
         clk_put(sport->clk);
-        clk_disable(sport->clk);
 unmap:
         iounmap(sport->port.membase);
 free:
@@ -1552,11 +1552,10 @@ static int serial_imx_remove(struct platform_device *pdev)
 
         if (sport) {
                 uart_remove_one_port(&imx_reg, &sport->port);
+                clk_disable_unprepare(sport->clk);
                 clk_put(sport->clk);
         }
 
-        clk_disable(sport->clk);
-
         if (pdata && pdata->exit)
                 pdata->exit(pdev);
 
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 7ecb68a67411..85ae4b46bb68 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -137,7 +137,7 @@ choice
 
 config USB_AT91
         tristate "Atmel AT91 USB Device Port"
-        depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9 && !ARCH_AT91SAM9G45
+        depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91SAM9G45
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
            full speed USB Device Port with support for five configurable
@@ -150,7 +150,7 @@ config USB_AT91
 config USB_ATMEL_USBA
         tristate "Atmel USBA"
         select USB_GADGET_DUALSPEED
-        depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
+        depends on AVR32 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
         help
           USBA is the integrated high-speed USB Device controller on
           the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.