Skip to contentSkip to conversation

mfd: arizona: Add support for WM8280/WM8281

PATCH RESEND Applied Charles Keepax 2 participants 13 messages Mar 3, 2015 – Mar 12, 2015

Subsystems (8)
Device tree bindings Sound ASoC GPIO +4 more subsystems
lore
Share & tools
lore

Charles Keepax

author
#0 lore raw

PATCH RESEND 1/6 mfd: arizona: Add support for WM8280/WM8281

From: Richard Fitzgerald <[email protected]>

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

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Lee Jones <[email protected]>
[ Minor fixup to remove potentially uninitialised variable. ]
Signed-off-by Charles Keepax <[email protected]>
---
 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(-)
drivers/mfd/Kconfig +3 -2
index 0ad88c7..b5fb03c 100644
@@ -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"
drivers/mfd/arizona-core.c +13 -2
index 09ba8f1..9f81998 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,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;
drivers/mfd/arizona-i2c.c +2 -0
index 9d4156f..ff782a5d 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 8ef58bc..1e845f6 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

@@ -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);
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
author
#1 lore raw

PATCH RESEND 2/6 mfd: arizona: Update binding documentation for WM8280

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Signed-off-by Charles Keepax <[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 bfef000..af8646f 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
Applied
#2 lore raw

Re: [RESEND PATCH 2/6] mfd: arizona: Update binding documentation for WM8280

Quoted 7 lines · Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 Documentation/devicetree/bindings/mfd/arizona.txt |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

Applied, thanks.

Will send out pull-request once this has had time to soak in -next.

Quoted 33 lines
Documentation/devicetree/bindings/mfd/arizona.txt +11 -4
index bfef000..af8646f 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 · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#3 lore raw

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

In reply to Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Reviewed-by Mark Brown <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/regulator/arizona-micsupp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/regulator/arizona-micsupp.c +1 -0
index 2007900..bfe5dac 100644
@@ -246,6 +246,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
Applied
#4 lore raw

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

Quoted 8 lines · Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Reviewed-by Mark Brown <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/regulator/arizona-micsupp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Will send out pull-request once this has had time to soak in -next.

Quoted 12 lines
drivers/regulator/arizona-micsupp.c +1 -0
index 2007900..bfe5dac 100644
@@ -246,6 +246,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 · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#5 lore raw

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

In reply to Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Linus Walleij <[email protected]>
Signed-off-by Charles Keepax <[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
Applied
#6 lore raw

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

Quoted 8 lines · Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Linus Walleij <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/gpio/gpio-arizona.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Will send out pull-request once this has had time to soak in -next.

Quoted 12 lines
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 · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#7 lore raw

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

In reply to Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Chanwoo Choi <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/extcon/extcon-arizona.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/extcon/extcon-arizona.c +1 -0
index 63f01c4..6b5e795 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
Applied
#8 lore raw

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

Quoted 8 lines · Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Chanwoo Choi <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/extcon/extcon-arizona.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Will send out pull-request once this has had time to soak in -next.

Quoted 12 lines
drivers/extcon/extcon-arizona.c +1 -0
index 63f01c4..6b5e795 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 · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#9 lore raw

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

In reply to Charles Keepax

From: Richard Fitzgerald <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Mark Brown <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
---
 sound/soc/codecs/arizona.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
sound/soc/codecs/arizona.c +2 -0
index 4c90602..95d31d6 100644
@@ -280,6 +280,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:

@@ -1728,6 +1729,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
Applied
#10 lore raw

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

Quoted 8 lines · Charles Keepax

From: Richard Fitzgerald <rf-yzvPICuk2AATkU/[email protected]>

Signed-off-by Richard Fitzgerald <rf-yzvPICuk2AATkU/[email protected]>
Acked-by Mark Brown <[email protected]>
Signed-off-by Charles Keepax <ckeepax-yzvPICuk2AATkU/[email protected]>
---
 sound/soc/codecs/arizona.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Applied, thanks.

Will send out pull-request once this has had time to soak in -next.

Quoted 20 lines
sound/soc/codecs/arizona.c +2 -0
index 4c90602..95d31d6 100644
@@ -280,6 +280,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:

@@ -1728,6 +1729,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 · 8 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
Applied
#11 lore raw
In reply to Charles Keepax
Quoted 9 lines · Charles Keepax

From: Richard Fitzgerald <[email protected]>

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

Signed-off-by Richard Fitzgerald <[email protected]>
Acked-by Lee Jones <[email protected]>
[ Minor fixup to remove potentially uninitialised variable. ]
Signed-off-by Charles Keepax <[email protected]>
Quoted 8 lines
---
 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(-)

Applied, thanks.

Will send out pull-request once this has had time to soak in -next.

Quoted 132 lines
drivers/mfd/Kconfig +3 -2
index 0ad88c7..b5fb03c 100644
@@ -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"
drivers/mfd/arizona-core.c +13 -2
index 09ba8f1..9f81998 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,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;
drivers/mfd/arizona-i2c.c +2 -0
index 9d4156f..ff782a5d 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 8ef58bc..1e845f6 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

@@ -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);
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
#12 lore raw

[GIT PULL] Immutable branch between MFD, Extcon, GPIO and Regulator

In reply to Charles Keepax

Gentlemen,

I think this has soaked for long enough now. Hopefully there are no issues.

The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539:

Linux 4.0-rc1 (2015-02-22 18:21:14 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-extcon-gpio-regulator-v4.1

for you to fetch changes up to 575ef7f6d5df2aec86f407c76c0b95b3064e4b30:

ASoC: arizona: Add support for WM8280/WM8281 (2015-02-26 10:04:45 +0000)

----------------------------------------------------------------
Immutable branch between MFD, Extcon, GPIO and Regulator due for the v4.1 merge window

----------------------------------------------------------------
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(-)
Signature · 8 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