devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/5] ARM: keystone: Merge memory.h into the only file that uses it
@ 2023-05-15 18:35 Andrew Davis
  2023-05-15 18:35 ` [PATCH 2/5] ARM: keystone: Merge PM function into main support file Andrew Davis
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Andrew Davis @ 2023-05-15 18:35 UTC (permalink / raw)
  To: Nishanth Menon, Vignesh Raghavendra, Santosh Shilimkar,
	Rob Herring, Krzysztof Kozlowski
  Cc: linux-arm-kernel, devicetree, linux-kernel, Andrew Davis

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 aa352c2de313..fdc7d3621bd0 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -20,10 +20,18 @@
 #include <asm/mach/time.h>
 #include <asm/memory.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 */
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-06-07 18:22 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-15 18:35 [PATCH 1/5] ARM: keystone: Merge memory.h into the only file that uses it Andrew Davis
2023-05-15 18:35 ` [PATCH 2/5] ARM: keystone: Merge PM function into main support file Andrew Davis
2023-05-16 21:33   ` kernel test robot
2023-05-15 18:35 ` [PATCH 3/5] ARM: dts: keystone: Fix EEPROM node names Andrew Davis
2023-05-15 18:35 ` [PATCH 4/5] ARM: dts: keystone: Remove ti,keystone from soc node compatible Andrew Davis
2023-05-15 18:35 ` [PATCH 5/5] ARM: dts: keystone: Do not capitalize hex digits Andrew Davis
2023-06-07 18:20 ` (subset) [PATCH 1/5] ARM: keystone: Merge memory.h into the only file that uses it Nishanth Menon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).