A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

Browse source 
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (51 commits)
  [ARM] 5308/1: Fix Viper ISA IRQ handling
  [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error
  [ARM] 5306/1: pxa: fix build error on CM-X270
  [ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
  [ARM] 5305/1: ARM: OMAP: Fix compile of McBSP by removing unnecessary check
  [ARM] 5301/1: ARM: OMAP: Add missing irq defines
  ARM: OMAP3: Add default kernel config for OMAP LDP
  ARM: OMAP3: Add basic board support for OMAP LDP
  ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)
  ARM: OMAP3: Add support for the Gumstix Overo board (rev 3)
  ARM: OMAP3: Add Beagle defconfig
  ARM: OMAP3: Add minimal Beagle board support
  ARM: OMAP3: Add minimal omap3430 support
  ARM: OMAP2: Fix sparse, checkpatch warnings in OMAP2/3 IRQ code
  ARM: OMAP: Fixes to omap_mcbsp_request function
  ARM: OMAP: Add support for OMAP2430 in McBSP
  ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
  ARM: OMAP: Allocate McBSP devices dynamically
  Fix sections for omap-mcbsp platform driver
  [ARM] S3C24XX: Additional include moves
  ...
This commit is contained in:
Linus Torvalds 2008-10-16 11:25:32 -07:00
commit 8ef50901d3
193 changed files with 10914 additions and 1140 deletions
Download patch file Download diff file Expand all files Collapse all files

23
drivers/serial/8250.c
View file

@ -2223,9 +2223,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
serial_outp(up, UART_EFR, efr);
}
#ifdef CONFIG_ARCH_OMAP15XX
#ifdef CONFIG_ARCH_OMAP
/* Workaround to enable 115200 baud on OMAP1510 internal ports */
if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) {
if (cpu_is_omap1510() && is_omap_port(up)) {
if (baud == 115200) {
quot = 1;
serial_out(up, UART_OMAP_OSC_12M_SEL, 1);
@ -2278,18 +2278,27 @@ serial8250_pm(struct uart_port *port, unsigned int state,
p->pm(port, state, oldstate);
}
static unsigned int serial8250_port_size(struct uart_8250_port *pt)
{
if (pt->port.iotype == UPIO_AU)
return 0x100000;
#ifdef CONFIG_ARCH_OMAP
if (is_omap_port(pt))
return 0x16 << pt->port.regshift;
#endif
return 8 << pt->port.regshift;
}
/*
* Resource handling.
*/
static int serial8250_request_std_resource(struct uart_8250_port *up)
{
unsigned int size = 8 << up->port.regshift;
unsigned int size = serial8250_port_size(up);
int ret = 0;
switch (up->port.iotype) {
case UPIO_AU:
size = 0x100000;
/* fall thru */
case UPIO_TSI:
case UPIO_MEM32:
case UPIO_MEM:
@ -2323,12 +2332,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
static void serial8250_release_std_resource(struct uart_8250_port *up)
{
unsigned int size = 8 << up->port.regshift;
unsigned int size = serial8250_port_size(up);
switch (up->port.iotype) {
case UPIO_AU:
size = 0x100000;
/* fall thru */
case UPIO_TSI:
case UPIO_MEM32:
case UPIO_MEM:

2
drivers/serial/s3c2400.c
View file

@ -19,7 +19,7 @@
#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include "samsung.h"

2
drivers/serial/s3c2410.c
View file

@ -21,7 +21,7 @@
#include <asm/irq.h>
#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include "samsung.h"

2
drivers/serial/s3c2412.c
View file

@ -21,7 +21,7 @@
#include <asm/irq.h>
#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include "samsung.h"

2
drivers/serial/s3c2440.c
View file

@ -21,7 +21,7 @@
#include <asm/irq.h>
#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include "samsung.h"

2
drivers/serial/samsung.c
View file

@ -47,7 +47,7 @@
#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include "samsung.h"