Add support for the WM8280 and WM8281 codecs

PATCH Superseded Richard Fitzgerald 5 participants 16 messages Nov 13, 2014 – Nov 24, 2014

Subsystems (8)

Device tree bindings Sound ASoC GPIO +4 more subsystems

lore

Share & tools

lore

Richard Fitzgerald

author

2014-11-13 17:50 UTC #0 lore raw

cover Add support for the WM8280 and WM8281 codecs

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

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 |   10 ++++++----
 drivers/extcon/extcon-arizona.c                   |    1 +
 drivers/gpio/gpio-arizona.c                       |    1 +
 drivers/mfd/Kconfig                               |    5 +++--
 drivers/mfd/arizona-core.c                        |   14 ++++++++++++--
 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, 32 insertions(+), 8 deletions(-)

Signature · 1 line

1.7.2.5

Richard Fitzgerald

author

2014-11-13 17:50 UTC #1 lore raw

PATCH 1/6 mfd: arizona: add support for WM8280/WM8281

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

Signed-off-by Richard Fitzgerald <[email protected]>

---
 drivers/mfd/Kconfig              |    5 +++--
 drivers/mfd/arizona-core.c       |   14 ++++++++++++--
 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, 21 insertions(+), 4 deletions(-)

drivers/mfd/Kconfig +3 -2

index abef204..e00a90f 100644
@@ -1236,10 +1236,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 +12 -2

index bce7c07..6e6b732 100644
@@ -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,18 @@ 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:
 			dev_err(arizona->dev, "WM5110 registered as %d\n",
 				arizona->type);
 			arizona->type = WM5110;
+			break;
 		}
 		apply_patch = wm5110_patch;
 		break;

@@ -1010,6 +1019,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

index 9d4156f..ff782a5 100644
@@ -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

index 3a3fe7c..d063b94 100644
@@ -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

index 5145d78..721b93f 100644
@@ -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

@@ -82,6 +83,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);

include/linux/mfd/arizona/core.h +1 -0

index 910e3aa..f970105 100644
@@ -24,6 +24,7 @@ enum arizona_type {
 	WM5102 = 1,
 	WM5110 = 2,
 	WM8997 = 3,
+	WM8280 = 4,
 };
 
 #define ARIZONA_IRQ_GP1                    0

Signature · 1 line

1.7.2.5

Richard Fitzgerald

author

2014-11-13 17:50 UTC #4 lore raw

PATCH 2/6 Documentation: devicetree: arizona: Add bindings for WM8280

In reply to Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 Documentation/devicetree/bindings/mfd/arizona.txt |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Documentation/devicetree/bindings/mfd/arizona.txt +6 -4

index 7bd1273..079badb 100644
@@ -8,6 +8,7 @@ Required properties:
   - compatible : One of the following chip-specific strings:
         "wlf,wm5102"
         "wlf,wm5110"
+        "wlf,wm8280"
         "wlf,wm8997"
   - reg : I2C slave address when connected using I2C, chip select number when
     using SPI.

@@ -26,10 +27,11 @@ Required properties:
   - #gpio-cells : Must be 2. The first cell is the pin number and the
     second cell is used to specify optional parameters (currently unused).
 
-  - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110),
-    CPVDD-supply, SPKVDDL-supply (wm5102, wm5110), SPKVDDR-supply (wm5102,
-    wm5110), SPKVDD-supply (wm8997) : Power supplies for the device, as covered
-    in Documentation/devicetree/bindings/regulator/regulator.txt
+  - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110,
+    wm8280), CPVDD-supply, SPKVDDL-supply (wm5102, wm5110, wm8280),
+    SPKVDDR-supply (wm5102, wm5110, wm8280), SPKVDD-supply (wm8997)
+    : Power supplies for the device, as covered in
+    Documentation/devicetree/bindings/regulator/regulator.txt
 
 Optional properties:

Signature · 1 line

1.7.2.5

Richard Fitzgerald

author

