diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/arm/mach-pxa/e740.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/arm/mach-pxa/e740.c')
| -rw-r--r-- | arch/arm/mach-pxa/e740.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c index 54af7ed1397e..07500a04fd8c 100644 --- a/arch/arm/mach-pxa/e740.c +++ b/arch/arm/mach-pxa/e740.c | |||
| @@ -133,6 +133,11 @@ static unsigned long e740_pin_config[] __initdata = { | |||
| 133 | /* IrDA */ | 133 | /* IrDA */ |
| 134 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, | 134 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, |
| 135 | 135 | ||
| 136 | /* Audio power control */ | ||
| 137 | GPIO16_GPIO, /* AC97 codec AVDD2 supply (analogue power) */ | ||
| 138 | GPIO40_GPIO, /* Mic amp power */ | ||
| 139 | GPIO41_GPIO, /* Headphone amp power */ | ||
| 140 | |||
| 136 | /* PC Card */ | 141 | /* PC Card */ |
| 137 | GPIO8_GPIO, /* CD0 */ | 142 | GPIO8_GPIO, /* CD0 */ |
| 138 | GPIO44_GPIO, /* CD1 */ | 143 | GPIO44_GPIO, /* CD1 */ |