Commit 68cb700c authored by Tony Lindgren's avatar Tony Lindgren

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: default avatarTony Lindgren <tony@atomide.com>
parent c49f34bc
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <plat/omap7xx.h> #include <mach/omap7xx.h>
#include <plat/keypad.h> #include <plat/keypad.h>
#include <plat/mmc.h> #include <plat/mmc.h>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/mmc.h> #include <plat/mmc.h>
#include <plat/omap7xx.h>
#include <mach/omap7xx.h>
#include <mach/camera.h> #include <mach/camera.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -311,8 +311,8 @@ static inline u32 omap_cs3_phys(void) ...@@ -311,8 +311,8 @@ static inline u32 omap_cs3_phys(void)
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
#include <plat/omap7xx.h> #include "omap7xx.h"
#include <plat/omap1510.h> #include "omap1510.h"
#include <plat/omap16xx.h> #include "omap16xx.h"
#endif /* __ASM_ARCH_OMAP_HARDWARE_H */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */
/* arch/arm/plat-omap/include/mach/omap1510.h /*
*
* Hardware definitions for TI OMAP1510 processor. * Hardware definitions for TI OMAP1510 processor.
* *
* Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com> * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
......
/* arch/arm/plat-omap/include/mach/omap16xx.h /*
*
* Hardware definitions for TI OMAP1610/5912/1710 processors. * Hardware definitions for TI OMAP1610/5912/1710 processors.
* *
* Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com> * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
......
/* arch/arm/plat-omap/include/mach/omap7xx.h /*
*
* Hardware definitions for TI OMAP7XX processor. * Hardware definitions for TI OMAP7XX processor.
* *
* Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com> * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
......
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/mux.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, /* FIXME address is now a platform device resource,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment