diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:08:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:08:44 -0400 |
| commit | 79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce (patch) | |
| tree | 20571bc51871460b41b53c906881541e4ee2ce5c /arch/arm/mach-uniphier/clk/clk-ld4.c | |
| parent | 5acce685c9227b3d4b48f6fab6a33f6d74ca9c14 (diff) | |
| parent | 2ce6b82d340cf1b1e5a43f1b5c8965d0067d5246 (diff) | |
Merge tag 'uniphier-v2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2019.10
- import DT updates from Linux
- add UniPhier SPI controller driver
- make U-Boot image for 64bit SoCs position independent
- tidy up various init code for next generation SoCs
- misc cleanups
Diffstat (limited to 'arch/arm/mach-uniphier/clk/clk-ld4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/clk/clk-ld4.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/clk/clk-ld4.c b/arch/arm/mach-uniphier/clk/clk-ld4.c index 9c88cde5e2..0393942503 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-ld4.c @@ -15,18 +15,18 @@ void uniphier_ld4_clk_init(void) u32 tmp; /* deassert reset */ - tmp = readl(SC_RSTCTRL); + tmp = readl(sc_base + SC_RSTCTRL); #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif - 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); #ifdef CONFIG_NAND_DENALI tmp |= SC_CLKCTRL_CEN_NAND; #endif - writel(tmp, SC_CLKCTRL); - readl(SC_CLKCTRL); /* dummy read */ + writel(tmp, sc_base + SC_CLKCTRL); + readl(sc_base + SC_CLKCTRL); /* dummy read */ } |