2014-11-13 17:50 UTC #7 lore raw

PATCH 3/6 regulator: arizona-micsupp: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 drivers/regulator/arizona-micsupp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

drivers/regulator/arizona-micsupp.c +1 -0

index ce9aca5..4ff55e1 100644
@@ -245,6 +245,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
 	 */
 	switch (arizona->type) {
 	case WM5110:
+	case WM8280:
 		desc = &arizona_micsupp_ext;
 		micsupp->init_data = arizona_micsupp_ext_default;
 		break;

Signature · 1 line

1.7.2.5

Richard Fitzgerald

author

2014-11-13 17:50 UTC #10 lore raw

PATCH 4/6 gpio: arizona: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 drivers/gpio/gpio-arizona.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

drivers/gpio/gpio-arizona.c +1 -0

index fe369f5..9665d0a 100644
@@ -116,6 +116,7 @@ static int arizona_gpio_probe(struct platform_device *pdev)
 	switch (arizona->type) {
 	case WM5102:
 	case WM5110:
+	case WM8280:
 	case WM8997:
 		arizona_gpio->gpio_chip.ngpio = 5;
 		break;

Signature · 1 line

1.7.2.5

Richard Fitzgerald

author

2014-11-13 17:50 UTC #12 lore raw

PATCH 5/6 extcon: arizona: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 drivers/extcon/extcon-arizona.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

drivers/extcon/extcon-arizona.c +1 -0

index ba51588..3abe866 100644
@@ -1149,6 +1149,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
 		}
 		break;
 	case WM5110:
+	case WM8280:
 		switch (arizona->rev) {
 		case 0 ... 2:
 			break;

Signature · 1 line

1.7.2.5

Richard Fitzgerald

author

2014-11-13 17:50 UTC #14 lore raw

PATCH 6/6 ASoC: arizona: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 sound/soc/codecs/arizona.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

sound/soc/codecs/arizona.c +2 -0

index 9550d74..55b5e22 100644
@@ -281,6 +281,7 @@ int arizona_init_gpio(struct snd_soc_codec *codec)
 
 	switch (arizona->type) {
 	case WM5110:
+	case WM8280:
 		snd_soc_dapm_disable_pin(&codec->dapm, "DRC2 Signal Activity");
 		break;
 	default:

@@ -1669,6 +1670,7 @@ static int arizona_calc_fratio(struct arizona_fll *fll,
 
 	switch (fll->arizona->type) {
 	case WM5110:
+	case WM8280:
 		if (fll->arizona->rev < 3 || sync)
 			return init_ratio;
 		break;

Signature · 1 line

1.7.2.5

Mark Brown

maintainer

2014-11-13 18:06 UTC #5 lore raw

Re: [PATCH 2/6] Documentation: devicetree: arizona: Add bindings for WM8280

In reply to Richard Fitzgerald

Documentation/devicetree/bindings/mfd/arizona.txt Required properties: · line 34

Quoted 9 lines · Richard Fitzgerald

Documentation/devicetree/bindings/mfd/arizona.txt +5 -4

-  - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110),
-    CPVDD-supply, SPKVDDL-supply (wm5102, wm5110), SPKVDDR-supply (wm5102,
-    wm5110), SPKVDD-supply (wm8997) : Power supplies for the device, as covered
-    in Documentation/devicetree/bindings/regulator/regulator.txt
+  - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110,
+    wm8280), CPVDD-supply, SPKVDDL-supply (wm5102, wm5110, wm8280),
+    SPKVDDR-supply (wm5102, wm5110, wm8280), SPKVDD-supply (wm8997)
+    : Power supplies for the device, as covered in
+    Documentation/devicetree/bindings/regulator/regulator.txt

This is getting pretty illegible, how about either a per device list or breaking each supply onto a separate line?

Chanwoo Choi

maintainer Acked-by on v1 5/6

2014-11-13 23:34 UTC #13 lore raw

Re: [PATCH 5/6] extcon: arizona: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Quoted 11 lines · Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>
---
 drivers/extcon/extcon-arizona.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/extcon/extcon-arizona.c +0 -0
index ba51588..3abe866 100644

drivers/extcon/extcon-arizona.c static int arizona_extcon_probe(struct platform_device *pdev) · line 1155

Quoted 7 lines

drivers/extcon/extcon-arizona.c +1 -0

@@ -1149,6 +1149,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
 		}
 		break;
 	case WM5110:
+	case WM8280:
 		switch (arizona->rev) {
 		case 0 ... 2:
 			break;

This patch is simple.

Acked-by Chanwoo Choi <[email protected]>

Best Regards,
Chanwoo Choi

Richard Fitzgerald

author

2014-11-14 10:04 UTC #6 lore raw

PATCH v2 2/6 Documentation: devicetree: arizona: Add bindings for WM8280

In reply to Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 Documentation/devicetree/bindings/mfd/arizona.txt |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

Documentation/devicetree/bindings/mfd/arizona.txt +11 -4

index 7bd1273..dc81b71 100644
@@ -8,6 +8,7 @@ Required properties:
   - compatible : One of the following chip-specific strings:
         "wlf,wm5102"
         "wlf,wm5110"
+        "wlf,wm8280"
         "wlf,wm8997"
   - reg : I2C slave address when connected using I2C, chip select number when
     using SPI.

@@ -26,10 +27,16 @@ Required properties:
   - #gpio-cells : Must be 2. The first cell is the pin number and the
     second cell is used to specify optional parameters (currently unused).
 
-  - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110),
-    CPVDD-supply, SPKVDDL-supply (wm5102, wm5110), SPKVDDR-supply (wm5102,
-    wm5110), SPKVDD-supply (wm8997) : Power supplies for the device, as covered
-    in Documentation/devicetree/bindings/regulator/regulator.txt
+  - AVDD-supply, DBVDD1-supply, CPVDD-supply : Power supplies for the device,
+    as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+  
+  - DBVDD2-supply, DBVDD3-supply : Additional databus power supplies (wm5102,
+    wm5110, wm8280)
+
+  - SPKVDDL-supply, SPKVDDR-supply : Speaker driver power supplies (wm5102,
+    wm5110, wm8280)
+  
+  - SPKVDD-supply : Speaker driver power supply (wm8997)
 
 Optional properties:

Signature · 1 line

1.7.2.5

Linus Walleij

Acked-by on v1 4/6

2014-11-14 10:17 UTC #11 lore raw

Re: [PATCH 4/6] gpio: arizona: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Quoted 1 line · Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

Acked-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

Mark Brown

maintainer Acked-by on v1 6/6

2014-11-18 14:29 UTC #15 lore raw

Re: [PATCH 6/6] ASoC: arizona: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Quoted 1 line · Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

Acked-by Mark Brown <[email protected]>

Lee Jones

2014-11-18 15:41 UTC #2 lore raw

Re: [PATCH 1/6] mfd: arizona: add support for WM8280/WM8281

In reply to Richard Fitzgerald

Quoted 4 lines · Richard Fitzgerald

This adds support for the Wolfson Microelectronics WM8280 and WM8281 codecs.
Signed-off-by Richard Fitzgerald <[email protected]>

Quoted 8 lines

---
 drivers/mfd/Kconfig              |    5 +++--
 drivers/mfd/arizona-core.c       |   14 ++++++++++++--
 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, 21 insertions(+), 4 deletions(-)

Patch looks fine. Can I just take it?

Quoted 131 lines

drivers/mfd/Kconfig +3 -2

index abef204..e00a90f 100644
@@ -1236,10 +1236,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 +12 -2

index bce7c07..6e6b732 100644
@@ -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,18 @@ 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:
 			dev_err(arizona->dev, "WM5110 registered as %d\n",
 				arizona->type);
 			arizona->type = WM5110;
+			break;
 		}
 		apply_patch = wm5110_patch;
 		break;

@@ -1010,6 +1019,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

index 9d4156f..ff782a5 100644
@@ -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

index 3a3fe7c..d063b94 100644
@@ -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

index 5145d78..721b93f 100644
@@ -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

@@ -82,6 +83,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);

