summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/hx4700.c
diff options
context:
space:
mode:
authorPaul Parsons <lost.distance@yahoo.com>2012-03-16 15:24:35 +0000
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-05-05 17:05:22 +0800
commit0de91b618281251beb9f73eaa436337779ae25f2 (patch)
tree9d6190d31f545a1d2ee4c1a55e10389d48fa9461 /arch/arm/mach-pxa/hx4700.c
parent73578674f893f20733fa325b0d46e75c1e0f9f3e (diff)
downloadlinux-0de91b618281251beb9f73eaa436337779ae25f2.tar.bz2
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/hx4700.c')
-rw-r--r--arch/arm/mach-pxa/hx4700.c4
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 = {
GPIO44_BTUART_CTS,
GPIO45_BTUART_RTS_LPM_LOW,
+ /* STUART (IRDA) */
+ GPIO46_STUART_RXD,
+ GPIO47_STUART_TXD,
+
/* PWM 1 (Backlight) */
GPIO17_PWM1_OUT,