git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91cap9_devices.c
diff --git
a/arch/arm/mach-at91/at91cap9_devices.c
b/arch/arm/mach-at91/at91cap9_devices.c
index
412aa49
..
9ffbf3a
100644
(file)
--- a/
arch/arm/mach-at91/at91cap9_devices.c
+++ b/
arch/arm/mach-at91/at91cap9_devices.c
@@
-72,7
+72,7
@@
void __init at91_add_device_usbh(struct at91_usbh_data *data)
return;
if (cpu_is_at91cap9_revB())
return;
if (cpu_is_at91cap9_revB())
- set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH);
+
irq_
set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH);
/* Enable VBus control for UHP ports */
for (i = 0; i < data->ports; i++) {
/* Enable VBus control for UHP ports */
for (i = 0; i < data->ports; i++) {
@@
-157,7
+157,7
@@
static struct platform_device at91_usba_udc_device = {
void __init at91_add_device_usba(struct usba_platform_data *data)
{
if (cpu_is_at91cap9_revB()) {
void __init at91_add_device_usba(struct usba_platform_data *data)
{
if (cpu_is_at91cap9_revB()) {
- set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH);
+
irq_
set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH);
at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS |
AT91_MATRIX_UDPHS_BYPASS_LOCK);
}
at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS |
AT91_MATRIX_UDPHS_BYPASS_LOCK);
}
@@
-771,9
+771,9
@@
void __init at91_add_device_pwm(u32 mask) {}
* AC97
* -------------------------------------------------------------------- */
* AC97
* -------------------------------------------------------------------- */
-#if defined(CONFIG_SND_AT
91_AC97) || defined(CONFIG_SND_AT91_AC97
_MODULE)
+#if defined(CONFIG_SND_AT
MEL_AC97C) || defined(CONFIG_SND_ATMEL_AC97C
_MODULE)
static u64 ac97_dmamask = DMA_BIT_MASK(32);
static u64 ac97_dmamask = DMA_BIT_MASK(32);
-static struct a
tmel_ac97
_data ac97_data;
+static struct a
c97c_platform
_data ac97_data;
static struct resource ac97_resources[] = {
[0] = {
static struct resource ac97_resources[] = {
[0] = {
@@
-789,7
+789,7
@@
static struct resource ac97_resources[] = {
};
static struct platform_device at91cap9_ac97_device = {
};
static struct platform_device at91cap9_ac97_device = {
- .name = "ac97c",
+ .name = "a
tmel_a
c97c",
.id = 1,
.dev = {
.dma_mask = &ac97_dmamask,
.id = 1,
.dev = {
.dma_mask = &ac97_dmamask,
@@
-800,7
+800,7
@@
static struct platform_device at91cap9_ac97_device = {
.num_resources = ARRAY_SIZE(ac97_resources),
};
.num_resources = ARRAY_SIZE(ac97_resources),
};
-void __init at91_add_device_ac97(struct a
tmel_ac97
_data *data)
+void __init at91_add_device_ac97(struct a
c97c_platform
_data *data)
{
if (!data)
return;
{
if (!data)
return;
@@
-818,7
+818,7
@@
void __init at91_add_device_ac97(struct atmel_ac97_data *data)
platform_device_register(&at91cap9_ac97_device);
}
#else
platform_device_register(&at91cap9_ac97_device);
}
#else
-void __init at91_add_device_ac97(struct a
tmel_ac97
_data *data) {}
+void __init at91_add_device_ac97(struct a
c97c_platform
_data *data) {}
#endif
#endif
@@
-861,7
+861,7
@@
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
return;
if (cpu_is_at91cap9_revB())
return;
if (cpu_is_at91cap9_revB())
- set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH);
+
irq_
set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH);
at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */
at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */
at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */
at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */