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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
  ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
  ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
  ARM: 6140/1: silence a bogus sparse warning in unwind.c
  ARM: mach-at91: duplicated include
  ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
  ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
  ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
  ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
  ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
  ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
  ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
  ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
  ARM: SPEAR6xx: remove duplicated #include
  ARM: s3c6400_defconfig: Add NAND driver
  ARM: s3c6400_defconfig: enable sound as modules
  ARM: s3c6400_defconfig: enable power management
  ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
  ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
  ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
  ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
  ...

4 files changed, 124 insertions, 17 deletions

diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index a8b4c4010144..a348c7e9aa0b 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -15,6 +15,10 @@
 #include <linux/amba/bus.h>
 #include <linux/hw_random.h>
 #include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+
+static struct clk *rng_clk;
 
 static int nmk_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
 {
@@ -40,6 +44,15 @@ static int nmk_rng_probe(struct amba_device *dev, struct amba_id *id)
         void __iomem *base;
         int ret;
 
+        rng_clk = clk_get(&dev->dev, NULL);
+        if (IS_ERR(rng_clk)) {
+                dev_err(&dev->dev, "could not get rng clock\n");
+                ret = PTR_ERR(rng_clk);
+                return ret;
+        }
+
+        clk_enable(rng_clk);
+
         ret = amba_request_regions(dev, dev->dev.init_name);
         if (ret)
                 return ret;
@@ -57,6 +70,8 @@ out_unmap:
         iounmap(base);
 out_release:
         amba_release_regions(dev);
+        clk_disable(rng_clk);
+        clk_put(rng_clk);
         return ret;
 }
 
@@ -66,6 +81,8 @@ static int nmk_rng_remove(struct amba_device *dev)
         hwrng_unregister(&nmk_rng);
         iounmap(base);
         amba_release_regions(dev);
