diff options
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 3d1c1d393f8f..9992dbfdfdb3 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -107,28 +107,6 @@ struct omap_uart_state { | |||
107 | static LIST_HEAD(uart_list); | 107 | static LIST_HEAD(uart_list); |
108 | static u8 num_uarts; | 108 | static u8 num_uarts; |
109 | 109 | ||
110 | static int uart_idle_hwmod(struct omap_device *od) | ||
111 | { | ||
112 | omap_hwmod_idle(od->hwmods[0]); | ||
113 | |||
114 | return 0; | ||
115 | } | ||
116 | |||
117 | static int uart_enable_hwmod(struct omap_device *od) | ||
118 | { | ||
119 | omap_hwmod_enable(od->hwmods[0]); | ||
120 | |||
121 | return 0; | ||
122 | } | ||
123 | |||
124 | static struct omap_device_pm_latency omap_uart_latency[] = { | ||
125 | { | ||
126 | .deactivate_func = uart_idle_hwmod, | ||
127 | .activate_func = uart_enable_hwmod, | ||
128 | .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, | ||
129 | }, | ||
130 | }; | ||
131 | |||
132 | static inline unsigned int __serial_read_reg(struct uart_port *up, | 110 | static inline unsigned int __serial_read_reg(struct uart_port *up, |
133 | int offset) | 111 | int offset) |
134 | { | 112 | { |
@@ -800,8 +778,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) | |||
800 | return; | 778 | return; |
801 | 779 | ||
802 | pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size, | 780 | pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size, |
803 | omap_uart_latency, | 781 | NULL, 0, false); |
804 | ARRAY_SIZE(omap_uart_latency), false); | ||
805 | WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n", | 782 | WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n", |
806 | name, oh->name); | 783 | name, oh->name); |
807 | 784 | ||