mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 

There's no need to have these in plat-omap any longer. Note that these
could eventually be made local to mach-omap1 instead of being in mach.

But to do that, at least various driver access using omap7xxx.h registers
needs to be fixed first.

Cc: spi-devel-general@lists.sourceforge.net
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-08-31 17:04:35 -07:00
parent c49f34bc25
commit 68cb700c59
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/board-htcherald.c
View File

@ -41,7 +41,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <plat/omap7xx.h>
#include <mach/omap7xx.h>
#include <plat/keypad.h>
#include <plat/mmc.h>

2
arch/arm/mach-omap1/devices.c
View File

@ -23,8 +23,8 @@
#include <plat/mux.h>
#include <plat/dma.h>
#include <plat/mmc.h>
#include <plat/omap7xx.h>
#include <mach/omap7xx.h>
#include <mach/camera.h>
#include <mach/hardware.h>

6
arch/arm/mach-omap1/include/mach/hardware.h
View File

@ -311,8 +311,8 @@ static inline u32 omap_cs3_phys(void)
* ---------------------------------------------------------------------------
*/
#include <plat/omap7xx.h>
#include <plat/omap1510.h>
#include <plat/omap16xx.h>
#include "omap7xx.h"
#include "omap1510.h"
#include "omap16xx.h"
#endif /* __ASM_ARCH_OMAP_HARDWARE_H */

3
arch/arm/plat-omap/include/plat/omap1510.h → arch/arm/mach-omap1/include/mach/omap1510.h
View File

@ -1,5 +1,4 @@
/* arch/arm/plat-omap/include/mach/omap1510.h
*
/*
* Hardware definitions for TI OMAP1510 processor.
*
* Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>

3
arch/arm/plat-omap/include/plat/omap16xx.h → arch/arm/mach-omap1/include/mach/omap16xx.h
View File

@ -1,5 +1,4 @@
/* arch/arm/plat-omap/include/mach/omap16xx.h
*
/*
* Hardware definitions for TI OMAP1610/5912/1710 processors.
*
* Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>

3
arch/arm/plat-omap/include/plat/omap7xx.h → arch/arm/mach-omap1/include/mach/omap7xx.h
View File

@ -1,5 +1,4 @@
/* arch/arm/plat-omap/include/mach/omap7xx.h
*
/*
* Hardware definitions for TI OMAP7XX processor.
*
* Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>

3
drivers/spi/spi-omap-uwire.c
View File

@ -53,7 +53,8 @@
#include <asm/mach-types.h>
#include <plat/mux.h>
#include <plat/omap7xx.h> /* OMAP7XX_IO_CONF registers */
#include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */
/* FIXME address is now a platform device resource,