openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for_3.4/cleanup/uart' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart

This commit is contained in:
Tony Lindgren 2012-03-06 16:37:49 -08:00
parent b01543dfe6 7cb034f817
commit dd713e97f7
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/pm.h
View File

@ -18,7 +18,6 @@
extern void *omap3_secure_ram_storage;
extern void omap3_pm_off_mode_enable(int);
extern void omap_sram_idle(void);
extern int omap3_can_sleep(void);
extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
extern int omap3_idle_init(void);
extern int omap4_idle_init(void);

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

@ -54,11 +54,9 @@
struct omap_uart_state {
int num;
int can_sleep;
struct list_head node;
struct omap_hwmod *oh;
struct platform_device *pdev;
};
static LIST_HEAD(uart_list);
@ -381,8 +379,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
uart->pdev = pdev;
oh->dev_attr = uart;
if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)

1
arch/arm/plat-omap/include/plat/serial.h
View File

@ -110,7 +110,6 @@ struct omap_board_data;
struct omap_uart_port_info;
extern void omap_serial_init(void);
extern int omap_uart_can_sleep(void);
extern void omap_serial_board_init(struct omap_uart_port_info *platform_data);
extern void omap_serial_init_port(struct omap_board_data *bdata,
struct omap_uart_port_info *platform_data);