Skip to content

Commit 04a0137

Browse files
glneonmenon
authored andcommitted
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>
1 parent 630c191 commit 04a0137

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

arch/arm/mach-keystone/keystone.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,18 @@
1818
#include <asm/mach/time.h>
1919
#include <asm/page.h>
2020

21-
#include "memory.h"
22-
2321
#include "keystone.h"
2422

23+
#define KEYSTONE_LOW_PHYS_START 0x80000000ULL
24+
#define KEYSTONE_LOW_PHYS_SIZE 0x80000000ULL /* 2G */
25+
#define KEYSTONE_LOW_PHYS_END (KEYSTONE_LOW_PHYS_START + \
26+
KEYSTONE_LOW_PHYS_SIZE - 1)
27+
28+
#define KEYSTONE_HIGH_PHYS_START 0x800000000ULL
29+
#define KEYSTONE_HIGH_PHYS_SIZE 0x400000000ULL /* 16G */
30+
#define KEYSTONE_HIGH_PHYS_END (KEYSTONE_HIGH_PHYS_START + \
31+
KEYSTONE_HIGH_PHYS_SIZE - 1)
32+
2533
#ifdef CONFIG_ARM_LPAE
2634
static int keystone_platform_notifier(struct notifier_block *nb,
2735
unsigned long event, void *data)

arch/arm/mach-keystone/memory.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)