+        clk_disable(rng_clk);
+        clk_put(rng_clk);
         return 0;
 }
 
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 2dd4cfe7ca17..b9dee28ee7d0 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -296,6 +296,12 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         card->type = MMC_TYPE_SDIO;
 
         /*
+         * Call the optional HC's init_card function to handle quirks.
+         */
+        if (host->ops->init_card)
+                host->ops->init_card(host, card);
+
+        /*
          * For native busses:  set card RCA and quit open drain mode.
          */
         if (!powered_resume && !mmc_host_is_spi(host)) {
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 2df90412abb5..ec18e3b60342 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -119,6 +119,7 @@ struct mxcmci_host {
         int                     detect_irq;
         int                     dma;
         int                     do_dma;
+        int                     use_sdio;
         unsigned int            power_mode;
         struct imxmmc_platform_data *pdata;
 
@@ -138,6 +139,7 @@ struct mxcmci_host {
         int                     clock;
 
         struct work_struct      datawork;
+        spinlock_t              lock;
 };
 
 static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios);
@@ -151,6 +153,8 @@ static void mxcmci_softreset(struct mxcmci_host *host)
 {
         int i;
 
+        dev_dbg(mmc_dev(host->mmc), "mxcmci_softreset\n");
+
         /* reset sequence */
         writew(STR_STP_CLK_RESET, host->base + MMC_REG_STR_STP_CLK);
         writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
@@ -224,6 +228,9 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
 static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_command *cmd,
                 unsigned int cmdat)
 {
+        u32 int_cntr;
+        unsigned long flags;
+
         WARN_ON(host->cmd != NULL);
         host->cmd = cmd;
 
@@ -247,12 +254,16 @@ static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_command *cmd,
                 return -EINVAL;
         }
 
+        int_cntr = INT_END_CMD_RES_EN;
+
         if (mxcmci_use_dma(host))
-                writel(INT_READ_OP_EN | INT_WRITE_OP_DONE_EN |
-                                INT_END_CMD_RES_EN,
-                                host->base + MMC_REG_INT_CNTR);
-        else
-                writel(INT_END_CMD_RES_EN, host->base + MMC_REG_INT_CNTR);
+                int_cntr |= INT_READ_OP_EN | INT_WRITE_OP_DONE_EN;
+
+        spin_lock_irqsave(&host->lock, flags);
+        if (host->use_sdio)
+                int_cntr |= INT_SDIO_IRQ_EN;
+        writel(int_cntr, host->base + MMC_REG_INT_CNTR);
+        spin_unlock_irqrestore(&host->lock, flags);
 
         writew(cmd->opcode, host->base + MMC_REG_CMD);
         writel(cmd->arg, host->base + MMC_REG_ARG);
@@ -264,7 +275,14 @@ static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_command *cmd,
 static void mxcmci_finish_request(struct mxcmci_host *host,
                 struct mmc_request *req)
 {
-        writel(0, host->base + MMC_REG_INT_CNTR);
+        u32 int_cntr = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+        if (host->use_sdio)
+                int_cntr |= INT_SDIO_IRQ_EN;
+        writel(int_cntr, host->base + MMC_REG_INT_CNTR);
+        spin_unlock_irqrestore(&host->lock, flags);
 
         host->req = NULL;
         host->cmd = NULL;
@@ -290,16 +308,25 @@ static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat)
                 dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n",
                                 stat);
                 if (stat & STATUS_CRC_READ_ERR) {
+                        dev_err(mmc_dev(host->mmc), "%s: -EILSEQ\n", __func__);
                         data->error = -EILSEQ;
                 } else if (stat & STATUS_CRC_WRITE_ERR) {
                         u32 err_code = (stat >> 9) & 0x3;
-                        if (err_code == 2) /* No CRC response */
+                        if (err_code == 2) { /* No CRC response */
+                                dev_err(mmc_dev(host->mmc),
+                                        "%s: No CRC -ETIMEDOUT\n", __func__);
                                 data->error = -ETIMEDOUT;
-                        else
+                        } else {
+                                dev_err(mmc_dev(host->mmc),
+                                        "%s: -EILSEQ\n", __func__);
                                 data->error = -EILSEQ;
+                        }
                 } else if (stat & STATUS_TIME_OUT_READ) {
+                        dev_err(mmc_dev(host->mmc),
+                                "%s: read -ETIMEDOUT\n", __func__);
                         data->error = -ETIMEDOUT;
                 } else {
+                        dev_err(mmc_dev(host->mmc), "%s: -EIO\n", __func__);
                         data->error = -EIO;
                 }
         } else {
@@ -433,8 +460,6 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)
         struct scatterlist *sg;
         int stat, i;
 
-        host->datasize = 0;
-
         host->data = data;
         host->datasize = 0;
 
@@ -464,6 +489,9 @@ static void mxcmci_datawork(struct work_struct *work)
         struct mxcmci_host *host = container_of(work, struct mxcmci_host,
                                                   datawork);
         int datastat = mxcmci_transfer_data(host);
+
+        writel(STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE,
+                host->base + MMC_REG_STATUS);
         mxcmci_finish_data(host, datastat);
 
         if (host->req->stop) {
@@ -523,15 +551,35 @@ static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat)
 static irqreturn_t mxcmci_irq(int irq, void *devid)
 {
         struct mxcmci_host *host = devid;
+        unsigned long flags;
+        bool sdio_irq;
         u32 stat;
 
         stat = readl(host->base + MMC_REG_STATUS);
-        writel(stat, host->base + MMC_REG_STATUS);
+        writel(stat & ~(STATUS_SDIO_INT_ACTIVE | STATUS_DATA_TRANS_DONE |
+                        STATUS_WRITE_OP_DONE), host->base + MMC_REG_STATUS);
 
         dev_dbg(mmc_dev(host->mmc), "%s: 0x%08x\n", __func__, stat);
 
+        spin_lock_irqsave(&host->lock, flags);
+        sdio_irq = (stat & STATUS_SDIO_INT_ACTIVE) && host->use_sdio;
+        spin_unlock_irqrestore(&host->lock, flags);
+
+#ifdef HAS_DMA
+        if (mxcmci_use_dma(host) &&
+            (stat & (STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE)))
+                writel(STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE,
+                        host->base + MMC_REG_STATUS);
+#endif
+
+        if (sdio_irq) {
+                writel(STATUS_SDIO_INT_ACTIVE, host->base + MMC_REG_STATUS);
+                mmc_signal_sdio_irq(host->mmc);
+        }
+
         if (stat & STATUS_END_CMD_RESP)
                 mxcmci_cmd_done(host, stat);
+
 #ifdef HAS_DMA
         if (mxcmci_use_dma(host) &&
                   (stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE)))
