Merge branch 'topic/sh' into for-linus

Conflicts:
	drivers/dma/sh/Kconfig
	drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --cc drivers/dma/sh/Kconfig
index e2b94d1,d0924b6..dadd9e0
--- 1/drivers/dma/sh/Kconfig
--- 2/drivers/dma/sh/Kconfig
+++ b/drivers/dma/sh/Kconfig
@@@ -23,8 -23,6 +23,12 @@@ config SUDMA
        help
          Enable support for the Renesas SUDMAC controllers.
  
 +config RCAR_HPB_DMAE
 +      tristate "Renesas R-Car HPB DMAC support"
 +      depends on SH_DMAE_BASE
 +      help
 +        Enable support for the Renesas R-Car series DMA controllers.
++
+ config SHDMA_R8A73A4
+       def_bool y
+       depends on ARCH_R8A73A4 && SH_DMAE != n

diff --cc drivers/dma/sh/Makefile
index ccf17cb,05a31d4..e856af2
--- 1/drivers/dma/sh/Makefile
--- 2/drivers/dma/sh/Makefile
+++ b/drivers/dma/sh/Makefile
@@@ -1,4 -1,8 +1,9 @@@
  obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o
  obj-$(CONFIG_SH_DMAE) += shdma.o
+ shdma-y := shdmac.o
+ ifeq ($(CONFIG_OF),y)
+ shdma-$(CONFIG_SHDMA_R8A73A4) += shdma-r8a73a4.o
+ endif
+ shdma-objs := $(shdma-y)
  obj-$(CONFIG_SUDMAC) += sudmac.o
 +obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o

diff --cc drivers/dma/sh/shdma-of.c
index 966aaab,2acf7b6..06473a0
--- 1/drivers/dma/sh/shdma-of.c
--- 2/drivers/dma/sh/shdma-of.c
+++ b/drivers/dma/sh/shdma-of.c
@@@ -42,12 -42,9 +42,9 @@@ static struct dma_chan *shdma_of_xlate(
  
  static int shdma_of_probe(struct platform_device *pdev)
  {
 -      const struct of_dev_auxdata *lookup = pdev->dev.platform_data;
 +      const struct of_dev_auxdata *lookup = dev_get_platdata(&pdev->dev);
        int ret;
  
-       if (!lookup)
-               return -EINVAL;
- 
        ret = of_dma_controller_register(pdev->dev.of_node,
                                         shdma_of_xlate, pdev);
        if (ret < 0)

diff --cc drivers/dma/sh/shdmac.c
index b388b12,33ce47e..3d0472b
--- 1/drivers/dma/sh/shdma.c
--- 2/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@@ -669,6 -693,11 +693,11 @@@ static int sh_dmae_probe(struct platfor
        struct dma_device *dma_dev;
        struct resource *chan, *dmars, *errirq_res, *chanirq_res;
  
 -              pdata = pdev->dev.platform_data;
+       if (pdev->dev.of_node)
+               pdata = of_match_device(sh_dmae_of_match, &pdev->dev)->data;
+       else
++              pdata = dev_get_platdata(&pdev->dev);
+ 
        /* get platform data */
        if (!pdata || !pdata->channel_num)
                return -ENODEV;

diff --cc drivers/dma/sh/sudmac.c
Simple merge