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-ld20.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-ld20.c')
-rw-r--r-- | arch/arm/mach-uniphier/clk/clk-ld20.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/clk/clk-ld20.c b/arch/arm/mach-uniphier/clk/clk-ld20.c index 02a14ddfb8..397b2d7384 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld20.c +++ b/arch/arm/mach-uniphier/clk/clk-ld20.c @@ -15,13 +15,13 @@ void uniphier_ld20_clk_init(void) { u32 tmp; - tmp = readl(SC_RSTCTRL6); + tmp = readl(sc_base + SC_RSTCTRL6); tmp |= BIT(8); /* Mali */ - writel(tmp, SC_RSTCTRL6); + writel(tmp, sc_base + SC_RSTCTRL6); - tmp = readl(SC_CLKCTRL6); + tmp = readl(sc_base + SC_CLKCTRL6); tmp |= BIT(8); /* Mali */ - writel(tmp, SC_CLKCTRL6); + writel(tmp, sc_base + SC_CLKCTRL6); /* TODO: use "mmc-pwrseq-emmc" */ writel(1, SDCTRL_EMMC_HW_RESET); |