ARM: keystone: Merge memory.h into the only file that uses it

The defines in memory.h can go into the file that makes use of them.
No reason to have a header here, remove.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230726160441.101566-1-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index e0ca26182e0bdc7bc8742e3ffa36c83cfae9e840..e8a06bd69bf2291e2c69c5245505dc16630ff00d 100644 (file)
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -18,10 +18,18 @@
 #include <asm/mach/time.h>
 #include <asm/page.h>
 
-#include "memory.h"
-
 #include "keystone.h"
 
+#define KEYSTONE_LOW_PHYS_START                0x80000000ULL
+#define KEYSTONE_LOW_PHYS_SIZE         0x80000000ULL /* 2G */
+#define KEYSTONE_LOW_PHYS_END          (KEYSTONE_LOW_PHYS_START + \
+                                        KEYSTONE_LOW_PHYS_SIZE - 1)
+
+#define KEYSTONE_HIGH_PHYS_START       0x800000000ULL
+#define KEYSTONE_HIGH_PHYS_SIZE                0x400000000ULL  /* 16G */
+#define KEYSTONE_HIGH_PHYS_END         (KEYSTONE_HIGH_PHYS_START + \
+                                        KEYSTONE_HIGH_PHYS_SIZE - 1)
+
 #ifdef CONFIG_ARM_LPAE
 static int keystone_platform_notifier(struct notifier_block *nb,
                                      unsigned long event, void *data)

diff --git a/arch/arm/mach-keystone/memory.h b/arch/arm/mach-keystone/memory.h
deleted file mode 100644 (file)
index 1b9ed12..0000000
--- a/arch/arm/mach-keystone/memory.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright 2014 Texas Instruments, Inc.
- *     Santosh Shilimkar <santosh.shilimkar@ti.com>
- */
-#ifndef __MEMORY_H
-#define __MEMORY_H
-
-#define KEYSTONE_LOW_PHYS_START                0x80000000ULL
-#define KEYSTONE_LOW_PHYS_SIZE         0x80000000ULL /* 2G */
-#define KEYSTONE_LOW_PHYS_END          (KEYSTONE_LOW_PHYS_START + \
-                                        KEYSTONE_LOW_PHYS_SIZE - 1)
-
-#define KEYSTONE_HIGH_PHYS_START       0x800000000ULL
-#define KEYSTONE_HIGH_PHYS_SIZE                0x400000000ULL  /* 16G */
-#define KEYSTONE_HIGH_PHYS_END         (KEYSTONE_HIGH_PHYS_START + \
-                                        KEYSTONE_HIGH_PHYS_SIZE - 1)
-#endif /* __MEMORY_H */