mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
[ARM] pxa: register Power I2C device only when necessary
Signed-off-by: Eric Miao <eric.miao@marvell.com>
This commit is contained in:
parent
994642934d
commit
1475822052
2 changed files with 3 additions and 4 deletions
|
@ -324,7 +324,7 @@ void __init pxa27x_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;
|
||||
pxa_register_device(&pxa27x_device_i2c_power, info);
|
||||
}
|
||||
|
||||
static struct platform_device *devices[] __initdata = {
|
||||
|
@ -334,7 +334,6 @@ static struct platform_device *devices[] __initdata = {
|
|||
&pxa_device_stuart,
|
||||
&pxa_device_i2s,
|
||||
&pxa_device_rtc,
|
||||
&pxa27x_device_i2c_power,
|
||||
&pxa27x_device_ssp1,
|
||||
&pxa27x_device_ssp2,
|
||||
&pxa27x_device_ssp3,
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <mach/pm.h>
|
||||
#include <mach/dma.h>
|
||||
#include <mach/ssp.h>
|
||||
#include <mach/i2c.h>
|
||||
|
||||
#include "generic.h"
|
||||
#include "devices.h"
|
||||
|
@ -531,7 +532,7 @@ void __init pxa3xx_init_irq(void)
|
|||
|
||||
void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)
|
||||
{
|
||||
pxa3xx_device_i2c_power.dev.platform_data = info;
|
||||
pxa_register_device(&pxa3xx_device_i2c_power, info);
|
||||
}
|
||||
|
||||
static struct platform_device *devices[] __initdata = {
|
||||
|
@ -547,7 +548,6 @@ static struct platform_device *devices[] __initdata = {
|
|||
&pxa3xx_device_ssp4,
|
||||
&pxa27x_device_pwm0,
|
||||
&pxa27x_device_pwm1,
|
||||
&pxa3xx_device_i2c_power,
|
||||
};
|
||||
|
||||
static struct sys_device pxa3xx_sysdev[] = {
|
||||
|
|
Loading…
Reference in a new issue