6 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index b8cb79f899d5..64b08b744f9f 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -164,9 +164,9 @@ void pxa_set_cken(int clock, int enable)
         local_irq_save(flags);
 
         if (enable)
-                CKEN |= clock;
+                CKEN |= (1 << clock);
         else
-                CKEN &= ~clock;
+                CKEN &= ~(1 << clock);
 
         local_irq_restore(flags);
 }
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 8e27a64fa9f4..e3097664ffe1 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -234,7 +234,7 @@ static void lpd270_backlight_power(int on)
 {
         if (on) {
                 pxa_gpio_mode(GPIO16_PWM0_MD);
-                pxa_set_cken(CKEN0_PWM0, 1);
+                pxa_set_cken(CKEN_PWM0, 1);
                 PWM_CTRL0 = 0;
                 PWM_PWDUTY0 = 0x3ff;
                 PWM_PERVAL0 = 0x3ff;
@@ -242,7 +242,7 @@ static void lpd270_backlight_power(int on)
                 PWM_CTRL0 = 0;
                 PWM_PWDUTY0 = 0x0;
                 PWM_PERVAL0 = 0x3FF;
-                pxa_set_cken(CKEN0_PWM0, 0);
+                pxa_set_cken(CKEN_PWM0, 0);
         }
 }
 
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 055de7f4f00a..6377b2e29ff0 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -220,7 +220,7 @@ static struct resource pxa_ssp_resources[] = {
 
 static struct pxa2xx_spi_master pxa_ssp_master_info = {
         .ssp_type       = PXA25x_SSP,
-        .clock_enable   = CKEN3_SSP,
+        .clock_enable   = CKEN_SSP,
         .num_chipselect = 0,
 };
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 56d94d88d5ca..ed99a81b98f3 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -266,7 +266,7 @@ static void mainstone_backlight_power(int on)
 {
         if (on) {
                 pxa_gpio_mode(GPIO16_PWM0_MD);
-                pxa_set_cken(CKEN0_PWM0, 1);
+                pxa_set_cken(CKEN_PWM0, 1);
                 PWM_CTRL0 = 0;
                 PWM_PWDUTY0 = 0x3ff;
                 PWM_PERVAL0 = 0x3ff;
@@ -274,7 +274,7 @@ static void mainstone_backlight_power(int on)
                 PWM_CTRL0 = 0;
                 PWM_PWDUTY0 = 0x0;
                 PWM_PERVAL0 = 0x3FF;
-                pxa_set_cken(CKEN0_PWM0, 0);
+                pxa_set_cken(CKEN_PWM0, 0);
         }
 }
 
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 74eeada1e2fc..c64bab49efc4 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -140,9 +140,9 @@ void pxa_cpu_pm_enter(suspend_state_t state)
         extern void pxa_cpu_resume(void);
 
         if (state == PM_SUSPEND_STANDBY)
-                CKEN = CKEN22_MEMC | CKEN9_OSTIMER | CKEN16_LCD |CKEN0_PWM0;
+                CKEN = CKEN_MEMC | CKEN_OSTIMER | CKEN_LCD | CKEN_PWM0;
         else
-                CKEN = CKEN22_MEMC | CKEN9_OSTIMER;
+                CKEN = CKEN_MEMC | CKEN_OSTIMER;
 
         /* ensure voltage-change sequencer not initiated, which hangs */
         PCFR &= ~PCFR_FVC;
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c
index 6cc202755fb4..71766ac0328b 100644
--- a/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/mach-pxa/ssp.c
@@ -52,13 +52,13 @@ struct ssp_info_ {
  */
 static const struct ssp_info_ ssp_info[PXA_SSP_PORTS] = {
 #if defined (CONFIG_PXA27x)
-        {IRQ_SSP,       CKEN23_SSP1},
-        {IRQ_SSP2,      CKEN3_SSP2},
-        {IRQ_SSP3,      CKEN4_SSP3},
+        {IRQ_SSP,       CKEN_SSP1},
+        {IRQ_SSP2,      CKEN_SSP2},
+        {IRQ_SSP3,      CKEN_SSP3},
 #else
-        {IRQ_SSP,       CKEN3_SSP},
-        {IRQ_NSSP,      CKEN9_NSSP},
-        {IRQ_ASSP,      CKEN10_ASSP},
+        {IRQ_SSP,       CKEN_SSP},
+        {IRQ_NSSP,      CKEN_NSSP},
+        {IRQ_ASSP,      CKEN_ASSP},
 #endif
 };