Merge tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree updates (part 2) from Arnd Bergmann:
 "These are mostly new device tree bindings for existing drivers, as
  well as changes to the device tree source files to add support for
  those devices, and a couple of new boards, most notably Samsung's
  Exynos5 based Chromebook.

  The changes depend on earlier platform specific updates and touch the
  usual platforms: omap, exynos, tegra, mxs, mvebu and davinci."

* tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)
  ARM: exynos: dts: cros5250: add EC device
  ARM: dts: Add sbs-battery for exynos5250-snow
  ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
  ARM: dts: add mshc controller node for Exynos4x12 SoCs
  ARM: dts: Add chip-id controller node on Exynos4/5 SoC
  ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
  ARM: davinci: da850-evm: add SPI flash support
  ARM: davinci: da850: override SPI DT node device name
  ARM: davinci: da850: add SPI1 DT node
  spi/davinci: add DT binding documentation
  spi/davinci: no wildcards in DT compatible property
  ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
  ARM: dts: mvebu: introduce internal-regs node
  ARM: dts: mvebu: Convert all the mvebu files to use the range property
  ARM: dts: mvebu: move all peripherals inside soc
  ARM: dts: mvebu: fix cpus section indentation
  ARM: davinci: da850: add EHRPWM & ECAP DT node
  ARM/dts: OMAP3: fix pinctrl-single configuration
  ARM: dts: Add OMAP3430 SDP NOR flash memory binding
  ARM: dts: Add NOR flash bindings for OMAP2420 H4
  ...

1 files changed, 5 insertions, 43 deletions

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 146a53bfab71..4278a1787d08 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -552,22 +552,6 @@ static const struct mmc_host_ops mxs_mmc_ops = {
         .enable_sdio_irq = mxs_mmc_enable_sdio_irq,
 };
 
-static bool mxs_mmc_dma_filter(struct dma_chan *chan, void *param)
-{
-        struct mxs_mmc_host *host = param;
-        struct mxs_ssp *ssp = &host->ssp;
-
-        if (!mxs_dma_is_apbh(chan))
-                return false;
-
-        if (chan->chan_id != ssp->dma_channel)
-                return false;
-
-        chan->private = &ssp->dma_data;
-
-        return true;
-}
-
 static struct platform_device_id mxs_ssp_ids[] = {
         {
                 .name = "imx23-mmc",
@@ -595,20 +579,17 @@ static int mxs_mmc_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         struct mxs_mmc_host *host;
         struct mmc_host *mmc;
-        struct resource *iores, *dmares;
+        struct resource *iores;
         struct pinctrl *pinctrl;
-        int ret = 0, irq_err, irq_dma;
-        dma_cap_mask_t mask;
+        int ret = 0, irq_err;
         struct regulator *reg_vmmc;
         enum of_gpio_flags flags;
         struct mxs_ssp *ssp;
         u32 bus_width = 0;
 
         iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         irq_err = platform_get_irq(pdev, 0);
-        irq_dma = platform_get_irq(pdev, 1);
-        if (!iores || irq_err < 0 || irq_dma < 0)
+        if (!iores || irq_err < 0)
                 return -EINVAL;
 
         mmc = mmc_alloc_host(sizeof(struct mxs_mmc_host), &pdev->dev);
@@ -624,23 +605,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
                 goto out_mmc_free;
         }
 
-        if (np) {
-                ssp->devid = (enum mxs_ssp_id) of_id->data;
-                /*
-                 * TODO: This is a temporary solution and should be changed
-                 * to use generic DMA binding later when the helpers get in.
-                 */
-                ret = of_property_read_u32(np, "fsl,ssp-dma-channel",
-                                           &ssp->dma_channel);
-                if (ret) {
-                        dev_err(mmc_dev(host->mmc),
-                                "failed to get dma channel\n");
-                        goto out_mmc_free;
-                }
-        } else {
-                ssp->devid = pdev->id_entry->driver_data;
-                ssp->dma_channel = dmares->start;
-        }
+        ssp->devid = (enum mxs_ssp_id) of_id->data;
 
         host->mmc = mmc;
         host->sdio_irq_en = 0;
@@ -670,10 +635,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
 
         mxs_mmc_reset(host);
 
-        dma_cap_zero(mask);
-        dma_cap_set(DMA_SLAVE, mask);
-        ssp->dma_data.chan_irq = irq_dma;
-        ssp->dmach = dma_request_channel(mask, mxs_mmc_dma_filter, host);
+        ssp->dmach = dma_request_slave_channel(&pdev->dev, "rx-tx");
         if (!ssp->dmach) {
                 dev_err(mmc_dev(host->mmc),
                         "%s: failed to request dma\n", __func__);