aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-pxa.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c12
1 files changed, 6 insertions, 6 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:
935ereqirq: 935ereqirq:
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();