Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 863df8d5 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Add missing WM5102 ifdefs 



References to the WM5102 tables need to be guarded.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent cfe775ce

drivers/mfd/arizona-core.c

+2 −1
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ int __devinit arizona_dev_init(struct arizona *arizona) 
	arizona->rev &= ARIZONA_DEVICE_REVISION_MASK;



	switch (reg) {

#ifdef CONFIG_MFD_WM5102

	case 0x5102:

		type_name = "WM5102";

		if (arizona->type != WM5102) {
@@ -377,7 +378,7 @@ int __devinit arizona_dev_init(struct arizona *arizona) 
		}

		ret = wm5102_patch(arizona);

		break;



#endif

	default:

		dev_err(arizona->dev, "Unknown device ID %x\n", reg);

		goto err_reset;

drivers/mfd/arizona-i2c.c

+2 −0
Original line number Diff line number Diff line
@@ -30,9 +30,11 @@ static __devinit int arizona_i2c_probe(struct i2c_client *i2c, 
	int ret;



	switch (id->driver_data) {

#ifdef CONFIG_MFD_WM5102

	case WM5102:

		regmap_config = &wm5102_i2c_regmap;

		break;

#endif

	default:

		dev_err(&i2c->dev, "Unknown device type %ld\n",

			id->driver_data);

drivers/mfd/arizona-irq.c

+2 −0
Original line number Diff line number Diff line
@@ -158,10 +158,12 @@ int arizona_irq_init(struct arizona *arizona) 
	const struct regmap_irq_chip *aod, *irq;



	switch (arizona->type) {

#ifdef CONFIG_MFD_WM5102

	case WM5102:

		aod = &wm5102_aod;

		irq = &wm5102_irq;

		break;

#endif

	default:

		BUG_ON("Unknown Arizona class device" == NULL);

		return -EINVAL;