Commit b1f43bf3 authored by Mark Brown's avatar Mark Brown

mfd: Add WM1811 support

The WM1811 is mostly register compatible with the WM8994 and WM8958,
providing a high performance audio hub CODEC in a small form factor
suitable for ultra compact system designs.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 11c2b5f2
...@@ -243,6 +243,18 @@ static struct mfd_cell wm8994_devs[] = { ...@@ -243,6 +243,18 @@ static struct mfd_cell wm8994_devs[] = {
* and should be handled via the standard regulator API supply * and should be handled via the standard regulator API supply
* management. * management.
*/ */
static const char *wm1811_main_supplies[] = {
"DBVDD1",
"DBVDD2",
"DBVDD3",
"DCVDD",
"AVDD1",
"AVDD2",
"CPVDD",
"SPKVDD1",
"SPKVDD2",
};
static const char *wm8994_main_supplies[] = { static const char *wm8994_main_supplies[] = {
"DBVDD", "DBVDD",
"DCVDD", "DCVDD",
...@@ -401,6 +413,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) ...@@ -401,6 +413,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
} }
switch (wm8994->type) { switch (wm8994->type) {
case WM1811:
wm8994->num_supplies = ARRAY_SIZE(wm1811_main_supplies);
break;
case WM8994: case WM8994:
wm8994->num_supplies = ARRAY_SIZE(wm8994_main_supplies); wm8994->num_supplies = ARRAY_SIZE(wm8994_main_supplies);
break; break;
...@@ -421,6 +436,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) ...@@ -421,6 +436,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
} }
switch (wm8994->type) { switch (wm8994->type) {
case WM1811:
for (i = 0; i < ARRAY_SIZE(wm1811_main_supplies); i++)
wm8994->supplies[i].supply = wm1811_main_supplies[i];
break;
case WM8994: case WM8994:
for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++) for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++)
wm8994->supplies[i].supply = wm8994_main_supplies[i]; wm8994->supplies[i].supply = wm8994_main_supplies[i];
...@@ -454,6 +473,13 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) ...@@ -454,6 +473,13 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
goto err_enable; goto err_enable;
} }
switch (ret) { switch (ret) {
case 0x1811:
devname = "WM1811";
if (wm8994->type != WM1811)
dev_warn(wm8994->dev, "Device registered as type %d\n",
wm8994->type);
wm8994->type = WM1811;
break;
case 0x8994: case 0x8994:
devname = "WM8994"; devname = "WM8994";
if (wm8994->type != WM8994) if (wm8994->type != WM8994)
...@@ -651,6 +677,7 @@ static int wm8994_i2c_remove(struct i2c_client *i2c) ...@@ -651,6 +677,7 @@ static int wm8994_i2c_remove(struct i2c_client *i2c)
} }
static const struct i2c_device_id wm8994_i2c_id[] = { static const struct i2c_device_id wm8994_i2c_id[] = {
{ "wm1811", WM1811 },
{ "wm8994", WM8994 }, { "wm8994", WM8994 },
{ "wm8958", WM8958 }, { "wm8958", WM8958 },
{ } { }
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
enum wm8994_type { enum wm8994_type {
WM8994 = 0, WM8994 = 0,
WM8958 = 1, WM8958 = 1,
WM1811 = 2,
}; };
struct regulator_dev; struct regulator_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment