leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

Browse Source 
* '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.
This commit is contained in:
Linus Torvalds 2010-01-15 14:50:20 -08:00
commit 933a42b184
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sh/boards/mach-ecovec24/setup.c
View File

@ -353,6 +353,10 @@ static struct i2c_board_info i2c1_devices[] = {
{ {
I2C_BOARD_INFO("r2025sd", 0x32), I2C_BOARD_INFO("r2025sd", 0x32),
}, },
{
I2C_BOARD_INFO("lis3lv02d", 0x1c),
.irq = 33,
}
}; };
/* KEYSC */ /* KEYSC */
@ -1115,6 +1119,10 @@ static int __init arch_setup(void)
gpio_direction_output(GPIO_PTU0, 0); gpio_direction_output(GPIO_PTU0, 0);
mdelay(20); mdelay(20);
/* enable motion sensor */
gpio_request(GPIO_FN_INTC_IRQ1, NULL);
gpio_direction_input(GPIO_FN_INTC_IRQ1);
/* enable I2C device */ /* enable I2C device */
i2c_register_board_info(0, i2c0_devices, i2c_register_board_info(0, i2c0_devices,
ARRAY_SIZE(i2c0_devices)); ARRAY_SIZE(i2c0_devices));

13
drivers/serial/sh-sci.c
View File

@ -1052,7 +1052,18 @@ static void __devinit sci_init_single(struct platform_device *dev,
sci_port->port.ops = &sci_uart_ops; sci_port->port.ops = &sci_uart_ops;
sci_port->port.iotype = UPIO_MEM; sci_port->port.iotype = UPIO_MEM;
sci_port->port.line = index; 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) { if (dev) {
sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;