From a70967892111934e292485ce84f1bab38cc55380 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 8 Dec 2015 14:44:17 -0600 Subject: ARM: versatile: merge mach code into a single file With DT-only support now in place and most of the legacy code removed, the separation of core.c and versatile_dt.c makes little sense. The headers in mach include directory also have to move for multi-platform support, but with a single .c file the remaining definitions needed can also be moved into the versatile_dt.c. In the move, the system registers and IB2 registers are converted to run-time mappings and all register accesses converted to use readl/writel. Signed-off-by: Rob Herring Cc: Russell King Cc: Linus Walleij Signed-off-by: Arnd Bergmann --- arch/arm/mach-versatile/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-versatile/Makefile') diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile index ccef51284d0d..41b124b5107b 100644 --- a/arch/arm/mach-versatile/Makefile +++ b/arch/arm/mach-versatile/Makefile @@ -2,4 +2,4 @@ # Makefile for the linux kernel. # -obj-y := core.o versatile_dt.o +obj-y := versatile_dt.o -- cgit v1.2.3