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

Commit e5d4ef0d authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Lee Jones
Browse files

mfd: arizona: Add support for WM8280/WM8281 



This adds support for the Wolfson Microelectronics WM8280 and WM8281
codecs.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
[Lee: Minor fixup to remove potentially uninitialised variable. ]
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent c517d838

drivers/mfd/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -1289,10 +1289,11 @@ config MFD_WM5102 
	  Support for Wolfson Microelectronics WM5102 low power audio SoC



config MFD_WM5110

	bool "Wolfson Microelectronics WM5110"

	bool "Wolfson Microelectronics WM5110 and WM8280/WM8281"

	depends on MFD_ARIZONA

	help

	  Support for Wolfson Microelectronics WM5110 low power audio SoC

	  Support for Wolfson Microelectronics WM5110 and WM8280/WM8281

	  low power audio SoC



config MFD_WM8997

	bool "Wolfson Microelectronics WM8997"

drivers/mfd/arizona-core.c

+13 −2
Original line number Diff line number Diff line
@@ -567,6 +567,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,wm8280", .data = (void *)WM8280 },

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

	{},

};
@@ -671,6 +672,7 @@ int arizona_dev_init(struct arizona *arizona) 
	switch (arizona->type) {

	case WM5102:

	case WM5110:

	case WM8280:

	case WM8997:

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

			arizona->core_supplies[i].supply
@@ -834,11 +836,19 @@ int arizona_dev_init(struct arizona *arizona) 
#endif

#ifdef CONFIG_MFD_WM5110

	case 0x5110:

		switch (arizona->type) {

		case WM5110:

			type_name = "WM5110";

			break;

		case WM8280:

			type_name = "WM8280";

			break;

		default:

			type_name = "WM5110";

		if (arizona->type != WM5110) {

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

				arizona->type);

			arizona->type = WM5110;

			break;

		}

		apply_patch = wm5110_patch;

		break;
@@ -1010,6 +1020,7 @@ int arizona_dev_init(struct arizona *arizona) 
				      ARRAY_SIZE(wm5102_devs), NULL, 0, NULL);

		break;

	case WM5110:

	case WM8280:

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

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

		break;

drivers/mfd/arizona-i2c.c

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, 
#endif

#ifdef CONFIG_MFD_WM5110

	case WM5110:

	case WM8280:

		regmap_config = &wm5110_i2c_regmap;

		break;

#endif
@@ -87,6 +88,7 @@ static int arizona_i2c_remove(struct i2c_client *i2c) 
static const struct i2c_device_id arizona_i2c_id[] = {

	{ "wm5102", WM5102 },

	{ "wm5110", WM5110 },

	{ "wm8280", WM8280 },

	{ "wm8997", WM8997 },

	{ }

};

drivers/mfd/arizona-irq.c

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ int arizona_irq_init(struct arizona *arizona) 
#endif

#ifdef CONFIG_MFD_WM5110

	case WM5110:

	case WM8280:

		aod = &wm5110_aod;



		switch (arizona->rev) {

drivers/mfd/arizona-spi.c

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static int arizona_spi_probe(struct spi_device *spi) 
#endif

#ifdef CONFIG_MFD_WM5110

	case WM5110:

	case WM8280:

		regmap_config = &wm5110_spi_regmap;

		break;

#endif
@@ -84,6 +85,7 @@ static int arizona_spi_remove(struct spi_device *spi) 
static const struct spi_device_id arizona_spi_ids[] = {

	{ "wm5102", WM5102 },

	{ "wm5110", WM5110 },

	{ "wm8280", WM8280 },

	{ },

};

MODULE_DEVICE_TABLE(spi, arizona_spi_ids);