lkml.org 
[lkml]   [2023]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 1/2] ARM: keystone: Merge memory.h into the only file that uses it
Date
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>
---
arch/arm/mach-keystone/keystone.c | 12 ++++++++++--
arch/arm/mach-keystone/memory.h | 18 ------------------
2 files changed, 10 insertions(+), 20 deletions(-)
delete mode 100644 arch/arm/mach-keystone/memory.h

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index e0ca26182e0bd..e8a06bd69bf22 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 1b9ed1271e059..0000000000000
--- 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 */
--
2.39.2
\
 
 \ /
  Last update: 2023-07-26 18:05    [W:0.034 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site