diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
| commit | 7f54cddfc767c29bc030a9f512c1d5e8e33f337d (patch) | |
| tree | e69a57ebce834150e4d28b230eea93ecbb6895de /drivers/clk/samsung/clk-exynos5250.c | |
| parent | 93d431e2909e0ec03127b861f4865cde89d84520 (diff) | |
| parent | 494db70db363f41da78ee5f07096cf04068d7a3e (diff) | |
Merge branch 'linux-linaro-lng-v3.18' into linux-linaro-lng-v3.18-rtlinux-lng-preempt-rt-3.18.11-2015.05linux-lng-preempt-rt-3.18.11-2015.04
Conflicts:
include/linux/interrupt.h
kernel/irq/manage.c
Diffstat (limited to 'drivers/clk/samsung/clk-exynos5250.c')
| -rw-r--r-- | drivers/clk/samsung/clk-exynos5250.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c index 70ec3d2608a1..e76f7772fd54 100644 --- a/drivers/clk/samsung/clk-exynos5250.c +++ b/drivers/clk/samsung/clk-exynos5250.c @@ -806,7 +806,7 @@ static void __init exynos5250_clk_init(struct device_node *np) PWR_CTRL1_DIV2_DOWN_EN | PWR_CTRL1_DIV1_DOWN_EN | PWR_CTRL1_USE_CORE1_WFE | PWR_CTRL1_USE_CORE0_WFE | PWR_CTRL1_USE_CORE1_WFI | PWR_CTRL1_USE_CORE0_WFI); - __raw_writel(tmp, reg_base + PWR_CTRL1); + writel_relaxed(tmp, reg_base + PWR_CTRL1); /* * Enable arm clock up (on exiting idle). Set arm divider @@ -816,7 +816,7 @@ static void __init exynos5250_clk_init(struct device_node *np) tmp = (PWR_CTRL2_DIV2_UP_EN | PWR_CTRL2_DIV1_UP_EN | PWR_CTRL2_DUR_STANDBY2_VAL | PWR_CTRL2_DUR_STANDBY1_VAL | PWR_CTRL2_CORE2_UP_RATIO | PWR_CTRL2_CORE1_UP_RATIO); - __raw_writel(tmp, reg_base + PWR_CTRL2); + writel_relaxed(tmp, reg_base + PWR_CTRL2); exynos5250_clk_sleep_init(); |