diff options
| -rw-r--r-- | arch/arm/mach-s3c2440/fiq_c_isr.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 53 | ||||
| -rw-r--r-- | drivers/base/power/main.c | 8 | ||||
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 14 | ||||
| -rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 8 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 8 |
7 files changed, 22 insertions, 72 deletions
diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c index 148850582b7..43fd6b53205 100644 --- a/arch/arm/mach-s3c2440/fiq_c_isr.c +++ b/arch/arm/mach-s3c2440/fiq_c_isr.c @@ -215,6 +215,7 @@ EXPORT_SYMBOL_GPL(fiq_kick); static int __init sc32440_fiq_probe(struct platform_device *pdev) { struct resource *r = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + struct sc32440_fiq_platform_data *pdata = pdev->dev.platform_data; int ret; if (!r) diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 5fa837751e3..a536638352c 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -929,25 +929,6 @@ static struct i2c_board_info gta02_i2c_devs[] __initdata = { }, }; -static struct platform_device *gta02_devices[] __initdata = { - &s3c_device_usb, - &s3c_device_wdt, - &s3c_device_i2c, - &s3c_device_iis, - // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */ - &s3c_device_usbgadget, - &s3c_device_nand, - &s3c_device_ts, - >a02_nor_flash, - &sc32440_fiq_device, - >a02_version_device, - >a02_memconfig_device, - >a02_resume_reason_device, - &s3c24xx_pwm_device, - >a02_pm_wlan_dev, /* not dependent on PMU */ - -}; - static struct s3c2410_nand_set gta02_nand_sets[] = { [0] = { .name = "neo1973-nand", @@ -1589,31 +1570,30 @@ static struct platform_device *gta02_devices[] __initdata = { // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */ &s3c_device_usbgadget, &s3c_device_nand, - &s3c_device_ts, >a02_nor_flash, &sc32440_fiq_device, &s3c24xx_pwm_device, - >a02_pm_wlan_dev, + >a02_led_dev, + >a02_pm_wlan_dev, /* not dependent on PMU */ &s3c_device_iis, - >a02_pmu_dev, &s3c_device_i2c, }; - /* these guys DO need to be children of PMU */ static struct platform_device *gta02_devices_pmu_children[] = { + >a02_glamo_dev, /* glamo-mci power handling depends on PMU */ + &s3c_device_ts, /* input 1 */ >a01_pm_gps_dev, >a01_pm_bt_dev, >a02_pm_gsm_dev, >a02_sdio_dev, >a02_pm_usbhost_dev, - &s3c_device_spi_acc, - >a02_button_dev, + &s3c_device_spi_acc, /* input 2 and 3 */ + >a02_button_dev, /* input 4 */ >a02_resume_reason_device, - >a02_glamo_dev, /* glamo-mci power handling depends on PMU */ }; /* this is called when pc50633 is probed, unfortunately quite late in the @@ -1686,32 +1666,11 @@ static void __init gta02_machine_init(void) set_s3c2410ts_info(>a02_ts_cfg); mangle_glamo_res_by_system_rev(); - platform_device_register(>a02_glamo_dev); - - platform_device_register(&s3c_device_spi_acc); - platform_device_register(>a02_button_dev); - platform_device_register(>a02_pm_usbhost_dev); mangle_pmu_pdata_by_system_rev(); - platform_device_register(>a02_pmu_dev); - platform_device_register(>a02_vibrator_dev); - platform_device_register(>a02_led_dev); - platform_device_register(>a02_sdio_dev); platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); -#ifdef CONFIG_GTA02_HDQ - switch (system_rev) { - case GTA02v5_SYSTEM_REV: - case GTA02v6_SYSTEM_REV: - platform_device_register(>a02_hdq_device); - platform_device_register(&bq27000_battery_device); - break; - default: - break; - } -#endif - i2c_register_board_info(0, gta02_i2c_devs, ARRAY_SIZE(gta02_i2c_devs)); diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 067594c0381..954d21dcfc4 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -529,14 +529,6 @@ static pm_message_t resume_event(pm_message_t sleep_state) return PMSG_ON; } -static void -suspend_device_dbg(struct device *dev, pm_message_t state, char *info) -{ - dev_err(dev, "%s%s%s\n", info, suspend_verb(state.event), - ((state.event == PM_EVENT_SUSPEND) && device_may_wakeup(dev)) ? - ", may wakeup" : ""); -} - /** * suspend_device_noirq - Shut down one device (late suspend). * @dev: Device. diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index 84e3e460901..acc7011276a 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -689,7 +689,7 @@ reschedule: int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf, unsigned int ma) { - /* can happen if he calls with pcf50633_global before probe + /* can happen if he calls before probe * have to bail with error since we can't even schedule the work */ if (!pcf) { @@ -2176,8 +2176,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) goto exit_free; } - pcf50633_global = pcf; - populate_sysfs_group(pcf); err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group); @@ -2226,10 +2224,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" */ - 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); + 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); err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING, "pcf50633", pcf); @@ -2490,8 +2488,6 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state) mutex_unlock(&pcf->lock); - pcf->is_suspended = 1; - activate_all_resume_dependencies(&pcf->resume_dependency); return 0; } diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 774b71ba1dd..8f0afc3e023 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -131,9 +131,11 @@ static void touch_timer_fire(unsigned long data) // if we need to send an untouch event, but we haven't yet sent the // touch event (this happens if the touchscreen was tapped lightly), // send the touch event first - if (!updown && !ts.flag_first_touch_sent && ts.count != 0) { - input_report_abs(ts.dev, ABS_X, ts.xp >> ts.shift); - input_report_abs(ts.dev, ABS_Y, ts.yp >> ts.shift); + if (!updown && !ts.flag_first_touch_sent) { + if (ts.tsf[0]) + (ts.tsf[0]->api->scale)(ts.tsf[0], &ts.coords[0]); + input_report_abs(ts.dev, ABS_X, ts.coords[0]); + input_report_abs(ts.dev, ABS_Y, ts.coords[1]); input_report_key(ts.dev, BTN_TOUCH, 1); input_report_abs(ts.dev, ABS_PRESSURE, 1); diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 533f8f38427..d605e2d7cb8 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -1212,7 +1212,7 @@ static int __init glamo_probe(struct platform_device *pdev) if (glamo->pdata->glamo_irq_is_wired && !glamo->pdata->glamo_irq_is_wired()) { set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler); - set_irq_type(glamo->irq, IRQT_FALLING); + set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING); dev_info(&pdev->dev, "Glamo interrupt registered\n"); glamo->irq_works = 1; } else { diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index b5d6ad10dd9..1a8e70251d5 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -285,11 +285,11 @@ static void __glamo_mci_fix_card_div(struct glamo_mci_host *host, int div) * register shared with SCLK divisor -- no chance of race because * we don't use sensor interface */ - writew_dly((readw(glamo_mci_def_pdata.pglamo->base + + writew((readw(glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8) & 0xff00) | div, glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8); /* enable clock to divider input */ - writew_dly(readw(glamo_mci_def_pdata.pglamo->base + + writew(readw(glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK, glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1); @@ -628,12 +628,12 @@ static void glamo_mci_send_request(struct mmc_host *mmc) */ do status = readw(host->base + GLAMO_REG_MMC_RB_STAT1); - while ((((status >> 15) & 1) != (host->ccnt & 1)) || + while (((((status >> 15) & 1) != (host->ccnt & 1)) || (!(status & (GLAMO_STAT1_MMC_RB_RRDY | GLAMO_STAT1_MMC_RTOUT | GLAMO_STAT1_MMC_DTOUT | GLAMO_STAT1_MMC_BWERR | - GLAMO_STAT1_MMC_BRERR))) && (insanity_timeout--)); + GLAMO_STAT1_MMC_BRERR)))) && (insanity_timeout--)); if (insanity_timeout < 0) { cmd->error = -ETIMEDOUT; |