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

Commit c11b6a42 authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: add the missing AC97 pin configurations 



Missing AC97 pin configurations are added where pxa_set_ac97_info() are
called for all pxa25x/pxa27x platforms. Where no exact configuration is
provided, use the default as in sound/arm/pxa2xx-ac97-lib.c

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent fb1bf8cd

arch/arm/mach-pxa/balloon3.c

+11 −1
Original line number Diff line number Diff line
@@ -132,6 +132,14 @@ static void __init balloon3_init_irq(void) 
		"enabled\n", __func__, BALLOON3_AUX_NIRQ);

}



static unsigned long balloon3_ac97_pin_config[] = {

	GPIO28_AC97_BITCLK,

	GPIO29_AC97_SDATA_IN_0,

	GPIO30_AC97_SDATA_OUT,

	GPIO31_AC97_SYNC,

	GPIO113_AC97_nRESET,

};



static void balloon3_backlight_power(int on)

{

	pr_debug("%s: power is %s\n", __func__, on ? "on" : "off");
@@ -292,8 +300,10 @@ static void __init balloon3_init(void) 
	pxa_set_stuart_info(NULL);



	pxa_set_i2c_info(NULL);

	if (balloon3_has(BALLOON3_FEATURE_AUDIO))

	if (balloon3_has(BALLOON3_FEATURE_AUDIO)) {

		pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_ac97_pin_config));

		pxa_set_ac97_info(NULL);

	}



	if (balloon3_has(BALLOON3_FEATURE_TOPPOLY)) {

		pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_lcd_pin_config));

arch/arm/mach-pxa/e740.c

+6 −0
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ static unsigned long e740_pin_config[] __initdata = { 
	/* IrDA */

	GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,



	/* AC97 */

	GPIO28_AC97_BITCLK,

	GPIO29_AC97_SDATA_IN_0,

	GPIO30_AC97_SDATA_OUT,

	GPIO31_AC97_SYNC,



	/* Audio power control */

	GPIO16_GPIO,  /* AC97 codec AVDD2 supply (analogue power) */

	GPIO40_GPIO,  /* Mic amp power */

arch/arm/mach-pxa/e750.c

+6 −0
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ static unsigned long e750_pin_config[] __initdata = { 
	/* IrDA */

	GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,



	/* AC97 */

	GPIO28_AC97_BITCLK,

	GPIO29_AC97_SDATA_IN_0,

	GPIO30_AC97_SDATA_OUT,

	GPIO31_AC97_SYNC,



	/* Audio power control */

	GPIO4_GPIO,  /* Headphone amp power */

	GPIO7_GPIO,  /* Speaker amp power */

arch/arm/mach-pxa/e800.c

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ 


/* ------------------------ e800 LCD definitions ------------------------- */



static unsigned long e800_pin_config[] __initdata = {

	/* AC97 */

	GPIO28_AC97_BITCLK,

	GPIO29_AC97_SDATA_IN_0,

	GPIO30_AC97_SDATA_OUT,

	GPIO31_AC97_SYNC,

};



static struct w100_gen_regs e800_lcd_regs = {

	.lcd_format =            0x00008003,

	.lcdd_cntl1 =            0x02a00000,
@@ -195,6 +203,7 @@ static struct platform_device *devices[] __initdata = { 


static void __init e800_init(void)

{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e800_pin_config));

	pxa_set_ffuart_info(NULL);

	pxa_set_btuart_info(NULL);

	pxa_set_stuart_info(NULL);

arch/arm/mach-pxa/lpd270.c

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ static unsigned long lpd270_pin_config[] __initdata = { 
	GPIO89_USBH1_PEN,



	/* AC97 */

	GPIO28_AC97_BITCLK,

	GPIO29_AC97_SDATA_IN_0,

	GPIO30_AC97_SDATA_OUT,

	GPIO31_AC97_SYNC,

	GPIO45_AC97_SYSCLK,



	GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,