← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to arch/sh/kernel/cpu/sh3/setup-sh7720.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/sh/kernel/cpu/sh3/setup-sh7720.c
19
19
#include <linux/io.h>
20
20
#include <linux/serial_sci.h>
21
21
#include <linux/sh_timer.h>
 
22
#include <linux/sh_intc.h>
22
23
#include <asm/rtc.h>
23
24
#include <cpu/serial.h>
24
25
 
30
31
        },
31
32
        [1] = {
32
33
                /* Shared Period/Carry/Alarm IRQ */
33
 
                .start  = 20,
 
34
                .start  = evt2irq(0x480),
34
35
                .flags  = IORESOURCE_IRQ,
35
36
        },
36
37
};
55
56
        .scscr          = SCSCR_RE | SCSCR_TE,
56
57
        .scbrr_algo_id  = SCBRR_ALGO_4,
57
58
        .type           = PORT_SCIF,
58
 
        .irqs           = { 80, 80, 80, 80 },
 
59
        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc00)),
59
60
        .ops            = &sh7720_sci_port_ops,
60
61
        .regtype        = SCIx_SH7705_SCIF_REGTYPE,
61
62
};
74
75
        .scscr          = SCSCR_RE | SCSCR_TE,
75
76
        .scbrr_algo_id  = SCBRR_ALGO_4,
76
77
        .type           = PORT_SCIF,
77
 
        .irqs           = { 81, 81, 81, 81 },
 
78
        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc20)),
78
79
        .ops            = &sh7720_sci_port_ops,
79
80
        .regtype        = SCIx_SH7705_SCIF_REGTYPE,
80
81
};
94
95
                .flags  = IORESOURCE_MEM,
95
96
        },
96
97
        [1] = {
97
 
                .start  = 67,
98
 
                .end    = 67,
 
98
                .start  = evt2irq(0xa60),
 
99
                .end    = evt2irq(0xa60),
99
100
                .flags  = IORESOURCE_IRQ,
100
101
        },
101
102
};
102
103
 
103
104
static u64 usb_ohci_dma_mask = 0xffffffffUL;
 
105
 
104
106
static struct platform_device usb_ohci_device = {
105
107
        .name           = "sh_ohci",
106
108
        .id             = -1,
121
123
        },
122
124
        [1] = {
123
125
                .name   = "sh_udc",
124
 
                .start  = 65,
125
 
                .end    = 65,
 
126
                .start  = evt2irq(0xa20),
 
127
                .end    = evt2irq(0xa20),
126
128
                .flags  = IORESOURCE_IRQ,
127
129
        },
128
130
};
152
154
                .flags  = IORESOURCE_MEM,
153
155
        },
154
156
        [1] = {
155
 
                .start  = 104,
 
157
                .start  = evt2irq(0xf00),
156
158
                .flags  = IORESOURCE_IRQ,
157
159
        },
158
160
};
179
181
                .flags  = IORESOURCE_MEM,
180
182
        },
181
183
        [1] = {
182
 
                .start  = 104,
 
184
                .start  = evt2irq(0xf00),
183
185
                .flags  = IORESOURCE_IRQ,
184
186
        },
185
187
};
206
208
                .flags  = IORESOURCE_MEM,
207
209
        },
208
210
        [1] = {
209
 
                .start  = 104,
 
211
                .start  = evt2irq(0xf00),
210
212
                .flags  = IORESOURCE_IRQ,
211
213
        },
212
214
};
233
235
                .flags  = IORESOURCE_MEM,
234
236
        },
235
237
        [1] = {
236
 
                .start  = 104,
 
238
                .start  = evt2irq(0xf00),
237
239
                .flags  = IORESOURCE_IRQ,
238
240
        },
239
241
};
260
262
                .flags  = IORESOURCE_MEM,
261
263
        },
262
264
        [1] = {
263
 
                .start  = 104,
 
265
                .start  = evt2irq(0xf00),
264
266
                .flags  = IORESOURCE_IRQ,
265
267
        },
266
268
};
288
290
                .flags  = IORESOURCE_MEM,
289
291
        },
290
292
        [1] = {
291
 
                .start  = 16,
 
293
                .start  = evt2irq(0x400),
292
294
                .flags  = IORESOURCE_IRQ,
293
295
        },
294
296
};
316
318
                .flags  = IORESOURCE_MEM,
317
319
        },
318
320
        [1] = {
319
 
                .start  = 17,
 
321
                .start  = evt2irq(0x420),
320
322
                .flags  = IORESOURCE_IRQ,
321
323
        },
322
324
};
343
345
                .flags  = IORESOURCE_MEM,
344
346
        },
345
347
        [1] = {
346
 
                .start  = 18,
 
348
                .start  = evt2irq(0x440),
347
349
                .flags  = IORESOURCE_IRQ,
348
350
        },
349
351
};