[ARM] 4304/1: removes the unnecessary bit number from CKENnn_XXXX

This patch removes the unnecessary bit number from CKENnn_XXXX
definitions for PXA, so that

	CKEN0_PWM0 --> CKEN_PWM0
	CKEN1_PWM1 --> CKEN_PWM1
	...
	CKEN24_CAMERA --> CKEN_CAMERA

The reasons for the change of these defitions are:

1. they do not scale - they are currently valid for pxa2xx, but
definitely not valid for pxa3xx, e.g., pxa3xx has bit 3 for camera
instead of bit 24

2. they are unnecessary - the peripheral name within the definition
has already announced its usage, we don't need those bit numbers
to know which peripheral we are going to enable/disable clock for

3. they are inconvenient - think about this: a driver programmer
for pxa has to remember which bit in the CKEN register to turn
on/off

Another change in the patch is to make the definitions equal to its
clock bit index, so that

   #define CKEN_CAMERA  (24)

instead of

   #define CKEN_CAMERA  (1 << 24)

this change, however, will add a run-time bit shift operation in
pxa_set_cken(), but the benefit of this change is that it scales
when bit index exceeds 32, e.g., pxa3xx has two registers CKENA
and CKENB, totally 64 bit for this, suppose CAMERA clock enabling
bit is CKENB:10, one can simply define CKEN_CAMERA to be (32 + 10)
and so that pxa_set_cken() need minimum change to adapt to that.

Signed-off-by: eric miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

7 files changed, 24 insertions, 24 deletions

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 11c7477a0ffa..4443d3bb3fbf 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -887,14 +887,14 @@ static int i2c_pxa_probe(struct platform_device *dev)
                 pxa_gpio_mode(GPIO117_I2CSCL_MD);
                 pxa_gpio_mode(GPIO118_I2CSDA_MD);
 #endif
-                pxa_set_cken(CKEN14_I2C, 1);
+                pxa_set_cken(CKEN_I2C, 1);
                 break;
 #ifdef CONFIG_PXA27x
         case 1:
                 local_irq_disable();
                 PCFR |= PCFR_PI2CEN;
                 local_irq_enable();
-                pxa_set_cken(CKEN15_PWRI2C, 1);
+                pxa_set_cken(CKEN_PWRI2C, 1);
 #endif
         }
 
