aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/arizona-i2c.c
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2013-06-13 04:43:29 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-17 18:49:52 -0400
commitdc7d48635dd3c3fd5360238f7d2c697ff13abe7b (patch)
tree128dcc3bb150a534902473a89b86222e9dcf8dd3 /drivers/mfd/arizona-i2c.c
parentf3799e93720b8b722944d86f7a2a0599f5a9d716 (diff)
mfd: arizona: Integrate wm8997 into Arizona mfd
The wm8997 is a compact, high-performance audio hub CODEC with SLIMbus interfacing, for smartphones, tablets and other portable audio devices based on the Arizona platform. This patch integrates the wm8997 into the Arizona mfd. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/arizona-i2c.c')
-rw-r--r--drivers/mfd/arizona-i2c.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index deb267ebf84e..51dbabf7c021 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -45,6 +45,11 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
45 regmap_config = &wm5110_i2c_regmap; 45 regmap_config = &wm5110_i2c_regmap;
46 break; 46 break;
47#endif 47#endif
48#ifdef CONFIG_MFD_WM8997
49 case WM8997:
50 regmap_config = &wm8997_i2c_regmap;
51 break;
52#endif
48 default: 53 default:
49 dev_err(&i2c->dev, "Unknown device type %ld\n", 54 dev_err(&i2c->dev, "Unknown device type %ld\n",
50 id->driver_data); 55 id->driver_data);
@@ -80,6 +85,7 @@ static int arizona_i2c_remove(struct i2c_client *i2c)
80static const struct i2c_device_id arizona_i2c_id[] = { 85static const struct i2c_device_id arizona_i2c_id[] = {
81 { "wm5102", WM5102 }, 86 { "wm5102", WM5102 },
82 { "wm5110", WM5110 }, 87 { "wm5110", WM5110 },
88 { "wm8997", WM8997 },
83 { } 89 { }
84}; 90};
85MODULE_DEVICE_TABLE(i2c, arizona_i2c_id); 91MODULE_DEVICE_TABLE(i2c, arizona_i2c_id);