All of lore.kernel.org
 help / color / mirror / Atom feed
* [RESEND PATCH 0/6] Add support for the WM8280 and WM8281
@ 2015-02-10 11:18 Charles Keepax
  2015-02-10 11:18   ` Charles Keepax
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Charles Keepax @ 2015-02-10 11:18 UTC (permalink / raw)
  To: lee.jones
  Cc: devicetree, alsa-devel, linux-gpio, linux.walleij, linux-kernel,
	cw00.choi, broonie, rf

This set of patches adds support for the WM8280 and WM8281
codecs to the Wolfson Arizona drivers.

Just another resend on this series, if it would expedite
the process I would be happy if we could just merge the MFD
patches then I can push the other patches through their
respective trees once that hits mainline, but at the moment
all the patches are gated by a build dependency on the MFD
patches.

Thanks,
Charles

Richard Fitzgerald (6):
  mfd: arizona: Add support for WM8280/WM8281
  Documentation: devicetree: arizona: Add bindings for WM8280
  regulator: arizona-micsupp: Add support for WM8280/WM8281
  gpio: arizona: Add support for WM8280/WM8281
  extcon: arizona: Add support for WM8280/WM8281
  ASoC: arizona: Add support for WM8280/WM8281

 Documentation/devicetree/bindings/mfd/arizona.txt |   15 +++++++++++----
 drivers/extcon/extcon-arizona.c                   |    1 +
 drivers/gpio/gpio-arizona.c                       |    1 +
 drivers/mfd/Kconfig                               |    5 +++--
 drivers/mfd/arizona-core.c                        |   15 +++++++++++++--
 drivers/mfd/arizona-i2c.c                         |    2 ++
 drivers/mfd/arizona-irq.c                         |    1 +
 drivers/mfd/arizona-spi.c                         |    2 ++
 drivers/regulator/arizona-micsupp.c               |    1 +
 include/linux/mfd/arizona/core.h                  |    1 +
 sound/soc/codecs/arizona.c                        |    2 ++
 11 files changed, 38 insertions(+), 8 deletions(-)

-- 
1.7.2.5

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [RESEND PATCH 1/6] mfd: arizona: Add support for WM8280/WM8281
@ 2015-03-03 16:19 Charles Keepax
  2015-03-03 16:19 ` [RESEND PATCH 4/6] gpio: " Charles Keepax
  0 siblings, 1 reply; 12+ messages in thread
From: Charles Keepax @ 2015-03-03 16:19 UTC (permalink / raw)
  To: lee.jones
  Cc: robh+dt, pawel.moll, mark.rutland, galak, myungjoo.ham,
	cw00.choi, linus.walleij, gnurou, sameo, lgirdwood, broonie, rf,
	devicetree, linux-kernel

From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>

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

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
[ Minor fixup to remove potentially uninitialised variable. ]
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/Kconfig              |    5 +++--
 drivers/mfd/arizona-core.c       |   15 +++++++++++++--
 drivers/mfd/arizona-i2c.c        |    2 ++
 drivers/mfd/arizona-irq.c        |    1 +
 drivers/mfd/arizona-spi.c        |    2 ++
 include/linux/mfd/arizona/core.h |    1 +
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 0ad88c7..b5fb03c 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1290,10 +1290,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"
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 09ba8f1..9f81998 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -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:
-		type_name = "WM5110";
-		if (arizona->type != WM5110) {
+		switch (arizona->type) {
+		case WM5110:
+			type_name = "WM5110";
+			break;
+		case WM8280:
+			type_name = "WM8280";
+			break;
+		default:
+			type_name = "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;
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 9d4156f..ff782a5d 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -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 },
 	{ }
 };
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index 3a3fe7c..d063b94 100644
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -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) {
diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index 8ef58bc..1e845f6 100644
--- a/drivers/mfd/arizona-spi.c
+++ b/drivers/mfd/arizona-spi.c
@@ -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);
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index 910e3aa..f970105 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -24,6 +24,7 @@ enum arizona_type {
 	WM5102 = 1,
 	WM5110 = 2,
 	WM8997 = 3,
+	WM8280 = 4,
 };
 
 #define ARIZONA_IRQ_GP1                    0
