Merge branch 'adm8668'
[openwrt/svn-archive/archive.git] / target / linux / adm8668 / patches-2.6.36 / 002-adm8668_uart.patch
1 --- a/drivers/serial/Kconfig
2 +++ b/drivers/serial/Kconfig
3 @@ -1510,6 +1510,25 @@
4 If you have enabled the serial port on the bcm63xx CPU
5 you can make it the console by answering Y to this option.
6
7 +config SERIAL_ADM8668
8 + tristate "ADM8668 serial port support"
9 + select SERIAL_CORE
10 + depends on ADM8668
11 + help
12 + If you have an adm8668 CPU, you can enable its onboard
13 + serial port by enabling this options.
14 +
15 + To compile this driver as a module, choose M here: the
16 + module will be called adm8668_uart.
17 +
18 +config SERIAL_ADM8668_CONSOLE
19 + bool "Console on adm8668 serial port"
20 + depends on SERIAL_ADM8668=y
21 + select SERIAL_CORE_CONSOLE
22 + help
23 + If you have enabled the serial port on the adm8668 CPU
24 + you can make it the console by answering Y to this option.
25 +
26 config SERIAL_GRLIB_GAISLER_APBUART
27 tristate "GRLIB APBUART serial support"
28 depends on OF
29 --- a/include/linux/serial_core.h
30 +++ b/include/linux/serial_core.h
31 @@ -196,6 +196,9 @@
32 /* High Speed UART for Medfield */
33 #define PORT_MFD 95
34
35 +/* ADM8668 UART */
36 +#define PORT_ADM8668 93
37 +
38 #ifdef __KERNEL__
39
40 #include <linux/compiler.h>
41