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

Commit 0020afb3 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-davinci: remove mach/memory.h 



Move some DDR2 related defines into a private <mach/ddr2.h> beforehand.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent f4220feb

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -904,6 +904,7 @@ config ARCH_DAVINCI 
	select GENERIC_ALLOCATOR

	select GENERIC_IRQ_CHIP

	select ARCH_HAS_HOLES_MEMORYMODEL

	select NO_MACH_MEMORY_H

	help

	  Support for TI's DaVinci platform.

arch/arm/mach-davinci/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <asm/proc-fns.h>



#include <mach/cpuidle.h>

#include <mach/memory.h>

#include <mach/ddr2.h>



#define DAVINCI_CPUIDLE_MAX_STATES	2

arch/arm/mach-davinci/include/mach/ddr2.h

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#define DDR2_SDRCR_OFFSET	0xc

#define DDR2_SRPD_BIT		(1 << 23)

#define DDR2_MCLKSTOPEN_BIT	(1 << 30)

#define DDR2_LPMODEN_BIT	(1 << 31)

arch/arm/mach-davinci/include/mach/memory.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * DaVinci memory space definitions

 *

 * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>

 *

 * 2007 (c) MontaVista Software, Inc. This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 */

#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



/**************************************************************************

 * Included Files

 **************************************************************************/

#include <asm/page.h>

#include <asm/sizes.h>



/**************************************************************************

 * Definitions

 **************************************************************************/

#define DAVINCI_DDR_BASE	0x80000000

#define DA8XX_DDR_BASE		0xc0000000



#if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)

#error Cannot enable DaVinci and DA8XX platforms concurrently

#elif defined(CONFIG_ARCH_DAVINCI_DA8XX)

#define PLAT_PHYS_OFFSET DA8XX_DDR_BASE

#else

#define PLAT_PHYS_OFFSET DAVINCI_DDR_BASE

#endif



#define DDR2_SDRCR_OFFSET	0xc

#define DDR2_SRPD_BIT		BIT(23)

#define DDR2_MCLKSTOPEN_BIT	BIT(30)

#define DDR2_LPMODEN_BIT	BIT(31)



#endif /* __ASM_ARCH_MEMORY_H */

arch/arm/mach-davinci/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>

#include <mach/psc.h>

#include <mach/memory.h>

#include <mach/ddr2.h>



#include "clock.h"