aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2008-06-02 13:49:27 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-06-02 14:33:25 -0400
commitbc3a595988468b8a9c2526b9fb8d7bcaa27cc1a7 (patch)
treed1fa30150aae6f5559311ebc8859babcd9479d08 /drivers/i2c/busses
parentffdf786291636137ef2d51c3a5d340793032aa28 (diff)
[ARM] 5075/1: i2c-pxa: move i2c pin setup and PCFR_PI2CEN handling into arch/arm/mach-pxa
This fixes a build error introduced when the power manager register definitions were moved into pxa2xx-regs.h. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index eb69fbadc9cb..9f61e9b3a327 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -945,32 +945,6 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
945 .functionality = i2c_pxa_functionality, 945 .functionality = i2c_pxa_functionality,
946}; 946};
947 947
948static void i2c_pxa_enable(struct platform_device *dev)
949{
950 if (cpu_is_pxa27x()) {
951 switch (dev->id) {
952 case 0:
953 pxa_gpio_mode(GPIO117_I2CSCL_MD);
954 pxa_gpio_mode(GPIO118_I2CSDA_MD);
955 break;
956 case 1:
957 local_irq_disable();
958 PCFR |= PCFR_PI2CEN;
959 local_irq_enable();
960 break;
961 }
962 }
963}
964
965static void i2c_pxa_disable(struct platform_device *dev)
966{
967 if (cpu_is_pxa27x() && dev->id == 1) {
968 local_irq_disable();
969 PCFR &= ~PCFR_PI2CEN;
970 local_irq_enable();
971 }
972}
973
974#define res_len(r) ((r)->end - (r)->start + 1) 948#define res_len(r) ((r)->end - (r)->start + 1)
975static int i2c_pxa_probe(struct platform_device *dev) 949static int i2c_pxa_probe(struct platform_device *dev)
976{ 950{
@@ -1036,7 +1010,6 @@ static int i2c_pxa_probe(struct platform_device *dev)
1036#endif 1010#endif
1037 1011
1038 clk_enable(i2c->clk); 1012 clk_enable(i2c->clk);
1039 i2c_pxa_enable(dev);
1040 1013
1041 if (plat) { 1014 if (plat) {
1042 i2c->adap.class = plat->class; 1015 i2c->adap.class = plat->class;
@@ -1080,7 +1053,6 @@ eadapt:
1080 free_irq(irq, i2c); 1053 free_irq(irq, i2c);
1081ereqirq: 1054ereqirq:
1082 clk_disable(i2c->clk); 1055 clk_disable(i2c->clk);
1083 i2c_pxa_disable(dev);
1084 iounmap(i2c->reg_base); 1056 iounmap(i2c->reg_base);
1085eremap: 1057eremap:
1086 clk_put(i2c->clk); 1058 clk_put(i2c->clk);
@@ -1103,7 +1075,6 @@ static int __exit i2c_pxa_remove(struct platform_device *dev)
1103 1075
1104 clk_disable(i2c->clk); 1076 clk_disable(i2c->clk);
1105 clk_put(i2c->clk); 1077 clk_put(i2c->clk);
1106 i2c_pxa_disable(dev);
1107 1078
1108 iounmap(i2c->reg_base); 1079 iounmap(i2c->reg_base);
1109 release_mem_region(i2c->iobase, i2c->iosize); 1080 release_mem_region(i2c->iobase, i2c->iosize);