Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9173a8ef authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

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: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2003b7af

arch/arm/mach-at91/at91cap9_devices.c

+5 −5
Original line number Diff line number Diff line
@@ -771,9 +771,9 @@ void __init at91_add_device_pwm(u32 mask) {} 
 *  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 struct atmel_ac97_data ac97_data;

static struct ac97c_platform_data ac97_data;



static struct resource ac97_resources[] = {

	[0] = {
@@ -789,7 +789,7 @@ static struct resource ac97_resources[] = { 
};



static struct platform_device at91cap9_ac97_device = {

	.name		= "ac97c",

	.name		= "atmel_ac97c",

	.id		= 1,

	.dev		= {

				.dma_mask		= &ac97_dmamask,
@@ -800,7 +800,7 @@ static struct platform_device at91cap9_ac97_device = { 
	.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)

		return;
@@ -818,7 +818,7 @@ void __init at91_add_device_ac97(struct atmel_ac97_data *data) 
	platform_device_register(&at91cap9_ac97_device);

}

#else

void __init at91_add_device_ac97(struct atmel_ac97_data *data) {}

void __init at91_add_device_ac97(struct ac97c_platform_data *data) {}

#endif

arch/arm/mach-at91/board-cap9adk.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data; 
/*

 * AC97

 */

static struct atmel_ac97_data cap9adk_ac97_data = {

static struct ac97c_platform_data cap9adk_ac97_data = {

//	.reset_pin	= ... not connected

};

arch/arm/mach-at91/board-neocore926.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static void __init neocore926_add_device_buttons(void) {} 
/*

 * AC97

 */

static struct atmel_ac97_data neocore926_ac97_data = {

static struct ac97c_platform_data neocore926_ac97_data = {

	.reset_pin	= AT91_PIN_PA13,

};