aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/serial.c
diff options
context:
space:
mode:
authorGovindraj.R <govindraj.raja@ti.com>2011-11-07 08:31:24 -0500
committerKevin Hilman <khilman@ti.com>2011-12-14 19:05:23 -0500
commit634bd6e4817cd6a7109be8d2eee5c578a283d1ee (patch)
tree87e72412115c2878ff949df41ce1f11be92adf7e /arch/arm/mach-omap2/serial.c
parent62f3ec5fbd5fddce62b7a71adc04723a5eb903da (diff)
ARM: OMAP2+: UART: Remove old and unused clocks handling funcs
With runtime adaptation done remove clock_enable/disbale API's Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
-rw-r--r--arch/arm/mach-omap2/serial.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index aa6f7f05a1e3..f94394fe5b16 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -56,8 +56,6 @@ struct omap_uart_state {
56 int num; 56 int num;
57 int can_sleep; 57 int can_sleep;
58 58
59 int clocked;
60
61 struct list_head node; 59 struct list_head node;
62 struct omap_hwmod *oh; 60 struct omap_hwmod *oh;
63 struct platform_device *pdev; 61 struct platform_device *pdev;
@@ -66,36 +64,8 @@ struct omap_uart_state {
66static LIST_HEAD(uart_list); 64static LIST_HEAD(uart_list);
67static u8 num_uarts; 65static u8 num_uarts;
68 66
69static inline void omap_uart_enable_clocks(struct omap_uart_state *uart)
70{
71 if (uart->clocked)
72 return;
73
74 omap_device_enable(uart->pdev);
75 uart->clocked = 1;
76 omap_uart_restore_context(uart);
77}
78
79#ifdef CONFIG_PM 67#ifdef CONFIG_PM
80 68
81static inline void omap_uart_disable_clocks(struct omap_uart_state *uart)
82{
83 if (!uart->clocked)
84 return;
85
86 omap_uart_save_context(uart);
87 uart->clocked = 0;
88 omap_device_idle(uart->pdev);
89}
90
91static void omap_uart_block_sleep(struct omap_uart_state *uart)
92{
93 omap_uart_enable_clocks(uart);
94
95 omap_uart_smart_idle_enable(uart, 0);
96 uart->can_sleep = 0;
97}
98
99int omap_uart_can_sleep(void) 69int omap_uart_can_sleep(void)
100{ 70{
101 struct omap_uart_state *uart; 71 struct omap_uart_state *uart;
@@ -154,11 +124,6 @@ static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)
154{} 124{}
155static void omap_uart_set_noidle(struct platform_device *pdev) {} 125static void omap_uart_set_noidle(struct platform_device *pdev) {}
156static void omap_uart_set_forceidle(struct platform_device *pdev) {} 126static void omap_uart_set_forceidle(struct platform_device *pdev) {}
157static void omap_uart_block_sleep(struct omap_uart_state *uart)
158{
159 /* Needed to enable UART clocks when built without CONFIG_PM */
160 omap_uart_enable_clocks(uart);
161}
162#endif /* CONFIG_PM */ 127#endif /* CONFIG_PM */
163 128
164#ifdef CONFIG_OMAP_MUX 129#ifdef CONFIG_OMAP_MUX
@@ -407,7 +372,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
407 omap_device_enable(uart->pdev); 372 omap_device_enable(uart->pdev);
408 omap_device_idle(uart->pdev); 373 omap_device_idle(uart->pdev);
409 374
410 omap_uart_block_sleep(uart);
411 console_unlock(); 375 console_unlock();
412 376
413 if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) 377 if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)