hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: 5719/1: [AT91] Fix AC97 breakage 

Fix AC97 build breakage with converting to the shared AT91/AVR32 AC97 driver:
  struct atmel_ac97_data  -> struct ac97c_platform_data
  CONFIG_SND_AT91_AC97 -> CONFIG_SND_ATMEL_AC97C

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Andrew Victor 2009-09-22 10:47:50 +01:00 committed by Russell King
parent 2003b7af25
commit 9173a8ef24
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-at91/at91cap9_devices.c
View File

@ -771,9 +771,9 @@ void __init at91_add_device_pwm(u32 mask) {}
* AC97 * AC97
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_SND_AT91_AC97) || defined(CONFIG_SND_AT91_AC97_MODULE) #if defined(CONFIG_SND_ATMEL_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 atmel_ac97_data ac97_data; static struct ac97c_platform_data ac97_data;
static struct resource ac97_resources[] = { static struct resource ac97_resources[] = {
[0] = { [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 = "atmel_ac97c",
.id = 1, .id = 1,
.dev = { .dev = {
.dma_mask = &ac97_dmamask, .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 atmel_ac97_data *data) void __init at91_add_device_ac97(struct ac97c_platform_data *data)
{ {
if (!data) if (!data)
return; return;
@ -818,7 +818,7 @@ void __init at91_add_device_ac97(struct atmel_ac97_data *data)
platform_device_register(&at91cap9_ac97_device); platform_device_register(&at91cap9_ac97_device);
} }
#else #else
void __init at91_add_device_ac97(struct atmel_ac97_data *data) {} void __init at91_add_device_ac97(struct ac97c_platform_data *data) {}
#endif #endif

2
arch/arm/mach-at91/board-cap9adk.c
View File

@ -364,7 +364,7 @@ static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data;
/* /*
* AC97 * AC97
*/ */
static struct atmel_ac97_data cap9adk_ac97_data = { static struct ac97c_platform_data cap9adk_ac97_data = {
// .reset_pin = ... not connected // .reset_pin = ... not connected
}; };

2
arch/arm/mach-at91/board-neocore926.c
View File

@ -340,7 +340,7 @@ static void __init neocore926_add_device_buttons(void) {}
/* /*
* AC97 * AC97
*/ */
static struct atmel_ac97_data neocore926_ac97_data = { static struct ac97c_platform_data neocore926_ac97_data = {
.reset_pin = AT91_PIN_PA13, .reset_pin = AT91_PIN_PA13,
}; };