Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74d02fb9 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Move FLUSH_BASE macros to asm/arch/memory.h 



FLUSH_BASE must be visible to arch/arm/mm/init.c in order for the
memory region to be setup.  Move these definitions from
asm-arm/arch-*/hardware.h into asm-arm/arch-*/memory.h where mm
stuff can see them.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7d129637

arch/arm/mm/init.c

+4 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <asm/mach-types.h>

#include <asm/setup.h>

#include <asm/sizes.h>

#include <asm/tlb.h>



#include <asm/mach/arch.h>
@@ -455,14 +456,14 @@ static void __init devicemaps_init(struct machine_desc *mdesc) 
#ifdef FLUSH_BASE

	map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);

	map.virtual = FLUSH_BASE;

	map.length = PGDIR_SIZE;

	map.length = SZ_1M;

	map.type = MT_CACHECLEAN;

	create_mapping(&map);

#endif

#ifdef FLUSH_BASE_MINICACHE

	map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + PGDIR_SIZE);

	map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);

	map.virtual = FLUSH_BASE_MINICACHE;

	map.length = PGDIR_SIZE;

	map.length = SZ_1M;

	map.type = MT_MINICLEAN;

	create_mapping(&map);

#endif

include/asm-arm/arch-cl7500/hardware.h

+0 −4
Original line number Diff line number Diff line
@@ -53,16 +53,12 @@ 
#define SCREEN_END		0xdfc00000

#define SCREEN_BASE		0xdf800000



#define FLUSH_BASE		0xdf000000



#define VIDC_BASE		(void __iomem *)0xe0400000

#define IOMD_BASE		IOMEM(0xe0200000)

#define IOC_BASE		IOMEM(0xe0200000)

#define FLOPPYDMA_BASE		IOMEM(0xe002a000)

#define PCIO_BASE		IOMEM(0xe0010000)



#define FLUSH_BASE_PHYS		0x00000000	/* ROM */



#define vidc_writel(val)	__raw_writel(val, VIDC_BASE)



/* in/out bias for the ISA slot region */

include/asm-arm/arch-cl7500/memory.h

+6 −0
Original line number Diff line number Diff line
@@ -26,4 +26,10 @@ 
#define __virt_to_bus(x) __virt_to_phys(x)

#define __bus_to_virt(x) __phys_to_virt(x)



/*

 * Cache flushing area - ROM

 */

#define FLUSH_BASE_PHYS		0x00000000

#define FLUSH_BASE		0xdf000000



#endif

include/asm-arm/arch-ebsa110/hardware.h

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ 
/*

 * RAM definitions

 */

#define FLUSH_BASE_PHYS		0x40000000

#define FLUSH_BASE		0xdf000000



#define UNCACHEABLE_ADDR	0xff000000	/* IRQ_STAT */



#endif

include/asm-arm/arch-ebsa110/memory.h

+6 −0
Original line number Diff line number Diff line
@@ -28,4 +28,10 @@ 
#define __virt_to_bus(x)	(x)

#define __bus_to_virt(x)	(x)



/*

 * Cache flushing area - SRAM

 */

#define FLUSH_BASE_PHYS		0x40000000

#define FLUSH_BASE		0xdf000000



#endif