Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8b8d57c authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

[PATCH] m68knommu: ColdFire serial driver fixes 



Some updates for the old ColdFire serial driver:

 . support 3 and 4 UARTs on some ColdFire parts that have them
 . enable multifunction pins to serial for 527x CPU's
 . support the 5272 UART's fractional baud rate divisor
 . switch driver name to "mcfserial"

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dcb14775

drivers/serial/mcfserial.c

+51 −3
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ struct timer_list mcfrs_timer_struct; 
#if defined(CONFIG_HW_FEITH)

#define	CONSOLE_BAUD_RATE	38400

#define	DEFAULT_CBAUD		B38400

#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || defined(CONFIG_M5329EVB)

#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \

      defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO)

#define CONSOLE_BAUD_RATE 	115200

#define DEFAULT_CBAUD		B115200

#elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
@@ -109,12 +110,30 @@ static struct mcf_serial mcfrs_table[] = { 
		.irq = IRQBASE,

		.flags = ASYNC_BOOT_AUTOCONF,

	},

#ifdef MCFUART_BASE2

	{  /* ttyS1 */

		.magic = 0,

		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE2),

		.irq = IRQBASE+1,

		.flags = ASYNC_BOOT_AUTOCONF,

	},

#endif

#ifdef MCFUART_BASE3

	{  /* ttyS2 */

		.magic = 0,

		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE3),

		.irq = IRQBASE+2,

		.flags = ASYNC_BOOT_AUTOCONF,

	},

#endif

#ifdef MCFUART_BASE4

	{  /* ttyS3 */

		.magic = 0,

		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE4),

		.irq = IRQBASE+3,

		.flags = ASYNC_BOOT_AUTOCONF,

	},

#endif

};
@@ -1516,6 +1535,22 @@ static void mcfrs_irqinit(struct mcf_serial *info) 
	imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +

		MCFINTC_IMRL);

	*imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);

#if defined(CONFIG_M527x)

	{

		/*

		 * External Pin Mask Setting & Enable External Pin for Interface

		 * mrcbis@aliceposta.it

        	 */

		unsigned short *serpin_enable_mask;

		serpin_enable_mask = (MCF_IPSBAR + MCF_GPIO_PAR_UART);

		if (info->line == 0)

			*serpin_enable_mask |= UART0_ENABLE_MASK;

		else if (info->line == 1)

			*serpin_enable_mask |= UART1_ENABLE_MASK;

		else if (info->line == 2)

			*serpin_enable_mask |= UART2_ENABLE_MASK;

	}

#endif

#elif defined(CONFIG_M520x)

	volatile unsigned char *icrp, *uartp;

	volatile unsigned long *imrp;
@@ -1713,7 +1748,7 @@ mcfrs_init(void) 
	/* Initialize the tty_driver structure */

	mcfrs_serial_driver->owner = THIS_MODULE;

	mcfrs_serial_driver->name = "ttyS";

	mcfrs_serial_driver->driver_name = "serial";

	mcfrs_serial_driver->driver_name = "mcfserial";

	mcfrs_serial_driver->major = TTY_MAJOR;

	mcfrs_serial_driver->minor_start = 64;

	mcfrs_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1797,10 +1832,23 @@ void mcfrs_init_console(void) 
	uartp[MCFUART_UMR] = MCFUART_MR1_PARITYNONE | MCFUART_MR1_CS8;

	uartp[MCFUART_UMR] = MCFUART_MR2_STOP1;



#ifdef	CONFIG_M5272

{

	/*

	 * For the MCF5272, also compute the baudrate fraction.

	 */

	int fraction = MCF_BUSCLK - (clk * 32 * mcfrs_console_baud);

	fraction *= 16;

	fraction /= (32 * mcfrs_console_baud);

	uartp[MCFUART_UFPD] = (fraction & 0xf);		/* set fraction */

	clk = (MCF_BUSCLK / mcfrs_console_baud) / 32;

}

#else

	clk = ((MCF_BUSCLK / mcfrs_console_baud) + 16) / 32; /* set baud */

#endif



	uartp[MCFUART_UBG1] = (clk & 0xff00) >> 8;  /* set msb baud */

	uartp[MCFUART_UBG2] = (clk & 0xff);  /* set lsb baud */



	uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;

	uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;