lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'omap3-upstream' into for-next

Browse Source 
Conflicts:
	arch/arm/mach-omap2/serial.c
This commit is contained in:
Tony Lindgren
2009-05-28 15:44:54 -07:00
parent c81592ba1b 4a899d5e93
commit 970a724d91
10 changed files with 352 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/mach-omap2/serial.c
View File

@ -469,9 +469,17 @@ static struct kobj_attribute sleep_timeout_attr =
static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}
#endif /* CONFIG_PM */
static struct platform_device serial_device = {
.name = "serial8250",
.id = PLAT8250_DEV_PLATFORM,
.dev = {
.platform_data = serial_platform_data,
},
};
void __init omap_serial_init(void)
{
int i;
int i, err;
const struct omap_uart_config *info;
char name[16];
@ -522,27 +530,14 @@ void __init omap_serial_init(void)
omap_uart_reset(uart);
omap_uart_idle_init(uart);
}
}
static struct platform_device serial_device = {
.name = "serial8250",
.id = PLAT8250_DEV_PLATFORM,
.dev = {
.platform_data = serial_platform_data,
},
};
static int __init omap_init(void)
{
int ret;
ret = platform_device_register(&serial_device);
err = platform_device_register(&serial_device);
#ifdef CONFIG_PM
if (!ret)
ret = sysfs_create_file(&serial_device.dev.kobj,
if (!err)
err = sysfs_create_file(&serial_device.dev.kobj,
&sleep_timeout_attr.attr);
#endif
return ret;
}
arch_initcall(omap_init);