-- 
1.7.2.5


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [RESEND PATCH 0/6] Add support for the WM8280 and WM8281 codecs
@ 2015-01-17 15:21 Charles Keepax
  2015-01-17 15:21   ` Charles Keepax
  0 siblings, 1 reply; 12+ messages in thread
From: Charles Keepax @ 2015-01-17 15:21 UTC (permalink / raw)
  To: lee.jones
  Cc: broonie, cw00.choi, linus.walleij, devicetree, alsa-devel,
	patches, linux-kernel, linux-gpio, rf

This set of patches adds support for the WM8280 and WM8281
codecs to the Wolfson Arizona drivers.

I made one small correction to the first patch to removed a
potentially uninitialised variable, but otherwise just a
resend of Richard's work. I would suggest we put the whole
series through the MFD tree I believe we have all the required
Acks and I don't believe there arn't any other patches making
their way through at the moment that this should conflict with.

Thanks,
Charles

Richard Fitzgerald (6):
  mfd: arizona: Add support for WM8280/WM8281
  Documentation: devicetree: arizona: Add bindings for WM8280
  regulator: arizona-micsupp: Add support for WM8280/WM8281
  gpio: arizona: Add support for WM8280/WM8281
  extcon: arizona: Add support for WM8280/WM8281
  ASoC: arizona: Add support for WM8280/WM8281

 Documentation/devicetree/bindings/mfd/arizona.txt |   15 +++++++++++----
 drivers/extcon/extcon-arizona.c                   |    1 +
 drivers/gpio/gpio-arizona.c                       |    1 +
 drivers/mfd/Kconfig                               |    5 +++--
 drivers/mfd/arizona-core.c                        |   15 +++++++++++++--
 drivers/mfd/arizona-i2c.c                         |    2 ++
 drivers/mfd/arizona-irq.c                         |    1 +
 drivers/mfd/arizona-spi.c                         |    2 ++
 drivers/regulator/arizona-micsupp.c               |    1 +
 include/linux/mfd/arizona/core.h                  |    1 +
 sound/soc/codecs/arizona.c                        |    2 ++
 11 files changed, 38 insertions(+), 8 deletions(-)

-- 
1.7.2.5


^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-03-03 16:47 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-10 11:18 [RESEND PATCH 0/6] Add support for the WM8280 and WM8281 Charles Keepax
2015-02-10 11:18 ` [RESEND PATCH 1/6] mfd: arizona: Add support for WM8280/WM8281 Charles Keepax
2015-02-10 11:18   ` Charles Keepax
2015-02-10 11:18 ` [RESEND PATCH 2/6] Documentation: devicetree: arizona: Add bindings for WM8280 Charles Keepax
2015-02-10 11:18 ` [RESEND PATCH 3/6] regulator: arizona-micsupp: Add support for WM8280/WM8281 Charles Keepax
2015-02-10 11:18 ` [RESEND PATCH 4/6] gpio: arizona: " Charles Keepax
2015-02-10 11:18 ` [RESEND PATCH 5/6] extcon: " Charles Keepax
2015-02-10 11:18 ` [RESEND PATCH 6/6] ASoC: " Charles Keepax
  -- strict thread matches above, loose matches on Subject: below --
2015-03-03 16:19 [RESEND PATCH 1/6] mfd: " Charles Keepax
2015-03-03 16:19 ` [RESEND PATCH 4/6] gpio: " Charles Keepax
2015-03-03 16:47   ` Lee Jones
2015-01-17 15:21 [RESEND PATCH 0/6] Add support for the WM8280 and WM8281 codecs Charles Keepax
2015-01-17 15:21 ` [RESEND PATCH 4/6] gpio: arizona: Add support for WM8280/WM8281 Charles Keepax
2015-01-17 15:21   ` Charles Keepax

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.