OMAP clock: drop clk_get_usecount()

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / pm-debug.c

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 1b14bcf6cb811d97b18f06e135cc3489fa5715df..0832e05520e403149fe3b2ad11fc241d42ee11b8 100644 (file)
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -93,7 +93,7 @@ void serial_console_sleep(int enable)
 
        if (enable) {
                BUG_ON(serial_console_clock_disabled);
-               if (clk_get_usecount(console_fclk) == 0)
+               if (console_fclk->usecount == 0)
                        return;
                if ((int) serial_console_next_disable - (int) omap2_read_32k_sync_counter() >= 0)
                        return;
@@ -108,17 +108,17 @@ void serial_console_sleep(int enable)
                switch (serial_console_uart)  {
                case 1:
                        l = prm_read_mod_reg(CORE_MOD, PM_WKST1);
-                       if (l & OMAP24XX_ST_UART1)
+                       if (l & OMAP24XX_ST_UART1_MASK)
                                serial_wakeup = 1;
                        break;
                case 2:
                        l = prm_read_mod_reg(CORE_MOD, PM_WKST1);
-                       if (l & OMAP24XX_ST_UART2)
+                       if (l & OMAP24XX_ST_UART2_MASK)
                                serial_wakeup = 1;
                        break;
                case 3:
                        l = prm_read_mod_reg(CORE_MOD, OMAP24XX_PM_WKST2);
-                       if (l & OMAP24XX_ST_UART3)
+                       if (l & OMAP24XX_ST_UART3_MASK)
                                serial_wakeup = 1;
                        break;
                }
@@ -158,13 +158,16 @@ void pm_init_serial_console(void)
        }
        switch (serial_console_uart) {
        case 1:
-               prm_set_mod_reg_bits(OMAP24XX_ST_UART1, CORE_MOD, PM_WKEN1);
+               prm_set_mod_reg_bits(OMAP24XX_ST_UART1_MASK, CORE_MOD,
+                                    PM_WKEN1);
                break;
        case 2:
-               prm_set_mod_reg_bits(OMAP24XX_ST_UART2, CORE_MOD, PM_WKEN1);
+               prm_set_mod_reg_bits(OMAP24XX_ST_UART2_MASK, CORE_MOD,
+                                    PM_WKEN1);
                break;
        case 3:
-               prm_set_mod_reg_bits(OMAP24XX_ST_UART3, CORE_MOD, OMAP24XX_PM_WKEN2);
+               prm_set_mod_reg_bits(OMAP24XX_ST_UART3_MASK, CORE_MOD,
+                                    OMAP24XX_PM_WKEN2);
                break;
        }
 }