diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-07-09 08:49:42 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-07-09 08:49:42 +0200 |
| commit | 71233371b2b23c25a40be1c6cf73c3a1de048556 (patch) | |
| tree | bdba534b6fccdefb146ec9f8317c6dc06f4d4670 /drivers/mfd | |
| parent | c2be367662f77746eeeb21bb5ea9ed275551ffd1 (diff) | |
| parent | 16af098616e73b39c4d98b0d4358cc29a9539c98 (diff) | |
Merge tag 'v4.4.139' into toradex_vf_4.4-next
This is the 4.4.139 stable release
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/intel-lpss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index fe89e5e337d5..ac867489b5a9 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -269,11 +269,11 @@ static void intel_lpss_init_dev(const struct intel_lpss *lpss) intel_lpss_deassert_reset(lpss); + intel_lpss_set_remap_addr(lpss); + if (!intel_lpss_has_idma(lpss)) return; - intel_lpss_set_remap_addr(lpss); - /* Make sure that SPI multiblock DMA transfers are re-enabled */ if (lpss->type == LPSS_DEV_SPI) writel(value, lpss->priv + LPSS_PRIV_SSP_REG); |