diff options
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 37 | ||||
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 12 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 2 |
3 files changed, 21 insertions, 30 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(); diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index acc7011276a..ca73f8a57c9 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -2123,6 +2123,8 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) int err = 0; int irq; + printk(KERN_INFO "************ pcf50633_detect\n"); + DEBUGP("entering\n"); if (!pcf50633_pdev) { printk(KERN_ERR "pcf50633: driver needs a platform_device!\n"); @@ -2224,10 +2226,10 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) * LEDOUT register can be reset by disabling and enabling the * LED converter via control bit led_on in the LEDENA register" */ - pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x00); - pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); - pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01); - pcf50633_reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); + reg_write(pcf, PCF50633_REG_LEDENA, 0x00); + reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); + reg_write(pcf, PCF50633_REG_LEDENA, 0x01); + reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING, "pcf50633", pcf); @@ -2298,7 +2300,7 @@ exit_free: static int pcf50633_attach_adapter(struct i2c_adapter *adapter) { - DEBUGP("entering, calling i2c_probe\n"); + printk(KERN_ERR "**** entering pcf50633_attach_adapter, calling i2c_probe\n"); return i2c_probe(adapter, &addr_data, &pcf50633_detect); } diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 69ac7af834c..00e3c5c5ccd 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -735,7 +735,7 @@ static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) glamo_mci_send_request(mmc); } -#if 0 +#if 1 static void glamo_mci_reset(struct glamo_mci_host *host) { if (host->suspending) { |