Commit 54b693d4 authored by Tony Lindgren's avatar Tony Lindgren

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: default avatarTony Lindgren <tony@atomide.com>
parent 4c98dc6b
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/flash.h> #include <mach/flash.h>
#include <../plat-omap/fpga.h> #include <../plat-omap/fpga.h>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <mach/mux.h> #include <mach/mux.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
#include <mach/flash.h> #include <mach/flash.h>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <mach/flash.h> #include <mach/flash.h>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/flash.h> #include <mach/flash.h>
#include <../plat-omap/fpga.h> #include <../plat-omap/fpga.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include <mach/flash.h> #include <mach/flash.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/usb.h> #include <mach/usb.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <mach/flash.h> #include <mach/flash.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <mach/flash.h> #include <mach/flash.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <mach/flash.h> #include <mach/flash.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <../plat-omap/fpga.h> #include <../plat-omap/fpga.h>
#include <mach/flash.h> #include <mach/flash.h>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <mach/mux.h> #include <mach/mux.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/board-sx1.h> #include <mach/board-sx1.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <mach/board-voiceblue.h> #include <mach/board-voiceblue.h>
#include <mach/flash.h> #include <mach/flash.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/usb.h> #include <mach/usb.h>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/omap7xx.h> #include <mach/omap7xx.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/irqs.h> #include <mach/irqs.h>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/flash.h> #include <mach/flash.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -51,7 +51,7 @@ extern void omap_writeb(u8 v, u32 pa); ...@@ -51,7 +51,7 @@ extern void omap_writeb(u8 v, u32 pa);
extern void omap_writew(u16 v, u32 pa); extern void omap_writew(u16 v, u32 pa);
extern void omap_writel(u32 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 /* Almost all documentation for chip and board memory maps assumes
* BM is clear. Most devel boards have a switch to control booting * BM is clear. Most devel boards have a switch to control booting
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include "iomap.h" #include "iomap.h"
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/sram.h> #include <plat/sram.h>
#include <plat/tc.h> #include <mach/tc.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <plat/dmtimer.h> #include <plat/dmtimer.h>
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "gpmc.h" #include "gpmc.h"
#include <linux/platform_data/mtd-nand-omap2.h> #include <linux/platform_data/mtd-nand-omap2.h>
#include <linux/platform_data/mtd-onenand-omap2.h> #include <linux/platform_data/mtd-onenand-omap2.h>
#include <plat/tc.h>
#include "common.h" #include "common.h"
#include "board-flash.h" #include "board-flash.h"
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat-omap/dma-omap.h> #include <plat-omap/dma-omap.h>
#include <plat/tc.h>
/* /*
* MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA * 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) ...@@ -175,6 +174,7 @@ static inline void set_gdma_dev(int req, int dev)
#define omap_writel(val, reg) do {} while (0) #define omap_writel(val, reg) do {} while (0)
#endif #endif
#ifdef CONFIG_ARCH_OMAP1
void omap_set_dma_priority(int lch, int dst_port, int priority) void omap_set_dma_priority(int lch, int dst_port, int priority)
{ {
unsigned long reg; unsigned long reg;
...@@ -203,8 +203,12 @@ void omap_set_dma_priority(int lch, int dst_port, int priority) ...@@ -203,8 +203,12 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)
l |= (priority & 0xf) << 8; l |= (priority & 0xf) << 8;
omap_writel(l, reg); omap_writel(l, reg);
} }
}
#endif
if (cpu_class_is_omap2()) { #ifdef CONFIG_ARCH_OMAP2PLUS
void omap_set_dma_priority(int lch, int dst_port, int priority)
{
u32 ccr; u32 ccr;
ccr = p->dma_read(CCR, lch); ccr = p->dma_read(CCR, lch);
...@@ -213,8 +217,8 @@ void omap_set_dma_priority(int lch, int dst_port, int priority) ...@@ -213,8 +217,8 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)
else else
ccr &= ~(1 << 6); ccr &= ~(1 << 6);
p->dma_write(ccr, CCR, lch); p->dma_write(ccr, CCR, lch);
}
} }
#endif
EXPORT_SYMBOL(omap_set_dma_priority); EXPORT_SYMBOL(omap_set_dma_priority);
void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/mux.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 /* NOTE: don't expect this to support many I/O cards. The 16xx chips have
......
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