Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-uniphier / clk / clk-dram-pxs2.c

diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
index 75eaab7d290c4781723778d276f83021d707b125..75d3e70d6aad5a5b6bfeac336dbd34e1b04f701f 100644 (file)
--- a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016-2017 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>
 
@@ -16,18 +14,18 @@ void uniphier_pxs2_dram_clk_init(void)
        u32 tmp;
 
        /* deassert reset */
-       tmp = readl(SC_RSTCTRL4);
+       tmp = readl(sc_base + SC_RSTCTRL4);
        tmp |= SC_RSTCTRL4_NRST_UMCSB | SC_RSTCTRL4_NRST_UMCA2 |
               SC_RSTCTRL4_NRST_UMCA1 | SC_RSTCTRL4_NRST_UMCA0 |
               SC_RSTCTRL4_NRST_UMC32 | SC_RSTCTRL4_NRST_UMC31 |
               SC_RSTCTRL4_NRST_UMC30;
-       writel(tmp, SC_RSTCTRL4);
-       readl(SC_RSTCTRL4); /* dummy read */
+       writel(tmp, sc_base + SC_RSTCTRL4);
+       readl(sc_base + SC_RSTCTRL4); /* dummy read */
 
        /* provide clocks */
-       tmp = readl(SC_CLKCTRL4);
+       tmp = readl(sc_base + SC_CLKCTRL4);
        tmp |= SC_CLKCTRL4_CEN_UMCSB | SC_CLKCTRL4_CEN_UMC2 |
               SC_CLKCTRL4_CEN_UMC1 | SC_CLKCTRL4_CEN_UMC0;
-       writel(tmp, SC_CLKCTRL4);
-       readl(SC_CLKCTRL4); /* dummy read */
+       writel(tmp, sc_base + SC_CLKCTRL4);
+       readl(sc_base + SC_CLKCTRL4); /* dummy read */
 }