[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>
This commit is contained in:
parent
ffdf786291
commit
bc3a595988
3 changed files with 12 additions and 29 deletions
|
@ -10,11 +10,13 @@
|
||||||
#include <asm/arch/mmc.h>
|
#include <asm/arch/mmc.h>
|
||||||
#include <asm/arch/irda.h>
|
#include <asm/arch/irda.h>
|
||||||
#include <asm/arch/i2c.h>
|
#include <asm/arch/i2c.h>
|
||||||
|
#include <asm/arch/mfp-pxa27x.h>
|
||||||
#include <asm/arch/ohci.h>
|
#include <asm/arch/ohci.h>
|
||||||
#include <asm/arch/pxa27x_keypad.h>
|
#include <asm/arch/pxa27x_keypad.h>
|
||||||
#include <asm/arch/camera.h>
|
#include <asm/arch/camera.h>
|
||||||
|
|
||||||
#include "devices.h"
|
#include "devices.h"
|
||||||
|
#include "generic.h"
|
||||||
|
|
||||||
void __init pxa_register_device(struct platform_device *dev, void *data)
|
void __init pxa_register_device(struct platform_device *dev, void *data)
|
||||||
{
|
{
|
||||||
|
@ -233,8 +235,15 @@ struct platform_device pxa_device_i2c = {
|
||||||
.num_resources = ARRAY_SIZE(pxai2c_resources),
|
.num_resources = ARRAY_SIZE(pxai2c_resources),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static unsigned long pxa27x_i2c_mfp_cfg[] = {
|
||||||
|
GPIO117_I2C_SCL,
|
||||||
|
GPIO118_I2C_SDA,
|
||||||
|
};
|
||||||
|
|
||||||
void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
|
void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
|
||||||
{
|
{
|
||||||
|
if (cpu_is_pxa27x())
|
||||||
|
pxa2xx_mfp_config(ARRAY_AND_SIZE(pxa27x_i2c_mfp_cfg));
|
||||||
pxa_register_device(&pxa_device_i2c, info);
|
pxa_register_device(&pxa_device_i2c, info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -349,6 +349,9 @@ struct platform_device pxa27x_device_i2c_power = {
|
||||||
|
|
||||||
void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info)
|
void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info)
|
||||||
{
|
{
|
||||||
|
local_irq_disable();
|
||||||
|
PCFR |= PCFR_PI2CEN;
|
||||||
|
local_irq_enable();
|
||||||
pxa27x_device_i2c_power.dev.platform_data = info;
|
pxa27x_device_i2c_power.dev.platform_data = info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -945,32 +945,6 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
|
||||||
.functionality = i2c_pxa_functionality,
|
.functionality = i2c_pxa_functionality,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void i2c_pxa_enable(struct platform_device *dev)
|
|
||||||
{
|
|
||||||
if (cpu_is_pxa27x()) {
|
|
||||||
switch (dev->id) {
|
|
||||||
case 0:
|
|
||||||
pxa_gpio_mode(GPIO117_I2CSCL_MD);
|
|
||||||
pxa_gpio_mode(GPIO118_I2CSDA_MD);
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
local_irq_disable();
|
|
||||||
PCFR |= PCFR_PI2CEN;
|
|
||||||
local_irq_enable();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void i2c_pxa_disable(struct platform_device *dev)
|
|
||||||
{
|
|
||||||
if (cpu_is_pxa27x() && dev->id == 1) {
|
|
||||||
local_irq_disable();
|
|
||||||
PCFR &= ~PCFR_PI2CEN;
|
|
||||||
local_irq_enable();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define res_len(r) ((r)->end - (r)->start + 1)
|
#define res_len(r) ((r)->end - (r)->start + 1)
|
||||||
static int i2c_pxa_probe(struct platform_device *dev)
|
static int i2c_pxa_probe(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
|
@ -1036,7 +1010,6 @@ static int i2c_pxa_probe(struct platform_device *dev)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clk_enable(i2c->clk);
|
clk_enable(i2c->clk);
|
||||||
i2c_pxa_enable(dev);
|
|
||||||
|
|
||||||
if (plat) {
|
if (plat) {
|
||||||
i2c->adap.class = plat->class;
|
i2c->adap.class = plat->class;
|
||||||
|
@ -1080,7 +1053,6 @@ eadapt:
|
||||||
free_irq(irq, i2c);
|
free_irq(irq, i2c);
|
||||||
ereqirq:
|
ereqirq:
|
||||||
clk_disable(i2c->clk);
|
clk_disable(i2c->clk);
|
||||||
i2c_pxa_disable(dev);
|
|
||||||
iounmap(i2c->reg_base);
|
iounmap(i2c->reg_base);
|
||||||
eremap:
|
eremap:
|
||||||
clk_put(i2c->clk);
|
clk_put(i2c->clk);
|
||||||
|
@ -1103,7 +1075,6 @@ static int __exit i2c_pxa_remove(struct platform_device *dev)
|
||||||
|
|
||||||
clk_disable(i2c->clk);
|
clk_disable(i2c->clk);
|
||||||
clk_put(i2c->clk);
|
clk_put(i2c->clk);
|
||||||
i2c_pxa_disable(dev);
|
|
||||||
|
|
||||||
iounmap(i2c->reg_base);
|
iounmap(i2c->reg_base);
|
||||||
release_mem_region(i2c->iobase, i2c->iosize);
|
release_mem_region(i2c->iobase, i2c->iosize);
|
||||||
|
|
Reference in a new issue