diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 9ca1d539bdc5..dbb546216be1 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -36,6 +36,8 @@ struct platform_mmc_slot zylonite_mmc_slot[MAX_SLOTS]; | |||
36 | int gpio_backlight; | 36 | int gpio_backlight; |
37 | int gpio_eth_irq; | 37 | int gpio_eth_irq; |
38 | 38 | ||
39 | int wm9713_irq; | ||
40 | |||
39 | int lcd_id; | 41 | int lcd_id; |
40 | int lcd_orientation; | 42 | int lcd_orientation; |
41 | 43 | ||
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index b3e3049486aa..324fb9daae28 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -69,6 +69,9 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { | |||
69 | GPIO27_AC97_SDATA_OUT, | 69 | GPIO27_AC97_SDATA_OUT, |
70 | GPIO28_AC97_SYNC, | 70 | GPIO28_AC97_SYNC, |
71 | 71 | ||
72 | /* WM9713 IRQ */ | ||
73 | GPIO26_GPIO, | ||
74 | |||
72 | /* Keypad */ | 75 | /* Keypad */ |
73 | GPIO107_KP_DKIN_0 | MFP_LPM_EDGE_BOTH, | 76 | GPIO107_KP_DKIN_0 | MFP_LPM_EDGE_BOTH, |
74 | GPIO108_KP_DKIN_1 | MFP_LPM_EDGE_BOTH, | 77 | GPIO108_KP_DKIN_1 | MFP_LPM_EDGE_BOTH, |
@@ -203,6 +206,9 @@ void __init zylonite_pxa300_init(void) | |||
203 | /* MMC card detect & write protect for controller 0 */ | 206 | /* MMC card detect & write protect for controller 0 */ |
204 | zylonite_mmc_slot[0].gpio_cd = EXT_GPIO(0); | 207 | zylonite_mmc_slot[0].gpio_cd = EXT_GPIO(0); |
205 | zylonite_mmc_slot[0].gpio_wp = EXT_GPIO(2); | 208 | zylonite_mmc_slot[0].gpio_wp = EXT_GPIO(2); |
209 | |||
210 | /* WM9713 IRQ */ | ||
211 | wm9713_irq = mfp_to_gpio(MFP_PIN_GPIO26); | ||
206 | } | 212 | } |
207 | 213 | ||
208 | if (cpu_is_pxa300()) { | 214 | if (cpu_is_pxa300()) { |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index ce54195a4546..193d07903b06 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -68,6 +68,9 @@ static mfp_cfg_t mfp_cfg[] __initdata = { | |||
68 | GPIO39_AC97_BITCLK, | 68 | GPIO39_AC97_BITCLK, |
69 | GPIO40_AC97_nACRESET, | 69 | GPIO40_AC97_nACRESET, |
70 | 70 | ||
71 | /* WM9713 IRQ */ | ||
72 | GPIO15_GPIO, | ||
73 | |||
71 | /* I2C */ | 74 | /* I2C */ |
72 | GPIO32_I2C_SCL, | 75 | GPIO32_I2C_SCL, |
73 | GPIO33_I2C_SDA, | 76 | GPIO33_I2C_SDA, |
@@ -190,5 +193,8 @@ void __init zylonite_pxa320_init(void) | |||
190 | /* MMC card detect & write protect for controller 0 */ | 193 | /* MMC card detect & write protect for controller 0 */ |
191 | zylonite_mmc_slot[0].gpio_cd = mfp_to_gpio(MFP_PIN_GPIO1); | 194 | zylonite_mmc_slot[0].gpio_cd = mfp_to_gpio(MFP_PIN_GPIO1); |
192 | zylonite_mmc_slot[0].gpio_wp = mfp_to_gpio(MFP_PIN_GPIO5); | 195 | zylonite_mmc_slot[0].gpio_wp = mfp_to_gpio(MFP_PIN_GPIO5); |
196 | |||
197 | /* WM9713 IRQ */ | ||
198 | wm9713_irq = mfp_to_gpio(MFP_PIN_GPIO15); | ||
193 | } | 199 | } |
194 | } | 200 | } |