From: Andrew Davis <afd@ti.com>
To: Nishanth Menon <nm@ti.com>, Vignesh Raghavendra <vigneshr@ti.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Andrew Davis <afd@ti.com>
Subject: [PATCH 1/5] ARM: keystone: Merge memory.h into the only file that uses it
Date: Mon, 15 May 2023 13:35:11 -0500 [thread overview]
Message-ID: <20230515183515.509371-1-afd@ti.com> (raw)
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
next reply other threads:[~2023-05-15 18:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 18:35 Andrew Davis [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230515183515.509371-1-afd@ti.com \
--to=afd@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nm@ti.com \
--cc=robh+dt@kernel.org \
--cc=ssantosh@kernel.org \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).