diff options
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-gta02.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 74906101c42..c78ada3eb7c 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -98,6 +98,16 @@ /* arbitrates which sensor IRQ owns the shared SPI bus */ static spinlock_t motion_irq_lock; +static struct pcf50633_platform_data gta02_pcf_pdata; + +static struct i2c_board_info gta02_i2c_devs[] __initdata = { + { + I2C_BOARD_INFO("pcf50633", 0x73), + .irq = GTA02_IRQ_PCF50633, + .platform_data = >a02_pcf_pdata, + }, +}; + static int gta02_charger_online_status; static int gta02_charger_active_status; @@ -756,21 +766,6 @@ struct platform_device gta02_pmu_dev = { }, }; -/* FIQ */ - -static struct resource sc32440_fiq_resources[] = { - [0] = { - .flags = IORESOURCE_IRQ, - .start = IRQ_TIMER3, - .end = IRQ_TIMER3, - }, -}; - -struct platform_device sc32440_fiq_device = { - .name = "sc32440_fiq", - .num_resources = 1, - .resource = sc32440_fiq_resources, -}; #ifdef CONFIG_GTA02_HDQ /* HDQ */ @@ -926,12 +921,6 @@ struct platform_device s3c24xx_pwm_device = { .num_resources = 0, }; -static struct i2c_board_info gta02_i2c_devs[] __initdata = { - { - I2C_BOARD_INFO("wm8753", 0x1a), - }, -}; - static struct s3c2410_nand_set gta02_nand_sets[] = { [0] = { .name = "neo1973-nand", @@ -1582,6 +1571,7 @@ static struct platform_device *gta02_devices[] __initdata = { &s3c24xx_pwm_device, >a02_led_dev, >a02_pm_wlan_dev, /* not dependent on PMU */ + >a02_pmu_dev, &s3c_device_iis, &s3c_device_i2c, @@ -1677,9 +1667,8 @@ static void __init gta02_machine_init(void) mangle_pmu_pdata_by_system_rev(); platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); - - i2c_register_board_info(0, gta02_i2c_devs, - ARRAY_SIZE(gta02_i2c_devs)); +// i2c_register_board_info(0, gta02_i2c_devs, +// ARRAY_SIZE(gta02_i2c_devs)); s3c2410_pm_init(); |