tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Tony Lindgren 54b693d4 4c98dc6b

+34 -31
+1 -1
arch/arm/mach-omap1/board-fsample.c
··· 27 27 #include <asm/mach/arch.h> 28 28 #include <asm/mach/map.h> 29 29 30 - #include <plat/tc.h> 30 + #include <mach/tc.h> 31 31 #include <mach/mux.h> 32 32 #include <mach/flash.h> 33 33 #include <../plat-omap/fpga.h>
+1 -1
arch/arm/mach-omap1/board-h2.c
··· 40 40 41 41 #include <mach/mux.h> 42 42 #include <plat-omap/dma-omap.h> 43 - #include <plat/tc.h> 43 + #include <mach/tc.h> 44 44 #include <mach/irda.h> 45 45 #include <linux/platform_data/keypad-omap.h> 46 46 #include <mach/flash.h>
+1 -1
arch/arm/mach-omap1/board-h3.c
··· 41 41 #include <asm/mach/map.h> 42 42 43 43 #include <mach/mux.h> 44 - #include <plat/tc.h> 44 + #include <mach/tc.h> 45 45 #include <linux/platform_data/keypad-omap.h> 46 46 #include <plat-omap/dma-omap.h> 47 47 #include <mach/flash.h>
+1 -1
arch/arm/mach-omap1/board-innovator.c
··· 34 34 #include <mach/mux.h> 35 35 #include <mach/flash.h> 36 36 #include <../plat-omap/fpga.h> 37 - #include <plat/tc.h> 37 + #include <mach/tc.h> 38 38 #include <linux/platform_data/keypad-omap.h> 39 39 40 40 #include <mach/hardware.h>
+1 -1
arch/arm/mach-omap1/board-osk.c
··· 48 48 49 49 #include <mach/flash.h> 50 50 #include <mach/mux.h> 51 - #include <plat/tc.h> 51 + #include <mach/tc.h> 52 52 53 53 #include <mach/hardware.h> 54 54 #include <mach/usb.h>
+1 -1
arch/arm/mach-omap1/board-palmte.c
··· 36 36 37 37 #include <mach/flash.h> 38 38 #include <mach/mux.h> 39 - #include <plat/tc.h> 39 + #include <mach/tc.h> 40 40 #include <plat-omap/dma-omap.h> 41 41 #include <mach/irda.h> 42 42 #include <linux/platform_data/keypad-omap.h>
+1 -1
arch/arm/mach-omap1/board-palmtt.c
··· 37 37 #include <mach/flash.h> 38 38 #include <mach/mux.h> 39 39 #include <plat-omap/dma-omap.h> 40 - #include <plat/tc.h> 40 + #include <mach/tc.h> 41 41 #include <mach/irda.h> 42 42 #include <linux/platform_data/keypad-omap.h> 43 43
+1 -1
arch/arm/mach-omap1/board-palmz71.c
··· 39 39 #include <mach/flash.h> 40 40 #include <mach/mux.h> 41 41 #include <plat-omap/dma-omap.h> 42 - #include <plat/tc.h> 42 + #include <mach/tc.h> 43 43 #include <mach/irda.h> 44 44 #include <linux/platform_data/keypad-omap.h> 45 45
+1 -1
arch/arm/mach-omap1/board-perseus2.c
··· 28 28 #include <asm/mach/arch.h> 29 29 #include <asm/mach/map.h> 30 30 31 - #include <plat/tc.h> 31 + #include <mach/tc.h> 32 32 #include <mach/mux.h> 33 33 #include <../plat-omap/fpga.h> 34 34 #include <mach/flash.h>
+1 -1
arch/arm/mach-omap1/board-sx1.c
··· 38 38 #include <mach/mux.h> 39 39 #include <plat-omap/dma-omap.h> 40 40 #include <mach/irda.h> 41 - #include <plat/tc.h> 41 + #include <mach/tc.h> 42 42 #include <mach/board-sx1.h> 43 43 44 44 #include <mach/hardware.h>
+1 -1
arch/arm/mach-omap1/board-voiceblue.c
··· 34 34 #include <mach/board-voiceblue.h> 35 35 #include <mach/flash.h> 36 36 #include <mach/mux.h> 37 - #include <plat/tc.h> 37 + #include <mach/tc.h> 38 38 39 39 #include <mach/hardware.h> 40 40 #include <mach/usb.h>
+1 -1
arch/arm/mach-omap1/devices.c
··· 19 19 20 20 #include <asm/mach/map.h> 21 21 22 - #include <plat/tc.h> 22 + #include <mach/tc.h> 23 23 #include <mach/mux.h> 24 24 25 25 #include <mach/omap7xx.h>
+1 -1
arch/arm/mach-omap1/dma.c
··· 26 26 #include <linux/io.h> 27 27 28 28 #include <plat-omap/dma-omap.h> 29 - #include <plat/tc.h> 29 + #include <mach/tc.h> 30 30 31 31 #include <mach/irqs.h> 32 32
+1 -1
arch/arm/mach-omap1/flash.c
··· 10 10 #include <linux/mtd/mtd.h> 11 11 #include <linux/mtd/map.h> 12 12 13 - #include <plat/tc.h> 13 + #include <mach/tc.h> 14 14 #include <mach/flash.h> 15 15 16 16 #include <mach/hardware.h>
+1 -1
arch/arm/mach-omap1/include/mach/hardware.h
··· 51 51 extern void omap_writew(u16 v, u32 pa); 52 52 extern void omap_writel(u32 v, u32 pa); 53 53 54 - #include <plat/tc.h> 54 + #include <mach/tc.h> 55 55 56 56 /* Almost all documentation for chip and board memory maps assumes 57 57 * BM is clear. Most devel boards have a switch to control booting
+1 -1
arch/arm/mach-omap1/io.c
··· 17 17 #include <asm/mach/map.h> 18 18 19 19 #include <mach/mux.h> 20 - #include <plat/tc.h> 20 + #include <mach/tc.h> 21 21 #include <plat-omap/dma-omap.h> 22 22 23 23 #include "iomap.h"
+1 -1
arch/arm/mach-omap1/pm.c
··· 52 52 #include <plat/cpu.h> 53 53 #include <plat/clock.h> 54 54 #include <plat/sram.h> 55 - #include <plat/tc.h> 55 + #include <mach/tc.h> 56 56 #include <mach/mux.h> 57 57 #include <plat-omap/dma-omap.h> 58 58 #include <plat/dmtimer.h>
-1
arch/arm/mach-omap2/board-flash.c
··· 21 21 #include "gpmc.h" 22 22 #include <linux/platform_data/mtd-nand-omap2.h> 23 23 #include <linux/platform_data/mtd-onenand-omap2.h> 24 - #include <plat/tc.h> 25 24 26 25 #include "common.h" 27 26 #include "board-flash.h"
+16 -12
arch/arm/plat-omap/dma.c
··· 38 38 39 39 #include <plat/cpu.h> 40 40 #include <plat-omap/dma-omap.h> 41 - #include <plat/tc.h> 42 41 43 42 /* 44 43 * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA ··· 174 175 #define omap_writel(val, reg) do {} while (0) 175 176 #endif 176 177 178 + #ifdef CONFIG_ARCH_OMAP1 177 179 void omap_set_dma_priority(int lch, int dst_port, int priority) 178 180 { 179 181 unsigned long reg; ··· 203 203 l |= (priority & 0xf) << 8; 204 204 omap_writel(l, reg); 205 205 } 206 - 207 - if (cpu_class_is_omap2()) { 208 - u32 ccr; 209 - 210 - ccr = p->dma_read(CCR, lch); 211 - if (priority) 212 - ccr |= (1 << 6); 213 - else 214 - ccr &= ~(1 << 6); 215 - p->dma_write(ccr, CCR, lch); 216 - } 217 206 } 207 + #endif 208 + 209 + #ifdef CONFIG_ARCH_OMAP2PLUS 210 + void omap_set_dma_priority(int lch, int dst_port, int priority) 211 + { 212 + u32 ccr; 213 + 214 + ccr = p->dma_read(CCR, lch); 215 + if (priority) 216 + ccr |= (1 << 6); 217 + else 218 + ccr &= ~(1 << 6); 219 + p->dma_write(ccr, CCR, lch); 220 + } 221 + #endif 218 222 EXPORT_SYMBOL(omap_set_dma_priority); 219 223 220 224 void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
arch/arm/plat-omap/include/plat/tc.h arch/arm/mach-omap1/include/mach/tc.h
+1 -1
drivers/pcmcia/omap_cf.c
··· 25 25 #include <asm/sizes.h> 26 26 27 27 #include <mach/mux.h> 28 - #include <plat/tc.h> 28 + #include <mach/tc.h> 29 29 30 30 31 31 /* NOTE: don't expect this to support many I/O cards. The 16xx chips have