diff options
| author | Andrew Davis <afd@ti.com> | 2023-07-26 18:04:40 +0200 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2023-08-02 06:57:28 +0200 |
| commit | 04a0137fc36d0b544afd5afd59f8f739ca97e33e (patch) | |
| tree | d48c744f2e89bd2c856914f0d8abbfcc5b585734 /arch/arm/mach-keystone | |
| parent | ARM: keystone: Drop unused includes (diff) | |
| download | linux-04a0137fc36d0b544afd5afd59f8f739ca97e33e.tar.xz linux-04a0137fc36d0b544afd5afd59f8f739ca97e33e.zip | |
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>
Diffstat (limited to 'arch/arm/mach-keystone')
| -rw-r--r-- | arch/arm/mach-keystone/keystone.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/memory.h | 18 |
2 files changed, 10 insertions, 20 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index e0ca26182e0b..e8a06bd69bf2 100644 --- 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 index 1b9ed1271e05..000000000000 --- 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 */ |