diff options
Diffstat (limited to 'arch/arm/mach-pxa/pcm990-baseboard.c')
-rw-r--r-- | arch/arm/mach-pxa/pcm990-baseboard.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 2564e16e4e2f..5d87c7c866e4 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
35 | #include <asm/arch/pxa-regs.h> | 35 | #include <asm/arch/pxa-regs.h> |
36 | #include <asm/arch/pxa2xx-gpio.h> | 36 | #include <asm/arch/pxa2xx-gpio.h> |
37 | #include <asm/arch/audio.h> | ||
37 | #include <asm/arch/mmc.h> | 38 | #include <asm/arch/mmc.h> |
38 | #include <asm/arch/ohci.h> | 39 | #include <asm/arch/ohci.h> |
39 | #include <asm/arch/pcm990_baseboard.h> | 40 | #include <asm/arch/pcm990_baseboard.h> |
@@ -424,36 +425,6 @@ static struct i2c_board_info __initdata pcm990_i2c_devices[] = { | |||
424 | #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */ | 425 | #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */ |
425 | 426 | ||
426 | /* | 427 | /* |
427 | * AC97 support | ||
428 | * Note: The connected AC97 mixer also reports interrupts at PCM990_AC97_IRQ | ||
429 | */ | ||
430 | static struct resource pxa27x_ac97_resources[] = { | ||
431 | [0] = { | ||
432 | .start = 0x40500000, | ||
433 | .end = 0x40500000 + 0xfff, | ||
434 | .flags = IORESOURCE_MEM, | ||
435 | }, | ||
436 | [1] = { | ||
437 | .start = IRQ_AC97, | ||
438 | .end = IRQ_AC97, | ||
439 | .flags = IORESOURCE_IRQ, | ||
440 | }, | ||
441 | }; | ||
442 | |||
443 | static u64 pxa_ac97_dmamask = 0xffffffffUL; | ||
444 | |||
445 | static struct platform_device pxa27x_device_ac97 = { | ||
446 | .name = "pxa2xx-ac97", | ||
447 | .id = -1, | ||
448 | .dev = { | ||
449 | .dma_mask = &pxa_ac97_dmamask, | ||
450 | .coherent_dma_mask = 0xffffffff, | ||
451 | }, | ||
452 | .num_resources = ARRAY_SIZE(pxa27x_ac97_resources), | ||
453 | .resource = pxa27x_ac97_resources, | ||
454 | }; | ||
455 | |||
456 | /* | ||
457 | * enable generic access to the base board control CPLDs U6 and U7 | 428 | * enable generic access to the base board control CPLDs U6 and U7 |
458 | */ | 429 | */ |
459 | static struct map_desc pcm990_io_desc[] __initdata = { | 430 | static struct map_desc pcm990_io_desc[] __initdata = { |
@@ -490,8 +461,6 @@ void __init pcm990_baseboard_init(void) | |||
490 | pxa_gpio_mode(GPIO16_PWM0_MD); | 461 | pxa_gpio_mode(GPIO16_PWM0_MD); |
491 | platform_device_register(&pcm990_backlight_device); | 462 | platform_device_register(&pcm990_backlight_device); |
492 | 463 | ||
493 | platform_device_register(&pxa27x_device_ac97); | ||
494 | |||
495 | /* MMC */ | 464 | /* MMC */ |
496 | pxa_set_mci_info(&pcm990_mci_platform_data); | 465 | pxa_set_mci_info(&pcm990_mci_platform_data); |
497 | 466 | ||
@@ -499,6 +468,7 @@ void __init pcm990_baseboard_init(void) | |||
499 | pxa_set_ohci_info(&pcm990_ohci_platform_data); | 468 | pxa_set_ohci_info(&pcm990_ohci_platform_data); |
500 | 469 | ||
501 | pxa_set_i2c_info(NULL); | 470 | pxa_set_i2c_info(NULL); |
471 | pxa_set_ac97_info(NULL); | ||
502 | 472 | ||
503 | #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) | 473 | #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) |
504 | pxa_set_camera_info(&pcm990_pxacamera_platform_data); | 474 | pxa_set_camera_info(&pcm990_pxacamera_platform_data); |