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

Commit a2449091 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

[ARM] MXC: do not include mach/hardware.h from mach/memory.h 



Instead of including other header files, define PHYS_OFFSET directly

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 44421e42

arch/arm/mach-mx3/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <mach/clock.h>

#include <mach/hardware.h>

#include <asm/div64.h>



#include "crm_regs.h"

arch/arm/plat-mxc/include/mach/entry-macro.S

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
 * published by the Free Software Foundation.

 */



#include <mach/hardware.h>



#define AVIC_NIMASK	0x04



	@ this macro disables fast irq (not implemented)

arch/arm/plat-mxc/include/mach/io.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ __mx3_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) 
		/* Access all peripherals below 0x80000000 as nonshared device

		 * but leave l2cc alone.

		 */

		if ((phys_addr < 0x80000000) && ((phys_addr < L2CC_BASE_ADDR) ||

			(phys_addr >= L2CC_BASE_ADDR + L2CC_SIZE)))

		if ((phys_addr < 0x80000000) && ((phys_addr < 0x30000000) ||

			(phys_addr >= 0x30000000 + SZ_1M)))

			mtype = MT_DEVICE_NONSHARED;

	}

arch/arm/plat-mxc/include/mach/memory.h

+7 −1
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ 
#ifndef __ASM_ARCH_MXC_MEMORY_H__

#define __ASM_ARCH_MXC_MEMORY_H__



#include <mach/hardware.h>

#if defined CONFIG_ARCH_MX1

#define PHYS_OFFSET		UL(0x08000000)

#elif defined CONFIG_ARCH_MX2

#define PHYS_OFFSET		UL(0xA0000000)

#elif defined CONFIG_ARCH_MX3

#define PHYS_OFFSET		UL(0x80000000)

#endif



#endif /* __ASM_ARCH_MXC_MEMORY_H__ */

arch/arm/plat-mxc/include/mach/mx1.h

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#include <mach/vmalloc.h>



#define PHYS_OFFSET	UL(0x08000000)



/*

 * Memory map

 */