Commit 04a0137f authored by Andrew Davis's avatar Andrew Davis Committed by Nishanth Menon
Browse files

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: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230726160441.101566-1-afd@ti.com


Signed-off-by: default avatarNishanth Menon <nm@ti.com>
parent 630c191b

arch/arm/mach-keystone/keystone.c

+10 −2
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-keystone/memory.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* 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 */