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

Commit 768dec4c authored by Mark Brown's avatar Mark Brown Committed by Russell King
Browse files

[ARM] 4976/1: zylonite: Configure GPIO for WM9713 IRQ line 



Set up the IRQ line for the WM9713 device on the Zylonite.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatareric miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 507012f0

arch/arm/mach-pxa/zylonite.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ struct platform_mmc_slot zylonite_mmc_slot[MAX_SLOTS]; 
int gpio_backlight;

int gpio_eth_irq;



int wm9713_irq;



int lcd_id;

int lcd_orientation;

arch/arm/mach-pxa/zylonite_pxa300.c

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 
	GPIO27_AC97_SDATA_OUT,

	GPIO28_AC97_SYNC,



	/* WM9713 IRQ */

	GPIO26_GPIO,



	/* Keypad */

	GPIO107_KP_DKIN_0 | MFP_LPM_EDGE_BOTH,

	GPIO108_KP_DKIN_1 | MFP_LPM_EDGE_BOTH,
@@ -203,6 +206,9 @@ void __init zylonite_pxa300_init(void) 
		/* MMC card detect & write protect for controller 0 */

		zylonite_mmc_slot[0].gpio_cd  = EXT_GPIO(0);

		zylonite_mmc_slot[0].gpio_wp  = EXT_GPIO(2);



		/* WM9713 IRQ */

		wm9713_irq = mfp_to_gpio(MFP_PIN_GPIO26);

	}



	if (cpu_is_pxa300()) {

arch/arm/mach-pxa/zylonite_pxa320.c

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ static mfp_cfg_t mfp_cfg[] __initdata = { 
	GPIO39_AC97_BITCLK,

	GPIO40_AC97_nACRESET,



	/* WM9713 IRQ */

	GPIO15_GPIO,



	/* I2C */

	GPIO32_I2C_SCL,

	GPIO33_I2C_SDA,
@@ -190,5 +193,8 @@ void __init zylonite_pxa320_init(void) 
		/* MMC card detect & write protect for controller 0 */

		zylonite_mmc_slot[0].gpio_cd  = mfp_to_gpio(MFP_PIN_GPIO1);

		zylonite_mmc_slot[0].gpio_wp  = mfp_to_gpio(MFP_PIN_GPIO5);



		/* WM9713 IRQ */

		wm9713_irq = mfp_to_gpio(MFP_PIN_GPIO15);

	}

}

include/asm-arm/arch-pxa/zylonite.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ extern struct platform_mmc_slot zylonite_mmc_slot[]; 
extern int gpio_backlight;

extern int gpio_eth_irq;



extern int wm9713_irq;



extern int lcd_id;

extern int lcd_orientation;