diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:50:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:50:20 -0800 |
| commit | 933a42b1842d0b7bc7e4e16f2f5f1099e72870d4 (patch) | |
| tree | 095ff1c7d7f504fe706d5f5f39b476535e6f4be5 | |
| parent | 976ae32be45a736acd49215a7e4771ff91f161c3 (diff) | |
| parent | 75136d48e85915fd78a072f22897622b5d4c1814 (diff) | |
| download | op-kernel-dev-933a42b1842d0b7bc7e4e16f2f5f1099e72870d4.zip op-kernel-dev-933a42b1842d0b7bc7e4e16f2f5f1099e72870d4.tar.gz | |
Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
serial: sh-sci: using correct fifo size for SCIF and SCIFA ports.
sh: mach-ecovec24: Add motion sensor driver support.
| -rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 8 | ||||
| -rw-r--r-- | drivers/serial/sh-sci.c | 13 |
2 files changed, 20 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 6a8861b..5c24628 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -353,6 +353,10 @@ static struct i2c_board_info i2c1_devices[] = { { I2C_BOARD_INFO("r2025sd", 0x32), }, + { + I2C_BOARD_INFO("lis3lv02d", 0x1c), + .irq = 33, + } }; /* KEYSC */ @@ -1115,6 +1119,10 @@ static int __init arch_setup(void) gpio_direction_output(GPIO_PTU0, 0); mdelay(20); + /* enable motion sensor */ + gpio_request(GPIO_FN_INTC_IRQ1, NULL); + gpio_direction_input(GPIO_FN_INTC_IRQ1); + /* enable I2C device */ i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 37f0de9..42f3333 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -1052,7 +1052,18 @@ static void __devinit sci_init_single(struct platform_device *dev, sci_port->port.ops = &sci_uart_ops; sci_port->port.iotype = UPIO_MEM; sci_port->port.line = index; - sci_port->port.fifosize = 1; + + switch (p->type) { + case PORT_SCIFA: + sci_port->port.fifosize = 64; + break; + case PORT_SCIF: + sci_port->port.fifosize = 16; + break; + default: + sci_port->port.fifosize = 1; + break; + } if (dev) { sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; |
