wbsd suspend support
PATCH 1/1 wbsd suspend support
Proper handling of suspend/resume in the wbsd driver.
Signed-off-by Pierre Ossman <[email protected]>
---
drivers/mmc/wbsd.c | 119 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 91 insertions(+), 28 deletions(-)
drivers/mmc/wbsd.c +91 -28
@@ -1033,13 +1033,16 @@ static void wbsd_set_ios(struct mmc_host }else { - setup &= ~WBSD_DAT3_H ; +if (setup &WBSD_DAT3_H ) + { + setup &= ~WBSD_DAT3_H ; -/* -* We cannot resume card detection immediatly -* because of capacitance and delays in the chip. -*/ -mod_timer (&host->ignore_timer, jiffies +HZ /100 ); +/* +* We cannot resume card detection immediatly +* because of capacitance and delays in the chip. +*/ +mod_timer (&host->ignore_timer, jiffies +HZ /100 ); + } }wbsd_write_index (host,WBSD_IDX_SETUP , setup);
@@ -1461,8 +1464,10 @@ static int __devinit wbsd_scan(struct wb { id =0xFFFF ; -outb (unlock_codes[j], config_ports[i]); -outb (unlock_codes[j], config_ports[i]); + host->config = config_ports[i]; + host->unlock_code = unlock_codes[j]; + +wbsd_unlock_config (host);outb (WBSD_CONF_ID_HI , config_ports[i]); id =inb (config_ports[i] +1 ) <<8 ;
@@ -1470,13 +1475,13 @@ static int __devinit wbsd_scan(struct wboutb (WBSD_CONF_ID_LO , config_ports[i]); id |=inb (config_ports[i] +1 ); +wbsd_lock_config (host); +for (k =0 ;k <sizeof (valid_ids)/sizeof (int );k++) {if (id == valid_ids[k]) { host->chip_id = id; - host->config = config_ports[i]; - host->unlock_code = unlock_codes[i];return 0 ; }
@@ -1487,13 +1492,14 @@ static int __devinit wbsd_scan(struct wbDBG ("Unknown hardware (id %x) found at %x\n" , id, config_ports[i]); } - -outb (LOCK_CODE , config_ports[i]); }release_region (config_ports[i],2 ); } + host->config =0 ; + host->unlock_code =0 ; +return -ENODEV ; }
@@ -1695,8 +1701,10 @@ static void __devexit wbsd_release_resou* Configure the resources the chip should use. */ -static void __devinit wbsd_chip_config (struct wbsd_host * host) +static void wbsd_chip_config (struct wbsd_host * host) { +wbsd_unlock_config (host); +/* * Reset the chip. */
@@ -1729,16 +1737,20 @@ static void __devinit wbsd_chip_config(s*/ wbsd_write_config (host,WBSD_CONF_ENABLE ,1 );wbsd_write_config (host,WBSD_CONF_POWER ,0x20 ); + +wbsd_lock_config (host); }/* * Check that configured resources are correct. */ -static int __devinit wbsd_chip_validate (struct wbsd_host * host) +static int wbsd_chip_validate (struct wbsd_host * host) {int base, irq, dma; +wbsd_unlock_config (host); +/* * Select SD/MMC function. */
@@ -1754,6 +1766,8 @@ static int __devinit wbsd_chip_validate( dma =wbsd_read_config (host,WBSD_CONF_DRQ ); +wbsd_lock_config (host); +/* * Validate against given configuration. */
@@ -1767,6 +1781,20 @@ static int __devinit wbsd_chip_validate(return 1 ; } +/* +* Powers down the SD function +*/ + +static void wbsd_chip_poweroff (struct wbsd_host * host) +{ +wbsd_unlock_config (host); + +wbsd_write_config (host,WBSD_CONF_DEVICE ,DEVICE_SD ); +wbsd_write_config (host,WBSD_CONF_ENABLE ,0 ); + +wbsd_lock_config (host); +} +/*****************************************************************************\ * * * Devices setup and shutdown *
@@ -1840,7 +1868,11 @@ static int __devinit wbsd_init(struct de*/ #ifdef CONFIG_PM if (host->config) + { +wbsd_unlock_config (host);wbsd_write_config (host,WBSD_CONF_PME ,0xA0 ); +wbsd_lock_config (host); + }#endif /* * Allow device to initialise itself properly.
@@ -1881,16 +1913,11 @@ static void __devexit wbsd_shutdown(strummc_remove_host (mmc); +/* +* Power down the SD/MMC function. +*/ if (!pnp) - { -/* -* Power down the SD/MMC function. -*/ -wbsd_unlock_config (host); -wbsd_write_config (host,WBSD_CONF_DEVICE ,DEVICE_SD ); -wbsd_write_config (host,WBSD_CONF_ENABLE ,0 ); -wbsd_lock_config (host); - } +wbsd_chip_poweroff (host);wbsd_release_resources (host);
@@ -1951,23 +1978,59 @@ static void __devexit wbsd_pnp_remove(st*/ #ifdef CONFIG_PM +static int wbsd_suspend (struct device *dev,pm_message_t state,u32 level) { -DBGF ("Not yet supported\n" ); +struct mmc_host *mmc =dev_get_drvdata (dev); +struct wbsd_host *host; +int ret; + +if (!mmc || (level !=SUSPEND_DISABLE )) +return 0 ; + +DBG ("Suspending...\n" ); + + ret =mmc_suspend_host (mmc, state); +if (!ret) +return ret; + + host =mmc_priv (mmc); + +wbsd_chip_poweroff (host);return 0 ; }static int wbsd_resume (struct device *dev,u32 level) { -DBGF ("Not yet supported\n" ); +struct mmc_host *mmc =dev_get_drvdata (dev); +struct wbsd_host *host; -return 0 ; +if (!mmc || (level !=RESUME_ENABLE )) +return 0 ; + +DBG ("Resuming...\n" ); + + host =mmc_priv (mmc); + +wbsd_chip_config (host); + +/* +* Allow device to initialise itself properly. +*/ +mdelay (5 ); + +wbsd_init_device (host); + +return mmc_resume_host (mmc); } -#else + +#else /* CONFIG_PM */ +#define wbsd_suspend NULL#define wbsd_resume NULL -#endif + +#endif /* CONFIG_PM */ static struct platform_device *wbsd_device;
Quoted 3 lines · Pierre Ossman
Proper handling of suspend/resume in the wbsd driver.
Signed-off-by Pierre Ossman <[email protected]>
Fixed up for suspend/resume argument changes and applied, thanks.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core