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-ld4.c

diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
index 407daf06642562945eccaf570129f7e52b92b809..3b721eaf2340b69c22f8a8ba389da06eda1fa2c6 100644 (file)
--- a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011-2014 Panasonic Corporation
  * Copyright (C) 2015-2017 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>
 
@@ -17,14 +15,14 @@ void uniphier_ld4_dram_clk_init(void)
        u32 tmp;
 
        /* deassert reset */
-       tmp = readl(SC_RSTCTRL);
+       tmp = readl(sc_base + SC_RSTCTRL);
        tmp |= SC_RSTCTRL_NRST_UMC1 | SC_RSTCTRL_NRST_UMC0;
-       writel(tmp, SC_RSTCTRL);
-       readl(SC_RSTCTRL); /* dummy read */
+       writel(tmp, sc_base + SC_RSTCTRL);
+       readl(sc_base + SC_RSTCTRL); /* dummy read */
 
        /* provide clocks */
-       tmp = readl(SC_CLKCTRL);
+       tmp = readl(sc_base + SC_CLKCTRL);
        tmp |= SC_CLKCTRL_CEN_UMC;
-       writel(tmp, SC_CLKCTRL);
-       readl(SC_CLKCTRL); /* dummy read */
+       writel(tmp, sc_base + SC_CLKCTRL);
+       readl(sc_base + SC_CLKCTRL); /* dummy read */
 }