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

Commit f8de9b2c authored by Paul Walmsley's avatar Paul Walmsley Committed by Russell King
Browse files

[ARM] OMAP2 SDRC: move mach-omap2/memory.h into mach/sdrc.h 



Move the contents of the arch/arm/mach-omap2/memory.h file to the
existing mach/sdrc.h file, and remove memory.h.  Modify files which
include memory.h to include asm/arch/sdrc.h instead.

linux-omap source commit is e7ae2d89921372fc4b9712a32cc401d645597807.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fed415e4

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <mach/cpu.h>

#include <asm/div64.h>



#include "memory.h"

#include <mach/sdrc.h>

#include "sdrc.h"

#include "clock.h"

#include "prm.h"

arch/arm/mach-omap2/clock24xx.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <asm/div64.h>

#include <asm/clkdev.h>



#include "memory.h"

#include <mach/sdrc.h>

#include "clock.h"

#include "prm.h"

#include "prm-regbits-24xx.h"

arch/arm/mach-omap2/clock34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <asm/div64.h>

#include <asm/clkdev.h>



#include "memory.h"

#include <mach/sdrc.h>

#include "clock.h"

#include "prm.h"

#include "prm-regbits-34xx.h"

arch/arm/mach-omap2/io.c

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <mach/mux.h>

#include <mach/omapfb.h>

#include <mach/sram.h>



#include "memory.h"

#include <mach/sdrc.h>

#include <mach/gpmc.h>



#include "clock.h"

arch/arm/mach-omap2/memory.c

+8 −1
Original line number Diff line number Diff line
@@ -29,9 +29,16 @@ 


#include "prm.h"



#include "memory.h"

#include <mach/sdrc.h>

#include "sdrc.h"



/* Memory timing, DLL mode flags */

#define M_DDR		1

#define M_LOCK_CTRL	(1 << 2)

#define M_UNLOCK	0

#define M_LOCK		1





void __iomem *omap2_sdrc_base;

void __iomem *omap2_sms_base;