Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273395
b: refs/heads/master
c: 5da721c
h: refs/heads/master
i:
  273393: 7b0696a
  273391: eb0cea7
v: v3
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Oct 24, 2011
1 parent 9ebddd4 commit c5779da
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f09ee0451a44a4e913a7c3cec3805508f7de6c54
refs/heads/master: 5da721c87aee3d94cfc48384073c2ec51a0b9a3b
11 changes: 11 additions & 0 deletions trunk/drivers/mfd/wm831x-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/mfd/wm831x/irq.h>
#include <linux/mfd/wm831x/auxadc.h>
#include <linux/mfd/wm831x/otp.h>
#include <linux/mfd/wm831x/pmu.h>
#include <linux/mfd/wm831x/regulator.h>

/* Current settings - values are 2*2^(reg_val/4) microamps. These are
Expand Down Expand Up @@ -1305,6 +1306,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
mutex_init(&wm831x->io_lock);
mutex_init(&wm831x->key_lock);
dev_set_drvdata(wm831x->dev, wm831x);
wm831x->soft_shutdown = pdata->soft_shutdown;

ret = wm831x_reg_read(wm831x, WM831X_PARENT_ID);
if (ret < 0) {
Expand Down Expand Up @@ -1604,6 +1606,15 @@ int wm831x_device_suspend(struct wm831x *wm831x)
return 0;
}

void wm831x_device_shutdown(struct wm831x *wm831x)
{
if (wm831x->soft_shutdown) {
dev_info(wm831x->dev, "Initiating shutdown...\n");
wm831x_set_bits(wm831x, WM831X_POWER_STATE, WM831X_CHIP_ON, 0);
}
}
EXPORT_SYMBOL_GPL(wm831x_device_shutdown);

MODULE_DESCRIPTION("Core support for the WM831X AudioPlus PMIC");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Mark Brown");
8 changes: 8 additions & 0 deletions trunk/drivers/mfd/wm831x-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ static int wm831x_i2c_suspend(struct device *dev)
return wm831x_device_suspend(wm831x);
}

static void wm831x_i2c_shutdown(struct i2c_client *i2c)
{
struct wm831x *wm831x = i2c_get_clientdata(i2c);

wm831x_device_shutdown(wm831x);
}

static const struct i2c_device_id wm831x_i2c_id[] = {
{ "wm8310", WM8310 },
{ "wm8311", WM8311 },
Expand All @@ -133,6 +140,7 @@ static struct i2c_driver wm831x_i2c_driver = {
},
.probe = wm831x_i2c_probe,
.remove = wm831x_i2c_remove,
.shutdown = wm831x_i2c_shutdown,
.id_table = wm831x_i2c_id,
};

Expand Down
8 changes: 8 additions & 0 deletions trunk/drivers/mfd/wm831x-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ static int wm831x_spi_suspend(struct device *dev)
return wm831x_device_suspend(wm831x);
}

static void wm831x_spi_shutdown(struct spi_device *spi)
{
struct wm831x *wm831x = dev_get_drvdata(&spi->dev);

wm831x_device_shutdown(wm831x);
}

static const struct dev_pm_ops wm831x_spi_pm = {
.freeze = wm831x_spi_suspend,
.suspend = wm831x_spi_suspend,
Expand All @@ -146,6 +153,7 @@ static struct spi_driver wm8311_spi_driver = {
},
.probe = wm831x_spi_probe,
.remove = __devexit_p(wm831x_spi_remove),
.shutdown = wm831x_spi_shutdown,
};

static struct spi_driver wm8312_spi_driver = {
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/mfd/wm831x/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ struct wm831x {
int irq_masks_cur[WM831X_NUM_IRQ_REGS]; /* Currently active value */
int irq_masks_cache[WM831X_NUM_IRQ_REGS]; /* Cached hardware value */

bool soft_shutdown;

/* Chip revision based flags */
unsigned has_gpio_ena:1; /* Has GPIO enable bit */
unsigned has_cs_sts:1; /* Has current sink status bit */
Expand Down Expand Up @@ -412,6 +414,7 @@ int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg,
int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq);
void wm831x_device_exit(struct wm831x *wm831x);
int wm831x_device_suspend(struct wm831x *wm831x);
void wm831x_device_shutdown(struct wm831x *wm831x);
int wm831x_irq_init(struct wm831x *wm831x, int irq);
void wm831x_irq_exit(struct wm831x *wm831x);
void wm831x_auxadc_init(struct wm831x *wm831x);
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/mfd/wm831x/pdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ struct wm831x_pdata {
/** Disable the touchscreen */
bool disable_touch;

/** The driver should initiate a power off sequence during shutdown */
bool soft_shutdown;

int irq_base;
int gpio_base;
int gpio_defaults[WM831X_GPIO_NUM];
Expand Down

0 comments on commit c5779da

Please sign in to comment.