arm: actions: rename sysmap-s900 to sysmap-owl

Now that memory maps(for both S700 and S900 SoCs) can be managed using
a common file, rename sysmap-s900 to sysmap-owl to reflect the same.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>

diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile
index 0b181c62d6c8b640b3bac4e5de84ff06f8c54b0e..f3a69ebf15cd09437917f2af8453f5f3ea05aedc 100644 (file)
--- a/arch/arm/mach-owl/Makefile
+++ b/arch/arm/mach-owl/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 
 obj-y += soc.o
-obj-y += sysmap-s900.o
+obj-$(CONFIG_ARM64) += sysmap-owl.o

diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-owl.c
similarity index 83%
rename from arch/arm/mach-owl/sysmap-s900.c
rename to arch/arm/mach-owl/sysmap-owl.c
index f78b639740eaf477da66580f3cd2999bb2865316..81f6ca2e49195841c65135de178464c5955eb86c 100644 (file)
--- a/arch/arm/mach-owl/sysmap-s900.c
+++ b/arch/arm/mach-owl/sysmap-owl.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Actions Semi S900 Memory map
+ * Memory map for Actions Semi Owl series SoCs.
  *
  * Copyright (C) 2015 Actions Semi Co., Ltd.
  * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
@@ -9,7 +9,7 @@
 #include <common.h>
 #include <asm/armv8/mmu.h>
 
-static struct mm_region s900_mem_map[] = {
+static struct mm_region owl_mem_map[] = {
        {
                .virt = 0x0UL, /* DDR */
                .phys = 0x0UL, /* DDR */
@@ -29,4 +29,4 @@ static struct mm_region s900_mem_map[] = {
        }
 };
 
-struct mm_region *mem_map = s900_mem_map;
+struct mm_region *mem_map = owl_mem_map;