diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-06-02 13:49:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-06-02 14:33:25 -0400 |
commit | bc3a595988468b8a9c2526b9fb8d7bcaa27cc1a7 (patch) | |
tree | d1fa30150aae6f5559311ebc8859babcd9479d08 /arch/arm/mach-pxa/pxa27x.c | |
parent | ffdf786291636137ef2d51c3a5d340793032aa28 (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 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index cdaf573e0f17..48cbdc771a80 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -349,6 +349,9 @@ struct platform_device pxa27x_device_i2c_power = { | |||
349 | 349 | ||
350 | void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) | 350 | void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) |
351 | { | 351 | { |
352 | local_irq_disable(); | ||
353 | PCFR |= PCFR_PI2CEN; | ||
354 | local_irq_enable(); | ||
352 | pxa27x_device_i2c_power.dev.platform_data = info; | 355 | pxa27x_device_i2c_power.dev.platform_data = info; |
353 | } | 356 | } |
354 | 357 | ||