Skip to content

Commit 8468427

Browse files
committed
Merge tag 'samsung-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers
Samsung SoC drivers changes for v5.8 Fix and minor cleanup of Exynos5422 DMC (Dynamic Memory Controller) driver. * tag 'samsung-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: memory: samsung: exynos5422-dmc: Reduce protected code area in IRQ handler memory: samsung: exynos5422-dmc: Fix tFAW timings alignment Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 502afe7 + 108c31e commit 8468427

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/memory/samsung/exynos5422-dmc.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ static int create_timings_aligned(struct exynos5_dmc *dmc, u32 *reg_timing_row,
10911091
/* power related timings */
10921092
val = dmc->timings->tFAW / clk_period_ps;
10931093
val += dmc->timings->tFAW % clk_period_ps ? 1 : 0;
1094-
val = max(val, dmc->min_tck->tXP);
1094+
val = max(val, dmc->min_tck->tFAW);
10951095
reg = &timing_power[0];
10961096
*reg_timing_power |= TIMING_VAL2REG(reg, val);
10971097

@@ -1346,15 +1346,13 @@ static irqreturn_t dmc_irq_thread(int irq, void *priv)
13461346
struct exynos5_dmc *dmc = priv;
13471347

13481348
mutex_lock(&dmc->df->lock);
1349-
13501349
exynos5_dmc_perf_events_check(dmc);
1351-
13521350
res = update_devfreq(dmc->df);
1351+
mutex_unlock(&dmc->df->lock);
1352+
13531353
if (res)
13541354
dev_warn(dmc->dev, "devfreq failed with %d\n", res);
13551355

1356-
mutex_unlock(&dmc->df->lock);
1357-
13581356
return IRQ_HANDLED;
13591357
}
13601358

0 commit comments

Comments
 (0)