include/linux/mfd/arizona/core.h +1 -0

index 910e3aa..f970105 100644
@@ -24,6 +24,7 @@ enum arizona_type {
 	WM5102 = 1,
 	WM5110 = 2,
 	WM8997 = 3,
+	WM8280 = 4,
 };
 
 #define ARIZONA_IRQ_GP1                    0

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Richard Fitzgerald

author

2014-11-18 15:56 UTC #3 lore raw

Re: [PATCH 1/6] mfd: arizona: add support for WM8280/WM8281

Quoted 15 lines · Lee Jones

Quoted 4 lines · Richard Fitzgerald
This adds support for the Wolfson Microelectronics WM8280 and WM8281 codecs.
Signed-off-by Richard Fitzgerald <rf-yzvPICuk2AATkU/[email protected]>
Quoted 8 lines
---
 drivers/mfd/Kconfig              |    5 +++--
 drivers/mfd/arizona-core.c       |   14 ++++++++++++--
 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, 21 insertions(+), 4 deletions(-)

Quoted 1 line

Patch looks fine. Can I just take it?

The other patches depends on the #define instroduce here, so they need to be kept together. If you could take them through the mfd tree that would be great. We still need ack of the regulator patch and my re-worked devicetree binding patch.

Quoted 131 lines

drivers/mfd/Kconfig +3 -2

