Commit dc7d4863 authored by Charles Keepax's avatar Charles Keepax Committed by Samuel Ortiz
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f3799e93

drivers/mfd/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,12 @@ config MFD_WM5110 
	help

	  Support for Wolfson Microelectronics WM5110 low power audio SoC



config MFD_WM8997

	bool "Support Wolfson Microelectronics WM8997"

	depends on MFD_ARIZONA

	help

	  Support for Wolfson Microelectronics WM8997 low power audio SoC



config MFD_WM8400

	bool "Wolfson Microelectronics WM8400"

	select MFD_CORE

drivers/mfd/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ endif 
ifneq ($(CONFIG_MFD_WM5110),n)

obj-$(CONFIG_MFD_ARIZONA)	+= wm5110-tables.o

endif

ifneq ($(CONFIG_MFD_WM8997),n)

obj-$(CONFIG_MFD_ARIZONA)	+= wm8997-tables.o

endif

obj-$(CONFIG_MFD_WM8400)	+= wm8400-core.o

wm831x-objs			:= wm831x-core.o wm831x-irq.o wm831x-otp.o

wm831x-objs			+= wm831x-auxadc.o

drivers/mfd/arizona-core.c

+27 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) 
const struct of_device_id arizona_of_match[] = {

	{ .compatible = "wlf,wm5102", .data = (void *)WM5102 },

	{ .compatible = "wlf,wm5110", .data = (void *)WM5110 },

	{ .compatible = "wlf,wm8997", .data = (void *)WM8997 },

	{},

};

EXPORT_SYMBOL_GPL(arizona_of_match);
@@ -586,6 +587,15 @@ static struct mfd_cell wm5110_devs[] = { 
	{ .name = "wm5110-codec" },

};



static struct mfd_cell wm8997_devs[] = {

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-extcon" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "wm8997-codec" },

};



int arizona_dev_init(struct arizona *arizona)

{

	struct device *dev = arizona->dev;
@@ -608,6 +618,7 @@ int arizona_dev_init(struct arizona *arizona) 
	switch (arizona->type) {

	case WM5102:

	case WM5110:

	case WM8997:

		for (i = 0; i < ARRAY_SIZE(wm5102_core_supplies); i++)

			arizona->core_supplies[i].supply

				= wm5102_core_supplies[i];
@@ -683,6 +694,7 @@ int arizona_dev_init(struct arizona *arizona) 
	switch (reg) {

	case 0x5102:

	case 0x5110:

	case 0x8997:

		break;

	default:

		dev_err(arizona->dev, "Unknown device ID: %x\n", reg);
@@ -767,6 +779,17 @@ int arizona_dev_init(struct arizona *arizona) 
		}

		apply_patch = wm5110_patch;

		break;

#endif

#ifdef CONFIG_MFD_WM8997

	case 0x8997:

		type_name = "WM8997";

		if (arizona->type != WM8997) {

			dev_err(arizona->dev, "WM8997 registered as %d\n",

				arizona->type);

			arizona->type = WM8997;

		}

		apply_patch = wm8997_patch;

		break;

#endif

	default:

		dev_err(arizona->dev, "Unknown device ID %x\n", reg);
@@ -934,6 +957,10 @@ int arizona_dev_init(struct arizona *arizona) 
		ret = mfd_add_devices(arizona->dev, -1, wm5110_devs,

				      ARRAY_SIZE(wm5110_devs), NULL, 0, NULL);

		break;

	case WM8997:

		ret = mfd_add_devices(arizona->dev, -1, wm8997_devs,

				      ARRAY_SIZE(wm8997_devs), NULL, 0, NULL);

		break;

	}



	if (ret != 0) {

drivers/mfd/arizona-i2c.c

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ static int arizona_i2c_probe(struct i2c_client *i2c, 
	case WM5110:

		regmap_config = &wm5110_i2c_regmap;

		break;

#endif

#ifdef CONFIG_MFD_WM8997

	case WM8997:

		regmap_config = &wm8997_i2c_regmap;

		break;

#endif

	default:

		dev_err(&i2c->dev, "Unknown device type %ld\n",
@@ -80,6 +85,7 @@ static int arizona_i2c_remove(struct i2c_client *i2c) 
static const struct i2c_device_id arizona_i2c_id[] = {

	{ "wm5102", WM5102 },

	{ "wm5110", WM5110 },

	{ "wm8997", WM8997 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, arizona_i2c_id);

drivers/mfd/arizona-irq.c

+8 −0
Original line number Diff line number Diff line
@@ -208,6 +208,14 @@ int arizona_irq_init(struct arizona *arizona) 
		ctrlif_error = false;

		break;

#endif

#ifdef CONFIG_MFD_WM8997

	case WM8997:

		aod = &wm8997_aod;

		irq = &wm8997_irq;



		ctrlif_error = false;

		break;

#endif

	default:

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

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE