diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/soft_i2c.c | 3 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/serial.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_lpc2292.c | 117 | 
4 files changed, 0 insertions, 123 deletions
| diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 36c6114e3..1595c0714 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -41,9 +41,6 @@  #ifdef	CONFIG_IXP425			/* only valid for IXP425 */  #include <asm/arch/ixp425.h>  #endif -#ifdef CONFIG_LPC2292 -#include <asm/arch/hardware.h> -#endif  #if defined(CONFIG_MPC852T) || defined(CONFIG_MPC866)  #include <asm/io.h>  #endif diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 920ce6910..51af313f5 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -44,7 +44,6 @@ COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o  COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o  COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o  COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o -COBJS-$(CONFIG_LPC2292_SERIAL) += serial_lpc2292.o  COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o  COBJS-$(CONFIG_MXC_UART) += serial_mxc.o  COBJS-$(CONFIG_NETARM_SERIAL) += serial_netarm.o diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index e0886d562..1d68f5568 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -104,7 +104,6 @@ serial_initfunc(imx_serial_initialize);  serial_initfunc(ixp_serial_initialize);  serial_initfunc(ks8695_serial_initialize);  serial_initfunc(lh7a40x_serial_initialize); -serial_initfunc(lpc2292_serial_initialize);  serial_initfunc(max3100_serial_initialize);  serial_initfunc(mxc_serial_initialize);  serial_initfunc(netarm_serial_initialize); @@ -202,7 +201,6 @@ void serial_initialize(void)  	ixp_serial_initialize();  	ks8695_serial_initialize();  	lh7a40x_serial_initialize(); -	lpc2292_serial_initialize();  	max3100_serial_initialize();  	mxc_serial_initialize();  	netarm_serial_initialize(); diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c deleted file mode 100644 index 8abc47671..000000000 --- a/drivers/serial/serial_lpc2292.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * (C) Copyright 2002-2004 - * Wolfgang Denk, DENX Software Engineering, <wd@denx.de> - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Alex Zuepke <azu@sysgo.de> - * - * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA - * - */ - -#include <common.h> -#include <asm/arch/hardware.h> - -DECLARE_GLOBAL_DATA_PTR; - -static void lpc2292_serial_setbrg(void) -{ -	unsigned short divisor = 0; - -	switch (gd->baudrate) { -	case   1200:	divisor = 3072;	break; -	case   9600:	divisor =  384;	break; -	case  19200:	divisor =  192;	break; -	case  38400:	divisor =   96;	break; -	case  57600:	divisor =   64;	break; -	case 115200:	divisor =   32;	break; -	default:	hang ();	break; -	} - -	/* init serial UART0 */ -	PUT8(U0LCR, 0); -	PUT8(U0IER, 0); -	PUT8(U0LCR, 0x80);	/* DLAB=1 */ -	PUT8(U0DLL, (unsigned char)(divisor & 0x00FF)); -	PUT8(U0DLM, (unsigned char)(divisor >> 8)); -	PUT8(U0LCR, 0x03);	/* 8N1, DLAB=0  */ -	PUT8(U0FCR, 1);		/* Enable RX and TX FIFOs */ -} - -static int lpc2292_serial_init(void) -{ -	unsigned long pinsel0; - -	serial_setbrg (); - -	pinsel0 = GET32(PINSEL0); -	pinsel0 &= ~(0x00000003); -	pinsel0 |= 5; -	PUT32(PINSEL0, pinsel0); - -	return (0); -} - -static void lpc2292_serial_putc(const char c) -{ -	if (c == '\n') -	{ -		while((GET8(U0LSR) & (1<<5)) == 0); /* Wait for empty U0THR */ -		PUT8(U0THR, '\r'); -	} - -	while((GET8(U0LSR) & (1<<5)) == 0); /* Wait for empty U0THR */ -	PUT8(U0THR, c); -} - -static int lpc2292_serial_getc(void) -{ -	while((GET8(U0LSR) & 1) == 0); -	return GET8(U0RBR); -} - -/* Test if there is a byte to read */ -static int lpc2292_serial_tstc(void) -{ -	return (GET8(U0LSR) & 1); -} - -static struct serial_device lpc2292_serial_drv = { -	.name	= "lpc2292_serial", -	.start	= lpc2292_serial_init, -	.stop	= NULL, -	.setbrg	= lpc2292_serial_setbrg, -	.putc	= lpc2292_serial_putc, -	.puts	= default_serial_puts, -	.getc	= lpc2292_serial_getc, -	.tstc	= lpc2292_serial_tstc, -}; - -void lpc2292_serial_initialize(void) -{ -	serial_register(&lpc2292_serial_drv); -} - -__weak struct serial_device *default_serial_console(void) -{ -	return &lpc2292_serial_drv; -} |