@@ -668,11 +716,46 @@ static int mxcmci_get_ro(struct mmc_host *mmc)
         return -ENOSYS;
 }
 
+static void mxcmci_enable_sdio_irq(struct mmc_host *mmc, int enable)
+{
+        struct mxcmci_host *host = mmc_priv(mmc);
+        unsigned long flags;
+        u32 int_cntr;
+
+        spin_lock_irqsave(&host->lock, flags);
+        host->use_sdio = enable;
+        int_cntr = readl(host->base + MMC_REG_INT_CNTR);
+
+        if (enable)
+                int_cntr |= INT_SDIO_IRQ_EN;
+        else
+                int_cntr &= ~INT_SDIO_IRQ_EN;
+
+        writel(int_cntr, host->base + MMC_REG_INT_CNTR);
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static void mxcmci_init_card(struct mmc_host *host, struct mmc_card *card)
+{
+        /*
+         * MX3 SoCs have a silicon bug which corrupts CRC calculation of
+         * multi-block transfers when connected SDIO peripheral doesn't
+         * drive the BUSY line as required by the specs.
+         * One way to prevent this is to only allow 1-bit transfers.
+         */
+
+        if (cpu_is_mx3() && card->type == MMC_TYPE_SDIO)
+                host->caps &= ~MMC_CAP_4_BIT_DATA;
+        else
+                host->caps |= MMC_CAP_4_BIT_DATA;
+}
 
 static const struct mmc_host_ops mxcmci_ops = {
-        .request        = mxcmci_request,
-        .set_ios        = mxcmci_set_ios,
-        .get_ro         = mxcmci_get_ro,
+        .request                = mxcmci_request,
+        .set_ios                = mxcmci_set_ios,
+        .get_ro                 = mxcmci_get_ro,
+        .enable_sdio_irq        = mxcmci_enable_sdio_irq,
+        .init_card              = mxcmci_init_card,
 };
 
 static int mxcmci_probe(struct platform_device *pdev)
@@ -700,7 +783,7 @@ static int mxcmci_probe(struct platform_device *pdev)
         }
 
         mmc->ops = &mxcmci_ops;
-        mmc->caps = MMC_CAP_4_BIT_DATA;
+        mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
 
         /* MMC core transfer sizes tunable parameters */
         mmc->max_hw_segs = 64;
@@ -719,6 +802,7 @@ static int mxcmci_probe(struct platform_device *pdev)
 
         host->mmc = mmc;
         host->pdata = pdev->dev.platform_data;
+        spin_lock_init(&host->lock);
 
         if (host->pdata && host->pdata->ocr_avail)
                 mmc->ocr_avail = host->pdata->ocr_avail;
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index ead59f42e69b..544ccfd7056e 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -199,8 +199,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         writel(pdata->portsc, hcd->regs + PORTSC_OFFSET);
         mdelay(10);
 
-        /* setup USBCONTROL. */
-        ret = mxc_set_usbcontrol(pdev->id, pdata->flags);
+        /* setup specific usb hw */
+        ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
         if (ret < 0)
                 goto err_init;