index abef204..e00a90f 100644
@@ -1236,10 +1236,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 +12 -2

index bce7c07..6e6b732 100644
@@ -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,18 @@ 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:
 			dev_err(arizona->dev, "WM5110 registered as %d\n",
 				arizona->type);
 			arizona->type = WM5110;
+			break;
 		}
 		apply_patch = wm5110_patch;
 		break;

@@ -1010,6 +1019,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

index 9d4156f..ff782a5 100644
@@ -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

index 3a3fe7c..d063b94 100644
@@ -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

index 5145d78..721b93f 100644
@@ -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

@@ -82,6 +83,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);

include/linux/mfd/arizona/core.h +1 -0

index 910e3aa..f970105 100644
@@ -24,6 +24,7 @@ enum arizona_type {
 	WM5102 = 1,
 	WM5110 = 2,
 	WM8997 = 3,
+	WM8280 = 4,
 };

Quoted 7 lines

Quoted 1 line

include/linux/mfd/arizona/core.h +0 -0

 #define ARIZONA_IRQ_GP1                    0

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Richard Fitzgerald

author

2014-11-24 14:18 UTC #8 lore raw

Re: [alsa-devel] [PATCH 3/6] regulator: arizona-micsupp: Add support for WM8280/WM8281

In reply to Richard Fitzgerald

Quoted 20 lines · Richard Fitzgerald

Signed-off-by Richard Fitzgerald <[email protected]>

---
 drivers/regulator/arizona-micsupp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

drivers/regulator/arizona-micsupp.c +1 -0

index ce9aca5..4ff55e1 100644
@@ -245,6 +245,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
 	 */
 	switch (arizona->type) {
 	case WM5110:
+	case WM8280:
 		desc = &arizona_micsupp_ext;
 		micsupp->init_data = arizona_micsupp_ext_default;
 		break;

Signature · 1 line

1.7.2.5

Mark - if this patch is ok with you could you ack it so Lee can merge in this series? Thanks.

Quoted 4 lines

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Mark Brown

maintainer

2014-11-24 15:07 UTC #9 lore raw

Re: [alsa-devel] [PATCH 3/6] regulator: arizona-micsupp: Add support for WM8280/WM8281

Quoted 2 lines · Richard Fitzgerald

Mark - if this patch is ok with you could you ack it so Lee can merge in this series? Thanks.

Don't send quoted nags, please send patches for review.