@@ -935,11 +935,11 @@ eadapt:
 ereqirq:
         switch (dev->id) {
         case 0:
-                pxa_set_cken(CKEN14_I2C, 0);
+                pxa_set_cken(CKEN_I2C, 0);
                 break;
 #ifdef CONFIG_PXA27x
         case 1:
-                pxa_set_cken(CKEN15_PWRI2C, 0);
+                pxa_set_cken(CKEN_PWRI2C, 0);
                 local_irq_disable();
                 PCFR &= ~PCFR_PI2CEN;
                 local_irq_enable();
@@ -962,11 +962,11 @@ static int i2c_pxa_remove(struct platform_device *dev)
         free_irq(i2c->irq, i2c);
         switch (dev->id) {
         case 0:
-                pxa_set_cken(CKEN14_I2C, 0);
+                pxa_set_cken(CKEN_I2C, 0);
                 break;
 #ifdef CONFIG_PXA27x
         case 1:
-                pxa_set_cken(CKEN15_PWRI2C, 0);
+                pxa_set_cken(CKEN_PWRI2C, 0);
                 local_irq_disable();
                 PCFR &= ~PCFR_PI2CEN;
                 local_irq_enable();
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 9774fc68b61a..fca894e55f4a 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -369,14 +369,14 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 if (CLOCKRATE / clk > ios->clock)
                         clk <<= 1;
                 host->clkrt = fls(clk) - 1;
-                pxa_set_cken(CKEN12_MMC, 1);
+                pxa_set_cken(CKEN_MMC, 1);
 
                 /*
                  * we write clkrt on the next command
                  */
         } else {
                 pxamci_stop_clock(host);
-                pxa_set_cken(CKEN12_MMC, 0);
+                pxa_set_cken(CKEN_MMC, 0);
         }
 
         if (host->power_mode != ios->power_mode) {
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 2272156af31e..d6d5361f0936 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -134,7 +134,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         DCSR(si->rxdma) &= ~DCSR_RUN;
                         /* disable FICP */
                         ICCR0 = 0;
-                        pxa_set_cken(CKEN13_FICP, 0);
+                        pxa_set_cken(CKEN_FICP, 0);
 
                         /* set board transceiver to SIR mode */
                         si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
@@ -144,7 +144,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         pxa_gpio_mode(GPIO47_STTXD_MD);
 
                         /* enable the STUART clock */
-                        pxa_set_cken(CKEN5_STUART, 1);
+                        pxa_set_cken(CKEN_STUART, 1);
                 }
 
                 /* disable STUART first */
@@ -169,7 +169,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 /* disable STUART */
                 STIER = 0;
                 STISR = 0;
-                pxa_set_cken(CKEN5_STUART, 0);
+                pxa_set_cken(CKEN_STUART, 0);
 
                 /* disable FICP first */
                 ICCR0 = 0;
@@ -182,7 +182,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 pxa_gpio_mode(GPIO47_ICPTXD_MD);
 
                 /* enable the FICP clock */
-                pxa_set_cken(CKEN13_FICP, 1);
+                pxa_set_cken(CKEN_FICP, 1);
 
                 si->speed = speed;
                 pxa_irda_fir_dma_rx_start(si);
@@ -593,7 +593,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         /* disable STUART SIR mode */
         STISR = 0;
         /* disable the STUART clock */
-        pxa_set_cken(CKEN5_STUART, 0);
+        pxa_set_cken(CKEN_STUART, 0);
 
         /* disable DMA */
         DCSR(si->txdma) &= ~DCSR_RUN;
@@ -601,7 +601,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         /* disable FICP */
         ICCR0 = 0;
         /* disable the FICP clock */
-        pxa_set_cken(CKEN13_FICP, 0);
+        pxa_set_cken(CKEN_FICP, 0);
 
         DRCMR17 = 0;
         DRCMR18 = 0;
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index d403aaa55092..e9c6cb391a23 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -717,7 +717,7 @@ struct uart_ops serial_pxa_pops = {
 static struct uart_pxa_port serial_pxa_ports[] = {
      {  /* FFUART */
         .name   = "FFUART",
-        .cken   = CKEN6_FFUART,
+        .cken   = CKEN_FFUART,
         .port   = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
@@ -731,7 +731,7 @@ static struct uart_pxa_port serial_pxa_ports[] = {
         },
   }, {  /* BTUART */
         .name   = "BTUART",
-        .cken   = CKEN7_BTUART,
+        .cken   = CKEN_BTUART,
         .port   = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
@@ -745,7 +745,7 @@ static struct uart_pxa_port serial_pxa_ports[] = {
         },
   }, {  /* STUART */
         .name   = "STUART",
-        .cken   = CKEN5_STUART,
+        .cken   = CKEN_STUART,
         .port   = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
@@ -759,7 +759,7 @@ static struct uart_pxa_port serial_pxa_ports[] = {
         },
   }, {  /* HWUART */
         .name   = "HWUART",
-        .cken   = CKEN4_HWUART,
+        .cken   = CKEN_HWUART,
         .port = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index f01890dc8751..018b0d65765a 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -1497,7 +1497,7 @@ static void udc_disable(struct pxa2xx_udc *dev)
 
 #ifdef  CONFIG_ARCH_PXA
         /* Disable clock for USB device */
-        pxa_set_cken(CKEN11_USB, 0);
+        pxa_set_cken(CKEN_USB, 0);
 #endif
 
         ep0_idle (dev);
@@ -1543,7 +1543,7 @@ static void udc_enable (struct pxa2xx_udc *dev)
 
 #ifdef  CONFIG_ARCH_PXA
         /* Enable clock for USB device */
-        pxa_set_cken(CKEN11_USB, 1);
+        pxa_set_cken(CKEN_USB, 1);
         udelay(5);
 #endif
 
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index f1563dc319d3..23d2fe5a62f4 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -80,7 +80,7 @@ static int pxa27x_start_hc(struct device *dev)
 
         inf = dev->platform_data;
 
-        pxa_set_cken(CKEN10_USBHOST, 1);
+        pxa_set_cken(CKEN_USBHOST, 1);
 
         UHCHR |= UHCHR_FHR;
         udelay(11);
@@ -123,7 +123,7 @@ static void pxa27x_stop_hc(struct device *dev)
         UHCCOMS |= 1;
         udelay(10);
 
-        pxa_set_cken(CKEN10_USBHOST, 0);
+        pxa_set_cken(CKEN_USBHOST, 0);
 }
 
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index b4947c810706..0b195f33f84f 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -803,7 +803,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
         pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
         /* enable LCD controller clock */
-        pxa_set_cken(CKEN16_LCD, 1);
+        pxa_set_cken(CKEN_LCD, 1);
 
         /* Sequence from 11.7.10 */
         LCCR3 = fbi->reg_lccr3;
@@ -840,7 +840,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
         remove_wait_queue(&fbi->ctrlr_wait, &wait);
 
         /* disable LCD controller clock */
-        pxa_set_cken(CKEN16_LCD, 0);
+        pxa_set_cken(CKEN_LCD, 0);
 }
 
 /*