X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fpm-debug.c;h=0b5c0445e7c9bc906926f3eb09140aab2c5c4e4c;hb=e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b;hp=1b14bcf6cb811d97b18f06e135cc3489fa5715df;hpb=d18eff5b5fa15e170794397a6a94486d1f774f77;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 1b14bcf6cb8..0b5c0445e7c 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -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;
 	}
 }