Commit ebfcfef4 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] m68knommu: set GPIO lines for serial ports on 5282 in mcfserial.c

For the Freescale M5282 ColdFire,
Port UA Pin Assignment Register should set to UART mode.
Patch submitted by David Wu <davidwu@arcturusnetworks.com>.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8668fb5d
...@@ -1541,8 +1541,8 @@ static void mcfrs_irqinit(struct mcf_serial *info) ...@@ -1541,8 +1541,8 @@ static void mcfrs_irqinit(struct mcf_serial *info)
* External Pin Mask Setting & Enable External Pin for Interface * External Pin Mask Setting & Enable External Pin for Interface
* mrcbis@aliceposta.it * mrcbis@aliceposta.it
*/ */
unsigned short *serpin_enable_mask; u16 *serpin_enable_mask;
serpin_enable_mask = (MCF_IPSBAR + MCF_GPIO_PAR_UART); serpin_enable_mask = (u16 *) (MCF_IPSBAR + MCF_GPIO_PAR_UART);
if (info->line == 0) if (info->line == 0)
*serpin_enable_mask |= UART0_ENABLE_MASK; *serpin_enable_mask |= UART0_ENABLE_MASK;
else if (info->line == 1) else if (info->line == 1)
...@@ -1551,6 +1551,13 @@ static void mcfrs_irqinit(struct mcf_serial *info) ...@@ -1551,6 +1551,13 @@ static void mcfrs_irqinit(struct mcf_serial *info)
*serpin_enable_mask |= UART2_ENABLE_MASK; *serpin_enable_mask |= UART2_ENABLE_MASK;
} }
#endif #endif
#if defined(CONFIG_M528x)
/* make sure PUAPAR is set for UART0 and UART1 */
if (info->line < 2) {
volatile unsigned char *portp = (volatile unsigned char *) (MCF_MBAR + MCF5282_GPIO_PUAPAR);
*portp |= (0x03 << (info->line * 2));
}
#endif
#elif defined(CONFIG_M520x) #elif defined(CONFIG_M520x)
volatile unsigned char *icrp, *uartp; volatile unsigned char *icrp, *uartp;
volatile unsigned long *imrp; volatile unsigned long *imrp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment