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/debug-uart/debug-uart-pxs2.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/debug-uart/debug-uart-pxs2.c')
| -rw-r--r-- | arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c index 5d50c4fa24..ee8caad1d4 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c @@ -23,9 +23,9 @@ unsigned int uniphier_pxs2_debug_uart_init(void) sg_set_pinsel(113, 8, 8, 4); /* TXD2 -> TXD2 */ sg_set_pinsel(219, 8, 8, 4); /* TXD3 -> TXD3 */ - tmp = readl(SC_CLKCTRL); + tmp = readl(sc_base + SC_CLKCTRL); tmp |= SC_CLKCTRL_CEN_PERI; - writel(tmp, SC_CLKCTRL); + writel(tmp, sc_base + SC_CLKCTRL); return DIV_ROUND_CLOSEST(UNIPHIER_PXS2_UART_CLK, 16 * CONFIG_BAUDRATE); } |