diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 12 | ||||
-rw-r--r-- | drivers/mmc/pxamci.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 12 | ||||
-rw-r--r-- | drivers/serial/pxa.c | 8 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 4 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 4 |
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) | |||
887 | pxa_gpio_mode(GPIO117_I2CSCL_MD); | 887 | pxa_gpio_mode(GPIO117_I2CSCL_MD); |
888 | pxa_gpio_mode(GPIO118_I2CSDA_MD); | 888 | pxa_gpio_mode(GPIO118_I2CSDA_MD); |
889 | #endif | 889 | #endif |
890 | pxa_set_cken(CKEN14_I2C, 1); | 890 | pxa_set_cken(CKEN_I2C, 1); |
891 | break; | 891 | break; |
892 | #ifdef CONFIG_PXA27x | 892 | #ifdef CONFIG_PXA27x |
893 | case 1: | 893 | case 1: |
894 | local_irq_disable(); | 894 | local_irq_disable(); |
895 | PCFR |= PCFR_PI2CEN; | 895 | PCFR |= PCFR_PI2CEN; |
896 | local_irq_enable(); | 896 | local_irq_enable(); |
897 | pxa_set_cken(CKEN15_PWRI2C, 1); | 897 | pxa_set_cken(CKEN_PWRI2C, 1); |
898 | #endif | 898 | #endif |
899 | } | 899 | } |
900 | 900 | ||
@@ -935,11 +935,11 @@ eadapt: | |||
935 | ereqirq: | 935 | ereqirq: |
936 | switch (dev->id) { | 936 | switch (dev->id) { |
937 | case 0: | 937 | case 0: |
938 | pxa_set_cken(CKEN14_I2C, 0); | 938 | pxa_set_cken(CKEN_I2C, 0); |
939 | break; | 939 | break; |
940 | #ifdef CONFIG_PXA27x | 940 | #ifdef CONFIG_PXA27x |
941 | case 1: | 941 | case 1: |
942 | pxa_set_cken(CKEN15_PWRI2C, 0); | 942 | pxa_set_cken(CKEN_PWRI2C, 0); |
943 | local_irq_disable(); | 943 | local_irq_disable(); |
944 | PCFR &= ~PCFR_PI2CEN; | 944 | PCFR &= ~PCFR_PI2CEN; |
945 | local_irq_enable(); | 945 | local_irq_enable(); |
@@ -962,11 +962,11 @@ static int i2c_pxa_remove(struct platform_device *dev) | |||
962 | free_irq(i2c->irq, i2c); | 962 | free_irq(i2c->irq, i2c); |
963 | switch (dev->id) { | 963 | switch (dev->id) { |
964 | case 0: | 964 | case 0: |
965 | pxa_set_cken(CKEN14_I2C, 0); | 965 | pxa_set_cken(CKEN_I2C, 0); |
966 | break; | 966 | break; |
967 | #ifdef CONFIG_PXA27x | 967 | #ifdef CONFIG_PXA27x |
968 | case 1: | 968 | case 1: |
969 | pxa_set_cken(CKEN15_PWRI2C, 0); | 969 | pxa_set_cken(CKEN_PWRI2C, 0); |
970 | local_irq_disable(); | 970 | local_irq_disable(); |
971 | PCFR &= ~PCFR_PI2CEN; | 971 | PCFR &= ~PCFR_PI2CEN; |
972 | local_irq_enable(); | 972 | 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) | |||
369 | if (CLOCKRATE / clk > ios->clock) | 369 | if (CLOCKRATE / clk > ios->clock) |
370 | clk <<= 1; | 370 | clk <<= 1; |
371 | host->clkrt = fls(clk) - 1; | 371 | host->clkrt = fls(clk) - 1; |
372 | pxa_set_cken(CKEN12_MMC, 1); | 372 | pxa_set_cken(CKEN_MMC, 1); |
373 | 373 | ||
374 | /* | 374 | /* |
375 | * we write clkrt on the next command | 375 | * we write clkrt on the next command |
376 | */ | 376 | */ |
377 | } else { | 377 | } else { |
378 | pxamci_stop_clock(host); | 378 | pxamci_stop_clock(host); |
379 | pxa_set_cken(CKEN12_MMC, 0); | 379 | pxa_set_cken(CKEN_MMC, 0); |
380 | } | 380 | } |
381 | 381 | ||
382 | if (host->power_mode != ios->power_mode) { | 382 | 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) | |||
134 | DCSR(si->rxdma) &= ~DCSR_RUN; | 134 | DCSR(si->rxdma) &= ~DCSR_RUN; |
135 | /* disable FICP */ | 135 | /* disable FICP */ |
136 | ICCR0 = 0; | 136 | ICCR0 = 0; |
137 | pxa_set_cken(CKEN13_FICP, 0); | 137 | pxa_set_cken(CKEN_FICP, 0); |
138 | 138 | ||
139 | /* set board transceiver to SIR mode */ | 139 | /* set board transceiver to SIR mode */ |
140 | si->pdata->transceiver_mode(si->dev, IR_SIRMODE); | 140 | si->pdata->transceiver_mode(si->dev, IR_SIRMODE); |
@@ -144,7 +144,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed) | |||
144 | pxa_gpio_mode(GPIO47_STTXD_MD); | 144 | pxa_gpio_mode(GPIO47_STTXD_MD); |
145 | 145 | ||
146 | /* enable the STUART clock */ | 146 | /* enable the STUART clock */ |
147 | pxa_set_cken(CKEN5_STUART, 1); | 147 | pxa_set_cken(CKEN_STUART, 1); |
148 | } | 148 | } |
149 | 149 | ||
150 | /* disable STUART first */ | 150 | /* disable STUART first */ |
@@ -169,7 +169,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed) | |||
169 | /* disable STUART */ | 169 | /* disable STUART */ |
170 | STIER = 0; | 170 | STIER = 0; |
171 | STISR = 0; | 171 | STISR = 0; |
172 | pxa_set_cken(CKEN5_STUART, 0); | 172 | pxa_set_cken(CKEN_STUART, 0); |
173 | 173 | ||
174 | /* disable FICP first */ | 174 | /* disable FICP first */ |
175 | ICCR0 = 0; | 175 | ICCR0 = 0; |
@@ -182,7 +182,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed) | |||
182 | pxa_gpio_mode(GPIO47_ICPTXD_MD); | 182 | pxa_gpio_mode(GPIO47_ICPTXD_MD); |
183 | 183 | ||
184 | /* enable the FICP clock */ | 184 | /* enable the FICP clock */ |
185 | pxa_set_cken(CKEN13_FICP, 1); | 185 | pxa_set_cken(CKEN_FICP, 1); |
186 | 186 | ||
187 | si->speed = speed; | 187 | si->speed = speed; |
188 | pxa_irda_fir_dma_rx_start(si); | 188 | pxa_irda_fir_dma_rx_start(si); |
@@ -593,7 +593,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si) | |||
593 | /* disable STUART SIR mode */ | 593 | /* disable STUART SIR mode */ |
594 | STISR = 0; | 594 | STISR = 0; |
595 | /* disable the STUART clock */ | 595 | /* disable the STUART clock */ |
596 | pxa_set_cken(CKEN5_STUART, 0); | 596 | pxa_set_cken(CKEN_STUART, 0); |
597 | 597 | ||
598 | /* disable DMA */ | 598 | /* disable DMA */ |
599 | DCSR(si->txdma) &= ~DCSR_RUN; | 599 | DCSR(si->txdma) &= ~DCSR_RUN; |
@@ -601,7 +601,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si) | |||
601 | /* disable FICP */ | 601 | /* disable FICP */ |
602 | ICCR0 = 0; | 602 | ICCR0 = 0; |
603 | /* disable the FICP clock */ | 603 | /* disable the FICP clock */ |
604 | pxa_set_cken(CKEN13_FICP, 0); | 604 | pxa_set_cken(CKEN_FICP, 0); |
605 | 605 | ||
606 | DRCMR17 = 0; | 606 | DRCMR17 = 0; |
607 | DRCMR18 = 0; | 607 | 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 = { | |||
717 | static struct uart_pxa_port serial_pxa_ports[] = { | 717 | static struct uart_pxa_port serial_pxa_ports[] = { |
718 | { /* FFUART */ | 718 | { /* FFUART */ |
719 | .name = "FFUART", | 719 | .name = "FFUART", |
720 | .cken = CKEN6_FFUART, | 720 | .cken = CKEN_FFUART, |
721 | .port = { | 721 | .port = { |
722 | .type = PORT_PXA, | 722 | .type = PORT_PXA, |
723 | .iotype = UPIO_MEM, | 723 | .iotype = UPIO_MEM, |
@@ -731,7 +731,7 @@ static struct uart_pxa_port serial_pxa_ports[] = { | |||
731 | }, | 731 | }, |
732 | }, { /* BTUART */ | 732 | }, { /* BTUART */ |
733 | .name = "BTUART", | 733 | .name = "BTUART", |
734 | .cken = CKEN7_BTUART, | 734 | .cken = CKEN_BTUART, |
735 | .port = { | 735 | .port = { |
736 | .type = PORT_PXA, | 736 | .type = PORT_PXA, |
737 | .iotype = UPIO_MEM, | 737 | .iotype = UPIO_MEM, |
@@ -745,7 +745,7 @@ static struct uart_pxa_port serial_pxa_ports[] = { | |||
745 | }, | 745 | }, |
746 | }, { /* STUART */ | 746 | }, { /* STUART */ |
747 | .name = "STUART", | 747 | .name = "STUART", |
748 | .cken = CKEN5_STUART, | 748 | .cken = CKEN_STUART, |
749 | .port = { | 749 | .port = { |
750 | .type = PORT_PXA, | 750 | .type = PORT_PXA, |
751 | .iotype = UPIO_MEM, | 751 | .iotype = UPIO_MEM, |
@@ -759,7 +759,7 @@ static struct uart_pxa_port serial_pxa_ports[] = { | |||
759 | }, | 759 | }, |
760 | }, { /* HWUART */ | 760 | }, { /* HWUART */ |
761 | .name = "HWUART", | 761 | .name = "HWUART", |
762 | .cken = CKEN4_HWUART, | 762 | .cken = CKEN_HWUART, |
763 | .port = { | 763 | .port = { |
764 | .type = PORT_PXA, | 764 | .type = PORT_PXA, |
765 | .iotype = UPIO_MEM, | 765 | .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) | |||
1497 | 1497 | ||
1498 | #ifdef CONFIG_ARCH_PXA | 1498 | #ifdef CONFIG_ARCH_PXA |
1499 | /* Disable clock for USB device */ | 1499 | /* Disable clock for USB device */ |
1500 | pxa_set_cken(CKEN11_USB, 0); | 1500 | pxa_set_cken(CKEN_USB, 0); |
1501 | #endif | 1501 | #endif |
1502 | 1502 | ||
1503 | ep0_idle (dev); | 1503 | ep0_idle (dev); |
@@ -1543,7 +1543,7 @@ static void udc_enable (struct pxa2xx_udc *dev) | |||
1543 | 1543 | ||
1544 | #ifdef CONFIG_ARCH_PXA | 1544 | #ifdef CONFIG_ARCH_PXA |
1545 | /* Enable clock for USB device */ | 1545 | /* Enable clock for USB device */ |
1546 | pxa_set_cken(CKEN11_USB, 1); | 1546 | pxa_set_cken(CKEN_USB, 1); |
1547 | udelay(5); | 1547 | udelay(5); |
1548 | #endif | 1548 | #endif |
1549 | 1549 | ||
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) | |||
80 | 80 | ||
81 | inf = dev->platform_data; | 81 | inf = dev->platform_data; |
82 | 82 | ||
83 | pxa_set_cken(CKEN10_USBHOST, 1); | 83 | pxa_set_cken(CKEN_USBHOST, 1); |
84 | 84 | ||
85 | UHCHR |= UHCHR_FHR; | 85 | UHCHR |= UHCHR_FHR; |
86 | udelay(11); | 86 | udelay(11); |
@@ -123,7 +123,7 @@ static void pxa27x_stop_hc(struct device *dev) | |||
123 | UHCCOMS |= 1; | 123 | UHCCOMS |= 1; |
124 | udelay(10); | 124 | udelay(10); |
125 | 125 | ||
126 | pxa_set_cken(CKEN10_USBHOST, 0); | 126 | pxa_set_cken(CKEN_USBHOST, 0); |
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||
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) | |||
803 | pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); | 803 | pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); |
804 | 804 | ||
805 | /* enable LCD controller clock */ | 805 | /* enable LCD controller clock */ |
806 | pxa_set_cken(CKEN16_LCD, 1); | 806 | pxa_set_cken(CKEN_LCD, 1); |
807 | 807 | ||
808 | /* Sequence from 11.7.10 */ | 808 | /* Sequence from 11.7.10 */ |
809 | LCCR3 = fbi->reg_lccr3; | 809 | LCCR3 = fbi->reg_lccr3; |
@@ -840,7 +840,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi) | |||
840 | remove_wait_queue(&fbi->ctrlr_wait, &wait); | 840 | remove_wait_queue(&fbi->ctrlr_wait, &wait); |
841 | 841 | ||
842 | /* disable LCD controller clock */ | 842 | /* disable LCD controller clock */ |
843 | pxa_set_cken(CKEN16_LCD, 0); | 843 | pxa_set_cken(CKEN_LCD, 0); |
844 | } | 844 | } |
845 | 845 | ||
846 | /* | 846 | /* |