diff options
Diffstat (limited to 'arch/mips/jazz')
-rw-r--r-- | arch/mips/jazz/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/jazz/irq.c | 4 | ||||
-rw-r--r-- | arch/mips/jazz/jazzdma.c | 6 | ||||
-rw-r--r-- | arch/mips/jazz/setup.c | 20 |
4 files changed, 16 insertions, 16 deletions
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile index dd9d99bfcf7a..624b0ee3e5d4 100644 --- a/arch/mips/jazz/Makefile +++ b/arch/mips/jazz/Makefile | |||
@@ -2,4 +2,4 @@ | |||
2 | # Makefile for the Jazz family specific parts of the kernel | 2 | # Makefile for the Jazz family specific parts of the kernel |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := irq.o jazzdma.o reset.o setup.o | 5 | obj-y := irq.o jazzdma.o reset.o setup.o |
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index f21868b28b24..e1ea4f625f7a 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
@@ -111,7 +111,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
111 | } | 111 | } |
112 | 112 | ||
113 | static void r4030_set_mode(enum clock_event_mode mode, | 113 | static void r4030_set_mode(enum clock_event_mode mode, |
114 | struct clock_event_device *evt) | 114 | struct clock_event_device *evt) |
115 | { | 115 | { |
116 | /* Nothing to do ... */ | 116 | /* Nothing to do ... */ |
117 | } | 117 | } |
@@ -146,7 +146,7 @@ void __init plat_time_init(void) | |||
146 | 146 | ||
147 | BUG_ON(HZ != 100); | 147 | BUG_ON(HZ != 100); |
148 | 148 | ||
149 | cd->cpumask = cpumask_of(cpu); | 149 | cd->cpumask = cpumask_of(cpu); |
150 | clockevents_register_device(cd); | 150 | clockevents_register_device(cd); |
151 | action->dev_id = cd; | 151 | action->dev_id = cd; |
152 | setup_irq(JAZZ_TIMER_IRQ, action); | 152 | setup_irq(JAZZ_TIMER_IRQ, action); |
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index 2d8e447cb828..db6f5afff4ff 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c | |||
@@ -63,7 +63,7 @@ static inline void vdma_pgtbl_init(void) | |||
63 | static int __init vdma_init(void) | 63 | static int __init vdma_init(void) |
64 | { | 64 | { |
65 | /* | 65 | /* |
66 | * Allocate 32k of memory for DMA page tables. This needs to be page | 66 | * Allocate 32k of memory for DMA page tables. This needs to be page |
67 | * aligned and should be uncached to avoid cache flushing after every | 67 | * aligned and should be uncached to avoid cache flushing after every |
68 | * update. | 68 | * update. |
69 | */ | 69 | */ |
@@ -218,14 +218,14 @@ int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size) | |||
218 | printk | 218 | printk |
219 | ("vdma_map: Invalid logical address: %08lx\n", | 219 | ("vdma_map: Invalid logical address: %08lx\n", |
220 | laddr); | 220 | laddr); |
221 | return -EINVAL; /* invalid logical address */ | 221 | return -EINVAL; /* invalid logical address */ |
222 | } | 222 | } |
223 | if (paddr > 0x1fffffff) { | 223 | if (paddr > 0x1fffffff) { |
224 | if (vdma_debug) | 224 | if (vdma_debug) |
225 | printk | 225 | printk |
226 | ("vdma_map: Invalid physical address: %08lx\n", | 226 | ("vdma_map: Invalid physical address: %08lx\n", |
227 | paddr); | 227 | paddr); |
228 | return -EINVAL; /* invalid physical address */ | 228 | return -EINVAL; /* invalid physical address */ |
229 | } | 229 | } |
230 | 230 | ||
231 | pages = (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1; | 231 | pages = (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1; |
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 820e926dacbc..e4374a5651ce 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
@@ -137,9 +137,9 @@ static struct resource jazz_esp_rsrc[] = { | |||
137 | }; | 137 | }; |
138 | 138 | ||
139 | static struct platform_device jazz_esp_pdev = { | 139 | static struct platform_device jazz_esp_pdev = { |
140 | .name = "jazz_esp", | 140 | .name = "jazz_esp", |
141 | .num_resources = ARRAY_SIZE(jazz_esp_rsrc), | 141 | .num_resources = ARRAY_SIZE(jazz_esp_rsrc), |
142 | .resource = jazz_esp_rsrc | 142 | .resource = jazz_esp_rsrc |
143 | }; | 143 | }; |
144 | 144 | ||
145 | static struct resource jazz_sonic_rsrc[] = { | 145 | static struct resource jazz_sonic_rsrc[] = { |
@@ -156,9 +156,9 @@ static struct resource jazz_sonic_rsrc[] = { | |||
156 | }; | 156 | }; |
157 | 157 | ||
158 | static struct platform_device jazz_sonic_pdev = { | 158 | static struct platform_device jazz_sonic_pdev = { |
159 | .name = "jazzsonic", | 159 | .name = "jazzsonic", |
160 | .num_resources = ARRAY_SIZE(jazz_sonic_rsrc), | 160 | .num_resources = ARRAY_SIZE(jazz_sonic_rsrc), |
161 | .resource = jazz_sonic_rsrc | 161 | .resource = jazz_sonic_rsrc |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static struct resource jazz_cmos_rsrc[] = { | 164 | static struct resource jazz_cmos_rsrc[] = { |
@@ -175,13 +175,13 @@ static struct resource jazz_cmos_rsrc[] = { | |||
175 | }; | 175 | }; |
176 | 176 | ||
177 | static struct platform_device jazz_cmos_pdev = { | 177 | static struct platform_device jazz_cmos_pdev = { |
178 | .name = "rtc_cmos", | 178 | .name = "rtc_cmos", |
179 | .num_resources = ARRAY_SIZE(jazz_cmos_rsrc), | 179 | .num_resources = ARRAY_SIZE(jazz_cmos_rsrc), |
180 | .resource = jazz_cmos_rsrc | 180 | .resource = jazz_cmos_rsrc |
181 | }; | 181 | }; |
182 | 182 | ||
183 | static struct platform_device pcspeaker_pdev = { | 183 | static struct platform_device pcspeaker_pdev = { |
184 | .name = "pcspkr", | 184 | .name = "pcspkr", |
185 | .id = -1, | 185 | .id = -1, |
186 | }; | 186 | }; |
187 | 187 | ||