aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-04-24 11:00:10 -0400
committerLee Jones <lee.jones@linaro.org>2018-05-29 04:11:22 -0400
commitd28b62520830b2d0bffa2d98e81afc9f5e537e8b (patch)
treed52ef7c40108217aa6be9127a32704df00d67894
parent704800dd3fe6e5bfc52773081acedc62860e508f (diff)
mfd: intel-lpss: Program REMAP register in PIO mode
According to documentation REMAP register has to be programmed in either DMA or PIO mode of the slice. Move the DMA capability check below to let REMAP register be programmed in PIO mode. Cc: stable@vger.kernel.org # 4.3+ Fixes: 4b45efe85263 ("mfd: Add support for Intel Sunrisepoint LPSS devices") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/intel-lpss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 9e545eb6e8b4..4bcf117a7ba8 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -275,11 +275,11 @@ static void intel_lpss_init_dev(const struct intel_lpss *lpss)
275 275
276 intel_lpss_deassert_reset(lpss); 276 intel_lpss_deassert_reset(lpss);
277 277
278 intel_lpss_set_remap_addr(lpss);
279
278 if (!intel_lpss_has_idma(lpss)) 280 if (!intel_lpss_has_idma(lpss))
279 return; 281 return;
280 282
281 intel_lpss_set_remap_addr(lpss);
282
283 /* Make sure that SPI multiblock DMA transfers are re-enabled */ 283 /* Make sure that SPI multiblock DMA transfers are re-enabled */
284 if (lpss->type == LPSS_DEV_SPI) 284 if (lpss->type == LPSS_DEV_SPI)
285 writel(value, lpss->priv + LPSS_PRIV_SSP_REG); 285 writel(value, lpss->priv + LPSS_PRIV_SSP_REG);