aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-05 15:35:31 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-08 18:39:07 -0400
commit863df8d5f1a1a92016e24c80947cb3509b8aaa48 (patch)
tree77770052c0e5fb149e45d2c3e080011db1fa9ad1
parentcfe775ce62d83168125299714739aebc1018211e (diff)
mfd: Add missing WM5102 ifdefs
References to the WM5102 tables need to be guarded. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/arizona-core.c3
-rw-r--r--drivers/mfd/arizona-i2c.c2
-rw-r--r--drivers/mfd/arizona-irq.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 03aef6750a9d..7f837edfbfb7 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -368,6 +368,7 @@ int __devinit arizona_dev_init(struct arizona *arizona)
368 arizona->rev &= ARIZONA_DEVICE_REVISION_MASK; 368 arizona->rev &= ARIZONA_DEVICE_REVISION_MASK;
369 369
370 switch (reg) { 370 switch (reg) {
371#ifdef CONFIG_MFD_WM5102
371 case 0x5102: 372 case 0x5102:
372 type_name = "WM5102"; 373 type_name = "WM5102";
373 if (arizona->type != WM5102) { 374 if (arizona->type != WM5102) {
@@ -377,7 +378,7 @@ int __devinit arizona_dev_init(struct arizona *arizona)
377 } 378 }
378 ret = wm5102_patch(arizona); 379 ret = wm5102_patch(arizona);
379 break; 380 break;
380 381#endif
381 default: 382 default:
382 dev_err(arizona->dev, "Unknown device ID %x\n", reg); 383 dev_err(arizona->dev, "Unknown device ID %x\n", reg);
383 goto err_reset; 384 goto err_reset;
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 75fb110105e1..fe19d11b92f0 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -30,9 +30,11 @@ static __devinit int arizona_i2c_probe(struct i2c_client *i2c,
30 int ret; 30 int ret;
31 31
32 switch (id->driver_data) { 32 switch (id->driver_data) {
33#ifdef CONFIG_MFD_WM5102
33 case WM5102: 34 case WM5102:
34 regmap_config = &wm5102_i2c_regmap; 35 regmap_config = &wm5102_i2c_regmap;
35 break; 36 break;
37#endif
36 default: 38 default:
37 dev_err(&i2c->dev, "Unknown device type %ld\n", 39 dev_err(&i2c->dev, "Unknown device type %ld\n",
38 id->driver_data); 40 id->driver_data);
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index 4c7894046a39..17d20c0fba1e 100644
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -158,10 +158,12 @@ int arizona_irq_init(struct arizona *arizona)
158 const struct regmap_irq_chip *aod, *irq; 158 const struct regmap_irq_chip *aod, *irq;
159 159
160 switch (arizona->type) { 160 switch (arizona->type) {
161#ifdef CONFIG_MFD_WM5102
161 case WM5102: 162 case WM5102:
162 aod = &wm5102_aod; 163 aod = &wm5102_aod;
163 irq = &wm5102_irq; 164 irq = &wm5102_irq;
164 break; 165 break;
166#endif
165 default: 167 default:
166 BUG_ON("Unknown Arizona class device" == NULL); 168 BUG_ON("Unknown Arizona class device" == NULL);
167 return -EINVAL; 169 return -EINVAL;