aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c8
-rw-r--r--drivers/serial/sh-sci.c13
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 6a8861b39f05..5c246289b4f0 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[] = {
353 { 353 {
354 I2C_BOARD_INFO("r2025sd", 0x32), 354 I2C_BOARD_INFO("r2025sd", 0x32),
355 }, 355 },
356 {
357 I2C_BOARD_INFO("lis3lv02d", 0x1c),
358 .irq = 33,
359 }
356}; 360};
357 361
358/* KEYSC */ 362/* KEYSC */
@@ -1115,6 +1119,10 @@ static int __init arch_setup(void)
1115 gpio_direction_output(GPIO_PTU0, 0); 1119 gpio_direction_output(GPIO_PTU0, 0);
1116 mdelay(20); 1120 mdelay(20);
1117 1121
1122 /* enable motion sensor */
1123 gpio_request(GPIO_FN_INTC_IRQ1, NULL);
1124 gpio_direction_input(GPIO_FN_INTC_IRQ1);
1125
1118 /* enable I2C device */ 1126 /* enable I2C device */
1119 i2c_register_board_info(0, i2c0_devices, 1127 i2c_register_board_info(0, i2c0_devices,
1120 ARRAY_SIZE(i2c0_devices)); 1128 ARRAY_SIZE(i2c0_devices));
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 37f0de9dd9ce..42f3333c4ad0 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,
1052 sci_port->port.ops = &sci_uart_ops; 1052 sci_port->port.ops = &sci_uart_ops;
1053 sci_port->port.iotype = UPIO_MEM; 1053 sci_port->port.iotype = UPIO_MEM;
1054 sci_port->port.line = index; 1054 sci_port->port.line = index;
1055 sci_port->port.fifosize = 1; 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 }
1056 1067
1057 if (dev) { 1068 if (dev) {
1058 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; 1069 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;