arm: kirkwood: Move internal registers in arch_very_early_init() function

Same change as was done for mvebu in commit 5bb2c550b11e ("arm: mvebu: Move
internal registers in arch_very_early_init() function") but for kirkwood.

Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Tony Dinh <mibodhi@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index b19ed2c6b3ec4570bb0f70a7b765616f2bfcc1a2..54027ccb0e1a65cd08724965327e405c6d1442f3 100644 (file)
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -5,9 +5,11 @@ config FEROCEON_88FR131
 
 config KW88F6192
        bool
+       select ARCH_VERY_EARLY_INIT
 
 config KW88F6281
        bool
+       select ARCH_VERY_EARLY_INIT
 
 config SHEEVA_88SV131
        bool

diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 3b2eef8d54199b7b225d2527517347ffffc67126..0fb5a2326f5f3232460b362acab0e8e65301408e 100644 (file)
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -6,6 +6,7 @@
 
 obj-y  = cpu.o
 obj-y  += cache.o
+obj-y  += lowlevel.o
 obj-y  += mpp.o
 
 # cpu.o and cache.o contain CP15 instructions which cannot be run in

diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index df3e8f11782a10b3f8ddcb0965b6fc4d086ae61a..2b493b36c20d73b7c5b36fdc287a071205ed85ae 100644 (file)
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -189,9 +189,6 @@ int arch_cpu_init(void)
        struct kwcpu_registers *cpureg =
                (struct kwcpu_registers *)KW_CPU_REG_BASE;
 
-       /* Linux expects the internal registers to be at 0xf1000000 */
-       writel(KW_REGS_PHY_BASE, KW_OFFSET_REG);
-
        /* Enable and invalidate L2 cache in write through mode */
        writel(readl(&cpureg->l2_cfg) | 0x18, &cpureg->l2_cfg);
        invalidate_l2_cache();

diff --git a/arch/arm/mach-kirkwood/lowlevel.S b/arch/arm/mach-kirkwood/lowlevel.S
new file mode 100644 (file)
index 0000000..6810384
--- /dev/null
+++ b/arch/arm/mach-kirkwood/lowlevel.S
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#include <config.h>
+#include <linux/linkage.h>
+
+ENTRY(arch_very_early_init)
+       /* Move internal registers from KW_OFFSET_REG to KW_REGS_PHY_BASE */
+       ldr     r0, =KW_REGS_PHY_BASE
+       ldr     r1, =KW_OFFSET_REG
+       str     r0, [r1]
+       bx      lr
+ENDPROC(arch_very_early_init)