diff options
author | Paul Parsons <lost.distance@yahoo.com> | 2012-03-16 11:24:35 -0400 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-05-05 05:05:22 -0400 |
commit | 0de91b618281251beb9f73eaa436337779ae25f2 (patch) | |
tree | 9d6190d31f545a1d2ee4c1a55e10389d48fa9461 /arch/arm/mach-pxa | |
parent | 73578674f893f20733fa325b0d46e75c1e0f9f3e (diff) |
ARM: pxa: Add standard UART to hx4700_pin_config[]
Add the two standard UART signals (GPIO46_STUART_RXD, GPIO47_STUART_TXD) to the
initial mfp config table hx4700_pin_config[] passed to pxa2xx_mfp_config().
Although pxa2xx_transceiver_mode() can subsequently set these two signals via
its own call to pxa2xx_mfp_config(), pxa2xx_transceiver_mode() is only present
when CONFIG_PXA_FICP=y. Hence this patch provides a default mfp config.
Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index cccddfe13fa4..6bd692d271c1 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
@@ -102,6 +102,10 @@ static unsigned long hx4700_pin_config[] __initdata = { | |||
102 | GPIO44_BTUART_CTS, | 102 | GPIO44_BTUART_CTS, |
103 | GPIO45_BTUART_RTS_LPM_LOW, | 103 | GPIO45_BTUART_RTS_LPM_LOW, |
104 | 104 | ||
105 | /* STUART (IRDA) */ | ||
106 | GPIO46_STUART_RXD, | ||
107 | GPIO47_STUART_TXD, | ||
108 | |||
105 | /* PWM 1 (Backlight) */ | 109 | /* PWM 1 (Backlight) */ |
106 | GPIO17_PWM1_OUT, | 110 | GPIO17_PWM1_OUT, |
107 | 111 | ||