Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

1 files changed, 34 insertions, 35 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5351848cfff7..f55c49475a8c 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1026,6 +1026,10 @@ config SERIAL_SH_SCI_CONSOLE
         depends on SERIAL_SH_SCI=y
         select SERIAL_CORE_CONSOLE
 
+config SERIAL_SH_SCI_DMA
+        bool "DMA support"
+        depends on SERIAL_SH_SCI && SH_DMAE && EXPERIMENTAL
+
 config SERIAL_PNX8XXX
         bool "Enable PNX8XXX SoCs' UART Support"
         depends on MIPS && (SOC_PNX8550 || SOC_PNX833X)
@@ -1103,12 +1107,12 @@ config SERIAL_68360
         default y
 
 config SERIAL_PMACZILOG
-        tristate "PowerMac z85c30 ESCC support"
-        depends on PPC_OF && PPC_PMAC
+        tristate "Mac or PowerMac z85c30 ESCC support"
+        depends on (M68K && MAC) || (PPC_OF && PPC_PMAC)
         select SERIAL_CORE
         help
           This driver supports the Zilog z85C30 serial ports found on
-          PowerMac machines.
+          (Power)Mac machines.
           Say Y or M if you want to be able to these serial ports.
 
 config SERIAL_PMACZILOG_TTYS
@@ -1133,16 +1137,16 @@ config SERIAL_PMACZILOG_TTYS
           unable to use the 8250 module for PCMCIA or other 16C550-style
           UARTs.
 
-          Say N unless you need the z85c30 ports on your powermac
+          Say N unless you need the z85c30 ports on your (Power)Mac
           to appear as /dev/ttySn.
 
 config SERIAL_PMACZILOG_CONSOLE
-        bool "Console on PowerMac z85c30 serial port"
+        bool "Console on Mac or PowerMac z85c30 serial port"
         depends on SERIAL_PMACZILOG=y
         select SERIAL_CORE_CONSOLE
         help
           If you would like to be able to use the z85c30 serial port
-          on your PowerMac as the console, you can do so by answering
+          on your (Power)Mac as the console, you can do so by answering
           Y to this option.
 
 config SERIAL_LH7A40X
@@ -1435,42 +1439,37 @@ config SERIAL_BFIN_SPORT
           To compile this driver as a module, choose M here: the
           module will be called bfin_sport_uart.
 
-choice
-        prompt "Baud rate for Blackfin SPORT UART"
-        depends on SERIAL_BFIN_SPORT
-        default SERIAL_SPORT_BAUD_RATE_57600
-        help
-          Choose a baud rate for the SPORT UART, other uart settings are
-          8 bit, 1 stop bit, no parity, no flow control.
-
-config SERIAL_SPORT_BAUD_RATE_115200
-        bool "115200"
-
-config SERIAL_SPORT_BAUD_RATE_57600
-        bool "57600"
+config SERIAL_BFIN_SPORT_CONSOLE
+        bool "Console on Blackfin sport emulated uart"
+        depends on SERIAL_BFIN_SPORT=y
+        select SERIAL_CORE_CONSOLE
 
-config SERIAL_SPORT_BAUD_RATE_38400
-        bool "38400"
+config SERIAL_BFIN_SPORT0_UART
+        bool "Enable UART over SPORT0"
+        depends on SERIAL_BFIN_SPORT && !(BF542 || BF542M || BF544 || BF544M)
+        help
+          Enable UART over SPORT0
 
-config SERIAL_SPORT_BAUD_RATE_19200
-        bool "19200"
+config SERIAL_BFIN_SPORT1_UART
+        bool "Enable UART over SPORT1"
+        depends on SERIAL_BFIN_SPORT
+        help
+          Enable UART over SPORT1
 
-config SERIAL_SPORT_BAUD_RATE_9600
-        bool "9600"
-endchoice
+config SERIAL_BFIN_SPORT2_UART
+        bool "Enable UART over SPORT2"
+        depends on SERIAL_BFIN_SPORT && (BF54x || BF538 || BF539)
+        help
+          Enable UART over SPORT2
 
-config SPORT_BAUD_RATE
-        int
-        depends on SERIAL_BFIN_SPORT
-        default 115200 if (SERIAL_SPORT_BAUD_RATE_115200)
-        default 57600 if (SERIAL_SPORT_BAUD_RATE_57600)
-        default 38400 if (SERIAL_SPORT_BAUD_RATE_38400)
-        default 19200 if (SERIAL_SPORT_BAUD_RATE_19200)
-        default 9600 if (SERIAL_SPORT_BAUD_RATE_9600)
+config SERIAL_BFIN_SPORT3_UART
+        bool "Enable UART over SPORT3"
+        depends on SERIAL_BFIN_SPORT && (BF54x || BF538 || BF539)
+        help
+          Enable UART over SPORT3
 
 config SERIAL_TIMBERDALE
         tristate "Support for timberdale UART"
-        depends on MFD_TIMBERDALE
         select SERIAL_CORE
         ---help---
         Add support for UART controller on timberdale.