Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[platform/kernel/linux-rpi.git] / drivers / mfd / intel-lpss.c

diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index c75734b..fc6aa4c 100644 (file)
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -29,6 +29,8 @@
 #include <linux/seq_file.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 
+#include <linux/dma/idma64.h>
+
 #include "intel-lpss.h"
 
 #define LPSS_DEV_OFFSET                0x000
@@ -97,8 +99,6 @@ static const struct resource intel_lpss_idma64_resources[] = {
        DEFINE_RES_IRQ(0),
 };
 
-#define LPSS_IDMA64_DRIVER_NAME                "idma64"
-
 /*
  * Cells needs to be ordered so that the iDMA is created first. This is
  * because we need to be sure the DMA is available when the host controller
@@ -274,6 +274,9 @@ static void intel_lpss_init_dev(const struct intel_lpss *lpss)
 {
        u32 value = LPSS_PRIV_SSP_REG_DIS_DMA_FIN;
 
+       /* Set the device in reset state */
+       writel(0, lpss->priv + LPSS_PRIV_RESETS);
+
        intel_lpss_deassert_reset(lpss);
 
        intel_lpss_set_remap_addr(lpss);