dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1 

We cannot keep this in plat as it causes problems
with the ARM single zImage support.

Cc: Felipe Balbi <balbi@ti.com>
Cc: linux-pcmcia@lists.infradead.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-10-02 13:39:28 -07:00
parent 4c98dc6b8e
commit 54b693d467
21 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/mux.h>
#include <mach/flash.h>
#include <../plat-omap/fpga.h>

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

@ -40,7 +40,7 @@
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
#include <mach/flash.h>

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

@ -41,7 +41,7 @@
#include <asm/mach/map.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <linux/platform_data/keypad-omap.h>
#include <plat-omap/dma-omap.h>
#include <mach/flash.h>

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

@ -34,7 +34,7 @@
#include <mach/mux.h>
#include <mach/flash.h>
#include <../plat-omap/fpga.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <linux/platform_data/keypad-omap.h>
#include <mach/hardware.h>

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

@ -48,7 +48,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/hardware.h>
#include <mach/usb.h>

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

@ -36,7 +36,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <plat-omap/dma-omap.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>

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

@ -37,7 +37,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>

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

@ -39,7 +39,7 @@
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>

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

@ -28,7 +28,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/mux.h>
#include <../plat-omap/fpga.h>
#include <mach/flash.h>

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

@ -38,7 +38,7 @@
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <mach/irda.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/board-sx1.h>
#include <mach/hardware.h>

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

@ -34,7 +34,7 @@
#include <mach/board-voiceblue.h>
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/hardware.h>
#include <mach/usb.h>

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

@ -19,7 +19,7 @@
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/mux.h>
#include <mach/omap7xx.h>

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

@ -26,7 +26,7 @@
#include <linux/io.h>
#include <plat-omap/dma-omap.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/irqs.h>

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

@ -10,7 +10,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/flash.h>
#include <mach/hardware.h>

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

@ -51,7 +51,7 @@ extern void omap_writeb(u8 v, u32 pa);
extern void omap_writew(u16 v, u32 pa);
extern void omap_writel(u32 v, u32 pa);
#include <plat/tc.h>
#include <mach/tc.h>
/* Almost all documentation for chip and board memory maps assumes
* BM is clear. Most devel boards have a switch to control booting

0
arch/arm/plat-omap/include/plat/tc.h → arch/arm/mach-omap1/include/mach/tc.h
View File

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

@ -17,7 +17,7 @@
#include <asm/mach/map.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <plat-omap/dma-omap.h>
#include "iomap.h"

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

@ -52,7 +52,7 @@
#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/tc.h>
#include <mach/tc.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <plat/dmtimer.h>

1
arch/arm/mach-omap2/board-flash.c
View File

@ -21,7 +21,6 @@
#include "gpmc.h"
#include <linux/platform_data/mtd-nand-omap2.h>
#include <linux/platform_data/mtd-onenand-omap2.h>
#include <plat/tc.h>
#include "common.h"
#include "board-flash.h"

28
arch/arm/plat-omap/dma.c
View File

@ -38,7 +38,6 @@
#include <plat/cpu.h>
#include <plat-omap/dma-omap.h>
#include <plat/tc.h>
/*
* MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA
@ -175,6 +174,7 @@ static inline void set_gdma_dev(int req, int dev)
#define omap_writel(val, reg) do {} while (0)
#endif
#ifdef CONFIG_ARCH_OMAP1
void omap_set_dma_priority(int lch, int dst_port, int priority)
{
unsigned long reg;
@ -203,18 +203,22 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)
l |= (priority & 0xf) << 8;
omap_writel(l, reg);
}
if (cpu_class_is_omap2()) {
u32 ccr;
ccr = p->dma_read(CCR, lch);
if (priority)
ccr |= (1 << 6);
else
ccr &= ~(1 << 6);
p->dma_write(ccr, CCR, lch);
}
}
#endif
#ifdef CONFIG_ARCH_OMAP2PLUS
void omap_set_dma_priority(int lch, int dst_port, int priority)
{
u32 ccr;
ccr = p->dma_read(CCR, lch);
if (priority)
ccr |= (1 << 6);
else
ccr &= ~(1 << 6);
p->dma_write(ccr, CCR, lch);
}
#endif
EXPORT_SYMBOL(omap_set_dma_priority);
void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,

2
drivers/pcmcia/omap_cf.c
View File

@ -25,7 +25,7 @@
#include <asm/sizes.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
/* NOTE: don't expect this to support many I/O cards. The 16xx chips have