From: Paul Parsons Date: Fri, 16 Mar 2012 15:24:35 +0000 (+0000) Subject: ARM: pxa: Add standard UART to hx4700_pin_config[] X-Git-Tag: v3.5-rc1~150^2~8^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0de91b618281251beb9f73eaa436337779ae25f2;p=karo-tx-linux.git 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 Acked-by: Haojian Zhuang --- 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,