tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds 933a42b1 976ae32b

+20 -1
unified split
+8
arch/sh/boards/mach-ecovec24/setup.c
··· 353 { 354 I2C_BOARD_INFO("r2025sd", 0x32), 355 }, 356 }; 357 358 /* KEYSC */ ··· 1118 gpio_request(GPIO_PTU0, NULL); 1119 gpio_direction_output(GPIO_PTU0, 0); 1120 mdelay(20); 1121 1122 /* enable I2C device */ 1123 i2c_register_board_info(0, i2c0_devices,
··· 353 { 354 I2C_BOARD_INFO("r2025sd", 0x32), 355 }, 356 + { 357 + I2C_BOARD_INFO("lis3lv02d", 0x1c), 358 + .irq = 33, 359 + } 360 }; 361 362 /* KEYSC */ ··· 1114 gpio_request(GPIO_PTU0, NULL); 1115 gpio_direction_output(GPIO_PTU0, 0); 1116 mdelay(20); 1117 + 1118 + /* enable motion sensor */ 1119 + gpio_request(GPIO_FN_INTC_IRQ1, NULL); 1120 + gpio_direction_input(GPIO_FN_INTC_IRQ1); 1121 1122 /* enable I2C device */ 1123 i2c_register_board_info(0, i2c0_devices,
+12 -1
drivers/serial/sh-sci.c
··· 1052 sci_port->port.ops = &sci_uart_ops; 1053 sci_port->port.iotype = UPIO_MEM; 1054 sci_port->port.line = index; 1055 - sci_port->port.fifosize = 1; 1056 1057 if (dev) { 1058 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;
··· 1052 sci_port->port.ops = &sci_uart_ops; 1053 sci_port->port.iotype = UPIO_MEM; 1054 sci_port->port.line = index; 1055 + 1056 + switch (p->type) { 1057 + case PORT_SCIFA: 1058 + sci_port->port.fifosize = 64; 1059 + break; 1060 + case PORT_SCIF: 1061 + sci_port->port.fifosize = 16; 1062 + break; 1063 + default: 1064 + sci_port->port.fifosize = 1; 1065 + break; 1066 + } 1067 1068 if (dev) { 1069 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;