diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7722.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index aec182bed8a..89f84911c35 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -7,18 +7,21 @@ | |||
7 | * License. See the file "COPYING" in the main directory of this archive | 7 | * License. See the file "COPYING" in the main directory of this archive |
8 | * for more details. | 8 | * for more details. |
9 | */ | 9 | */ |
10 | #include <linux/platform_device.h> | ||
11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <linux/mm.h> | ||
12 | #include <linux/platform_device.h> | ||
12 | #include <linux/serial.h> | 13 | #include <linux/serial.h> |
13 | #include <linux/serial_sci.h> | 14 | #include <linux/serial_sci.h> |
14 | #include <linux/mm.h> | 15 | #include <linux/sh_timer.h> |
15 | #include <linux/uio_driver.h> | 16 | #include <linux/uio_driver.h> |
16 | #include <linux/usb/m66592.h> | 17 | #include <linux/usb/m66592.h> |
17 | #include <linux/sh_timer.h> | 18 | |
18 | #include <asm/clock.h> | 19 | #include <asm/clock.h> |
20 | #include <asm/dmaengine.h> | ||
19 | #include <asm/mmzone.h> | 21 | #include <asm/mmzone.h> |
20 | #include <asm/dma-sh.h> | ||
21 | #include <asm/siu.h> | 22 | #include <asm/siu.h> |
23 | |||
24 | #include <cpu/dma-register.h> | ||
22 | #include <cpu/sh7722.h> | 25 | #include <cpu/sh7722.h> |
23 | 26 | ||
24 | static struct sh_dmae_slave_config sh7722_dmae_slaves[] = { | 27 | static struct sh_dmae_slave_config sh7722_dmae_slaves[] = { |
@@ -103,11 +106,20 @@ static struct sh_dmae_channel sh7722_dmae_channels[] = { | |||
103 | } | 106 | } |
104 | }; | 107 | }; |
105 | 108 | ||
109 | static unsigned int ts_shift[] = TS_SHIFT; | ||
110 | |||
106 | static struct sh_dmae_pdata dma_platform_data = { | 111 | static struct sh_dmae_pdata dma_platform_data = { |
107 | .slave = sh7722_dmae_slaves, | 112 | .slave = sh7722_dmae_slaves, |
108 | .slave_num = ARRAY_SIZE(sh7722_dmae_slaves), | 113 | .slave_num = ARRAY_SIZE(sh7722_dmae_slaves), |
109 | .channel = sh7722_dmae_channels, | 114 | .channel = sh7722_dmae_channels, |
110 | .channel_num = ARRAY_SIZE(sh7722_dmae_channels), | 115 | .channel_num = ARRAY_SIZE(sh7722_dmae_channels), |
116 | .ts_low_shift = CHCR_TS_LOW_SHIFT, | ||
117 | .ts_low_mask = CHCR_TS_LOW_MASK, | ||
118 | .ts_high_shift = CHCR_TS_HIGH_SHIFT, | ||
119 | .ts_high_mask = CHCR_TS_HIGH_MASK, | ||
120 | .ts_shift = ts_shift, | ||
121 | .ts_shift_num = ARRAY_SIZE(ts_shift), | ||
122 | .dmaor_init = DMAOR_INIT, | ||
111 | }; | 123 | }; |
112 | 124 | ||
113 | static struct resource sh7722_dmae_resources[] = { | 125 | static struct resource sh7722_dmae_resources[] = { |