[adm5120] restore right patches for 2.6.21.5
[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / patches / 004-adm5120_uart.patch
1 Index: linux-2.6.21.1/drivers/serial/Makefile
2 ===================================================================
3 --- linux-2.6.21.1.orig/drivers/serial/Makefile
4 +++ linux-2.6.21.1/drivers/serial/Makefile
5 @@ -21,6 +21,7 @@ obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554)
6 obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
7 obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
8 obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
9 +obj-$(CONFIG_SERIAL_ADM5120) += adm5120_uart.o
10 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
11 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
12 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
13 Index: linux-2.6.21.1/include/linux/serial_core.h
14 ===================================================================
15 --- linux-2.6.21.1.orig/include/linux/serial_core.h
16 +++ linux-2.6.21.1/include/linux/serial_core.h
17 @@ -135,6 +135,9 @@
18 /* Xilinx uartlite */
19 #define PORT_UARTLITE 74
20
21 +/* ADMtek ADM5120 SoC */
22 +#define PORT_ADM5120 68
23 +
24 #ifdef __KERNEL__
25
26 #include <linux/compiler.h>
27 Index: linux-2.6.21.1/drivers/serial/Kconfig
28 ===================================================================
29 --- linux-2.6.21.1.orig/drivers/serial/Kconfig
30 +++ linux-2.6.21.1/drivers/serial/Kconfig
31 @@ -256,6 +256,22 @@ config SERIAL_8250_AU1X00
32
33 comment "Non-8250 serial port support"
34
35 +config SERIAL_ADM5120
36 + bool "ADM5120 serial port support"
37 + depends on MIPS_ADM5120
38 + select SERIAL_CORE
39 + select SERIAL_CORE_CONSOLE
40 + help
41 + Driver for the on chip UARTs on the ADM5120 SoC
42 +
43 +config ADM5120_NR_UARTS
44 + int "Maximum number of ADM5120 serial ports"
45 + depends on SERIAL_ADM5120
46 + default "2"
47 + ---help---
48 + Set this to the number of serial ports you want the driver to
49 + support.
50 +
51 config SERIAL_AMBA_PL010
52 tristate "ARM AMBA PL010 serial port support"
53 depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)