Add support for Cirrus Logic CS47L24 and WM1831 codecs
Subsystems (8)
v2 cover Add support for Cirrus Logic CS47L24 and WM1831 codecs
mfd patch based on Lee Jones's for-next
gpio patch based on Linus Walleij's for-next
ASoC patch based on Mark Brown's for-next
Lee/Mark - can one of you take all three patches (with maintainer acks) so that the patch set is kept together?
Richard Fitzgerald (3):
mfd: arizona: Support Cirrus Logic CS47L24 and WM1831
gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecs
Documentation/devicetree/bindings/mfd/arizona.txt | 4 +- drivers/gpio/gpio-arizona.c | 4 + drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 74 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l24.c | 1148 +++++++++++++++ sound/soc/codecs/cs47l24.h | 23 + 14 files changed, 2942 insertions(+), 26 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.c create mode 100644 sound/soc/codecs/cs47l24.c create mode 100644 sound/soc/codecs/cs47l24.h
Signature · 1 line
1.9.1
PATCH v2 1/3 mfd: arizona: Support Cirrus Logic CS47L24 and WM1831
This patch adds the regmap configuration tables and core MFD handling for the CS47L24 and WM1831 codecs.
Note that compared to the other Arizona codecs, these devices do not have an LDO1 or micsupp regulators, extcon driver, or the DCVDD isolation control.
--- Documentation/devicetree/bindings/mfd/arizona.txt | 4 +- drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 74 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + 9 files changed, 1757 insertions(+), 26 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.c
Documentation/devicetree/bindings/mfd/arizona.txt +3 -1
@@ -1,4 +1,4 @@ -Wolfson Arizona class audio SoCs +Cirrus Logic/Wolfson Microelectronics Arizona class audio SoCs These devices are audio SoCs with extensive digital capabilites and a range of analogue I/O.
@@ -12,6 +12,8 @@ Required properties: "wlf,wm8997" "wlf,wm8998" "wlf,wm1814" + "wlf,wm1831" + "cirrus,cs47l24" - reg : I2C slave address when connected using I2C, chip select number when using SPI.
drivers/mfd/Kconfig +13 -6
@@ -1370,24 +1370,24 @@ config MFD_ARIZONA bool config MFD_ARIZONA_I2C - tristate "Wolfson Microelectronics Arizona platform with I2C" + tristate "Cirrus Logic/Wolfson Microelectronics Arizona platform with I2C" select MFD_ARIZONA select MFD_CORE select REGMAP_I2C depends on I2C help - Support for the Wolfson Microelectronics Arizona platform audio SoC - core functionality controlled via I2C. + Support for the Cirrus Logic/Wolfson Microelectronics Arizona platform + audio SoC core functionality controlled via I2C. config MFD_ARIZONA_SPI - tristate "Wolfson Microelectronics Arizona platform with SPI" + tristate "Cirrus Logic/Wolfson Microelectronics Arizona platform with SPI" select MFD_ARIZONA select MFD_CORE select REGMAP_SPI depends on SPI_MASTER help - Support for the Wolfson Microelectronics Arizona platform audio SoC - core functionality controlled via I2C. + Support for the Cirrus Logic/Wolfson Microelectronics Arizona platform + audio SoC core functionality controlled via I2C. config MFD_WM5102 bool "Wolfson Microelectronics WM5102"
@@ -1414,6 +1414,13 @@ config MFD_WM8998 help Support for Wolfson Microelectronics WM8998 low power audio SoC +config MFD_CS47L24 + bool "Cirrus Logic CS47L24 and WM1831" + depends on MFD_ARIZONA + help + Support for Cirrus Logic CS47L24 and WM1831 low power audio SoC + + config MFD_WM8400 bool "Wolfson Microelectronics WM8400" select MFD_CORE
drivers/mfd/Makefile +3 -0
@@ -51,6 +51,9 @@ endif ifeq ($(CONFIG_MFD_WM8998),y) obj-$(CONFIG_MFD_ARIZONA) += wm8998-tables.o endif +ifeq ($(CONFIG_MFD_CS47L24),y) +obj-$(CONFIG_MFD_ARIZONA) += cs47l24-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 +68 -6
128 lines not on this page · raw message
drivers/mfd/arizona-irq.c +27 -13
@@ -30,11 +30,13 @@ static int arizona_map_irq(struct arizona *arizona, int irq) {int ret; - ret =regmap_irq_get_virq (arizona->aod_irq_chip, irq); -if (ret <0 ) - ret =regmap_irq_get_virq (arizona->irq_chip, irq); +if (arizona->aod_irq_chip) { + ret =regmap_irq_get_virq (arizona->aod_irq_chip, irq); +if (ret >=0 ) +return ret; + } -return ret; +return regmap_irq_get_virq (arizona->irq_chip, irq); } int arizona_request_irq(struct arizona *arizona, int irq, char *name,
@@ -107,8 +109,8 @@ static irqreturn_t arizona_irq_thread(int irq, void *data) do { poll = false; - /* Always handle the AoD domain */ - handle_nested_irq(irq_find_mapping(arizona->virq, 0)); + if (arizona->aod_irq_chip) + handle_nested_irq(irq_find_mapping(arizona->virq, 0)); /* * Check if one of the main interrupts is asserted and only
@@ -219,6 +221,15 @@ int arizona_irq_init(struct arizona *arizona) arizona->ctrlif_error = false;break ;#endif +#ifdef CONFIG_MFD_CS47L24 +case WM1831 : +case CS47L24 : + aod =NULL ; + irq = &cs47l24_irq; + + arizona->ctrlif_error = false; +break ; +#endif #ifdef CONFIG_MFD_WM8997 case WM8997 : aod = &wm8997_aod;
@@ -291,13 +302,16 @@ int arizona_irq_init(struct arizona *arizona) goto err; } - ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,0 ), -IRQF_ONESHOT ,0 , aod, - &arizona->aod_irq_chip); -if (ret !=0 ) { -dev_err (arizona->dev,"Failed to add AOD IRQs: %d\n" , ret); - goto err_domain; +if (aod) { + ret =regmap_add_irq_chip (arizona->regmap, +irq_create_mapping (arizona->virq,0 ), +IRQF_ONESHOT ,0 , aod, + &arizona->aod_irq_chip); +if (ret !=0 ) { +dev_err (arizona->dev, +"Failed to add AOD IRQs: %d\n" , ret); + goto err_domain; + } } ret = regmap_add_irq_chip(arizona->regmap,
drivers/mfd/arizona-spi.c +7 -0
@@ -46,6 +46,11 @@ static int arizona_spi_probe(struct spi_device *spi)if (IS_ENABLED (CONFIG_MFD_WM5110 )) regmap_config = &wm5110_spi_regmap;break ; +case WM1831 : +case CS47L24 : +if (IS_ENABLED (CONFIG_MFD_CS47L24 )) + regmap_config = &cs47l24_spi_regmap; +break ;default :dev_err (&spi->dev,"Unknown device type %ld\n" , type);return -EINVAL ;
@@ -89,6 +94,8 @@ static const struct spi_device_id arizona_spi_ids[] = { { "wm5102", WM5102 }, { "wm5110", WM5110 }, { "wm8280", WM8280 }, + { "wm1831", WM1831 }, + { "cs47l24", CS47L24 }, { }, };MODULE_DEVICE_TABLE (spi, arizona_spi_ids);
drivers/mfd/arizona.h +4 -0
@@ -25,6 +25,8 @@ extern const struct regmap_config wm5102_spi_regmap;extern const struct regmap_config wm5110_i2c_regmap;extern const struct regmap_config wm5110_spi_regmap; +extern const struct regmap_config cs47l24_spi_regmap; +extern const struct regmap_config wm8997_i2c_regmap;extern const struct regmap_config wm8998_i2c_regmap;
@@ -40,6 +42,8 @@ extern const struct regmap_irq_chip wm5110_aod;extern const struct regmap_irq_chip wm5110_irq;extern const struct regmap_irq_chip wm5110_revd_irq; +extern const struct regmap_irq_chip cs47l24_irq; +extern const struct regmap_irq_chip wm8997_aod;extern const struct regmap_irq_chip wm8997_irq;
drivers/mfd/cs47l24-tables.c new file +1629 -0
1,629 lines not on this page · raw message
include/linux/mfd/arizona/core.h +3 -0
@@ -27,6 +27,8 @@ enum arizona_type {WM8280 =4 ,WM8998 =5 ,WM1814 =6 , +WM1831 =7 , + CS47L24 = 8, };#define ARIZONA_IRQ_GP1 0
@@ -166,6 +168,7 @@ static inline int wm5102_patch(struct arizona *arizona)#endif int wm5110_patch (struct arizona *arizona); +int cs47l24_patch (struct arizona *arizona);int wm8997_patch (struct arizona *arizona);int wm8998_patch (struct arizona *arizona);
Signature · 1 line
1.9.1
PATCH v2 2/3 gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
In reply to Richard FitzgeraldThe CS47L24 and WM1831 codecs only have two GPIO lines, but are otherwise similar to the WM8280.
--- drivers/gpio/gpio-arizona.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpio/gpio-arizona.c +4 -0
@@ -122,6 +122,10 @@ static int arizona_gpio_probe(struct platform_device *pdev)case WM1814 : arizona_gpio->gpio_chip.ngpio =5 ;break ; +case WM1831 : +case CS47L24 : + arizona_gpio->gpio_chip.ngpio =2 ; +break ;default :dev_err (&pdev->dev,"Unknown chip variant %d\n" , arizona->type);
Signature · 1 line
1.9.1
PATCH v2 3/3 ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecs
In reply to Richard FitzgeraldThis patch adds support for the Cirrus Logic CS47L24 and WM1831 codecs.
--- sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l24.c | 1148 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/cs47l24.h | 23 + 4 files changed, 1181 insertions(+) create mode 100644 sound/soc/codecs/cs47l24.c create mode 100644 sound/soc/codecs/cs47l24.h
sound/soc/codecs/Kconfig +8 -0
@@ -134,6 +134,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM5100 if I2C select SND_SOC_WM5102 if MFD_WM5102 select SND_SOC_WM5110 if MFD_WM5110 + select SND_SOC_CS47L24 if MFD_CS47L24 select SND_SOC_WM8350 if MFD_WM8350 select SND_SOC_WM8400 if MFD_WM8400 select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
@@ -197,10 +198,12 @@ config SND_SOC_ARIZONA tristate default y if SND_SOC_WM5102=y default y if SND_SOC_WM5110=y + default y if SND_SOC_CS47L24=y default y if SND_SOC_WM8997=y default y if SND_SOC_WM8998=y default m if SND_SOC_WM5102=m default m if SND_SOC_WM5110=m + default m if SND_SOC_CS47L24=m default m if SND_SOC_WM8997=m default m if SND_SOC_WM8998=m
@@ -213,9 +216,11 @@ config SND_SOC_WM_ADSP tristate default y if SND_SOC_WM5102=y default y if SND_SOC_WM5110=y + default y if SND_SOC_CS47L24=y default y if SND_SOC_WM2200=y default m if SND_SOC_WM5102=m default m if SND_SOC_WM5110=m + default m if SND_SOC_CS47L24=m default m if SND_SOC_WM2200=m config SND_SOC_AB8500_CODEC
@@ -733,6 +738,9 @@ config SND_SOC_WM5102 config SND_SOC_WM5110 tristate +config SND_SOC_CS47L24 + tristate "TEST cs47l24" + config SND_SOC_WM8350 tristate
sound/soc/codecs/Makefile +2 -0
@@ -138,6 +138,7 @@ snd-soc-wm2200-objs := wm2200.o snd-soc-wm5100-objs := wm5100.o wm5100-tables.o snd-soc-wm5102-objs := wm5102.o snd-soc-wm5110-objs := wm5110.o +snd-soc-cs47l24-objs := cs47l24.o snd-soc-wm8350-objs := wm8350.o snd-soc-wm8400-objs := wm8400.o snd-soc-wm8510-objs := wm8510.o
@@ -329,6 +330,7 @@ obj-$(CONFIG_SND_SOC_WM2200) += snd-soc-wm2200.o obj-$(CONFIG_SND_SOC_WM5100) += snd-soc-wm5100.o obj-$(CONFIG_SND_SOC_WM5102) += snd-soc-wm5102.o obj-$(CONFIG_SND_SOC_WM5110) += snd-soc-wm5110.o +obj-$(CONFIG_SND_SOC_CS47L24) += snd-soc-cs47l24.o obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o
sound/soc/codecs/cs47l24.c new file +1148 -0
1,148 lines not on this page · raw message
sound/soc/codecs/cs47l24.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* cs47l24.h -- ALSA SoC Audio driver for Cirrus Logic CS47L24 +* +* Copyright 2015 Cirrus Logic Inc. +* +* Author: Richard Fitzgerald <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef _CS47L24_H +#define _CS47L24_H + +#include "arizona.h" + +#define CS47L24_FLL1 1 +#define CS47L24_FLL2 2 +#define CS47L24_FLL1_REFCLK 3 +#define CS47L24_FLL2_REFCLK 4 + +#endif
Signature · 1 line
1.9.1
Does anybody have support written for the CS53L30 4 channel ADC ?
Thanks,
-Caleb
Quoted 40 lines · Richard Fitzgerald
mfd patch based on Lee Jones's for-next
gpio patch based on Linus Walleij's for-next
ASoC patch based on Mark Brown's for-nextLee/Mark - can one of you take all three patches (with maintainer acks) so that the patch set is kept together?
Richard Fitzgerald (3):
mfd: arizona: Support Cirrus Logic CS47L24 and WM1831
gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecsDocumentation/devicetree/bindings/mfd/arizona.txt | 4 +- drivers/gpio/gpio-arizona.c | 4 + drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 74 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l24.c | 1148 +++++++++++++++ sound/soc/codecs/cs47l24.h | 23 + 14 files changed, 2942 insertions(+), 26 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.c create mode 100644 sound/soc/codecs/cs47l24.c create mode 100644 sound/soc/codecs/cs47l24.h--
1.9.1_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
(Accidentally sent HTML format last time, so re-sending...)
Does anybody have support written for the CS53L30 4 channel ADC ?
Thanks,
-Caleb
Quoted 38 lines · Richard Fitzgerald
mfd patch based on Lee Jones's for-next
gpio patch based on Linus Walleij's for-next
ASoC patch based on Mark Brown's for-nextLee/Mark - can one of you take all three patches (with maintainer acks) so that the patch set is kept together?
Richard Fitzgerald (3):
mfd: arizona: Support Cirrus Logic CS47L24 and WM1831
gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecsDocumentation/devicetree/bindings/mfd/arizona.txt | 4 +- drivers/gpio/gpio-arizona.c | 4 + drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 74 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l24.c | 1148 +++++++++++++++ sound/soc/codecs/cs47l24.h | 23 + 14 files changed, 2942 insertions(+), 26 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.c create mode 100644 sound/soc/codecs/cs47l24.c create mode 100644 sound/soc/codecs/cs47l24.h--
1.9.1_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 8 lines · Caleb Crome
(Accidentally sent HTML format last time, so re-sending...)
Does anybody have support written for the CS53L30 4 channel ADC ?
Thanks,
-Caleb
You'd be more likely to get a reply to that if you started a new thread that included in the email title the part number of the device you are interested in. It not reasonable to assume that someone who knows about the CS53L30 would expect to find a discussion of it under a thread about a different device.
Quoted 44 lines
Quoted 31 lines · Richard Fitzgerald
mfd patch based on Lee Jones's for-next
gpio patch based on Linus Walleij's for-next
ASoC patch based on Mark Brown's for-nextLee/Mark - can one of you take all three patches (with maintainer acks) so that the patch set is kept together?
Richard Fitzgerald (3):
mfd: arizona: Support Cirrus Logic CS47L24 and WM1831
gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecsDocumentation/devicetree/bindings/mfd/arizona.txt | 4 +- drivers/gpio/gpio-arizona.c | 4 + drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 74 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l24.c | 1148 +++++++++++++++ sound/soc/codecs/cs47l24.h | 23 + 14 files changed, 2942 insertions(+), 26 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.c create mode 100644 sound/soc/codecs/cs47l24.c create mode 100644 sound/soc/codecs/cs47l24.hQuoted 7 lines
--
1.9.1_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 10 lines · Richard Fitzgerald
Quoted 8 lines · Caleb Crome
(Accidentally sent HTML format last time, so re-sending...)
Does anybody have support written for the CS53L30 4 channel ADC ?
Thanks,
-Caleb
Quoted 6 lines
You'd be more likely to get a reply to that if you started a new thread that included in the email title the part number of the device you are interested in. It not reasonable to assume that someone who knows about the CS53L30 would expect to find a discussion of it under a thread about a different device.
Ah, fair enough . I figured that the group of folks paying attention to the CS47L24 might be the same people paying attention to the CS53L30.
Thanks,
-caleb
Mark Brown
maintainerRe: [PATCH v2 3/3] ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecs
In reply to Richard Fitzgeraldsound/soc/codecs/Kconfig config SND_SOC_ALL_CODECS · line 140
Quoted 8 lines · Richard Fitzgerald
sound/soc/codecs/Kconfig +1
-0@@ -134,6 +134,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM5100 if I2C select SND_SOC_WM5102 if MFD_WM5102 select SND_SOC_WM5110 if MFD_WM5110 + select SND_SOC_CS47L24 if MFD_CS47L24 select SND_SOC_WM8350 if MFD_WM8350 select SND_SOC_WM8400 if MFD_WM8400 select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
Please keep the Makefile and Kconfig sorted.
sound/soc/codecs/Kconfig config SND_SOC_WM5102 · line 743
Quoted 3 lines
sound/soc/codecs/Kconfig +3
-0+config SND_SOC_CS47L24 + tristate "TEST cs47l24" +
This isn't a good help text for the symbol.
Otherwise the code looks good.
Re: [PATCH v2 2/3] gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
In reply to Richard FitzgeraldQuoted 4 lines · Richard Fitzgerald
The CS47L24 and WM1831 codecs only have two GPIO lines, but are otherwise similar to the WM8280.
Signed-off-by Richard Fitzgerald <[email protected]>
Lee can merge this into the MFD tree with patch 1/3 if he likes, I guess that's simplest.
Yours,
Linus Walleij
Re: [PATCH v2 2/3] gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
Quoted 6 lines · Linus Walleij
Quoted 3 lines · Richard Fitzgerald
The CS47L24 and WM1831 codecs only have two GPIO lines, but are otherwise similar to the WM8280.
Quoted 6 lines
Quoted 1 line
Signed-off-by Richard Fitzgerald <[email protected]>Acked-by Linus Walleij <[email protected]>Lee can merge this into the MFD tree with patch 1/3 if he likes, I guess that's simplest.
I can do. Do you require a pull-request?
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 linux-gpio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] gpio: arizona: Support Cirrus Logic CS47L24 and WM1831
Quoted 8 lines · Lee Jones
Quoted 6 lines · Linus Walleij
Quoted 3 lines · Richard Fitzgerald
The CS47L24 and WM1831 codecs only have two GPIO lines, but are otherwise similar to the WM8280.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Signed-off-by Richard Fitzgerald <[email protected]>Acked-by Linus Walleij <[email protected]>Lee can merge this into the MFD tree with patch 1/3 if he likes, I guess that's simplest.
I can do. Do you require a pull-request?
Nah. I usually optimistically assume that these (small) things will not clash.
Yours,
Linus Walleij
Re: [PATCH v2 1/3] mfd: arizona: Support Cirrus Logic CS47L24 and WM1831
In reply to Richard FitzgeraldQuoted 10 lines · Richard Fitzgerald
This patch adds the regmap configuration tables and core MFD handling for the CS47L24 and WM1831 codecs.
Note that compared to the other Arizona codecs, these devices do not have an LDO1 or micsupp regulators, extcon driver, or the DCVDD isolation control.
Signed-off-by Richard Fitzgerald <[email protected]>--- Documentation/devicetree/bindings/mfd/arizona.txt | 4 +-
Separate patch please.
Quoted 66 lines
drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 74 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + 9 files changed, 1757 insertions(+), 26 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.cDocumentation/devicetree/bindings/mfd/arizona.txt +3
-1@@ -1,4 +1,4 @@ -Wolfson Arizona class audio SoCs +Cirrus Logic/Wolfson Microelectronics Arizona class audio SoCs These devices are audio SoCs with extensive digital capabilites and a range of analogue I/O.@@ -12,6 +12,8 @@ Required properties: "wlf,wm8997" "wlf,wm8998" "wlf,wm1814" + "wlf,wm1831" + "cirrus,cs47l24" - reg : I2C slave address when connected using I2C, chip select number when using SPI.drivers/mfd/Kconfig +6
-6@@ -1370,24 +1370,24 @@ config MFD_ARIZONA bool config MFD_ARIZONA_I2C - tristate "Wolfson Microelectronics Arizona platform with I2C" + tristate "Cirrus Logic/Wolfson Microelectronics Arizona platform with I2C" select MFD_ARIZONA select MFD_CORE select REGMAP_I2C depends on I2C help - Support for the Wolfson Microelectronics Arizona platform audio SoC - core functionality controlled via I2C. + Support for the Cirrus Logic/Wolfson Microelectronics Arizona platform + audio SoC core functionality controlled via I2C. config MFD_ARIZONA_SPI - tristate "Wolfson Microelectronics Arizona platform with SPI" + tristate "Cirrus Logic/Wolfson Microelectronics Arizona platform with SPI" select MFD_ARIZONA select MFD_CORE select REGMAP_SPI depends on SPI_MASTER help - Support for the Wolfson Microelectronics Arizona platform audio SoC - core functionality controlled via I2C. + Support for the Cirrus Logic/Wolfson Microelectronics Arizona platform + audio SoC core functionality controlled via I2C. config MFD_WM5102 bool "Wolfson Microelectronics WM5102"
drivers/mfd/Kconfig config MFD_WM8998 · line 1423
Quoted 10 lines
drivers/mfd/Kconfig +7
-0@@ -1414,6 +1414,13 @@ config MFD_WM8998 help Support for Wolfson Microelectronics WM8998 low power audio SoC +config MFD_CS47L24 + bool "Cirrus Logic CS47L24 and WM1831" + depends on MFD_ARIZONA + help + Support for Cirrus Logic CS47L24 and WM1831 low power audio SoC + +
Superflous '\n'.
[...]
drivers/mfd/cs47l24-tables.c line 2
Quoted 8 lines
drivers/mfd/cs47l24-tables.c new file +2
-0@@ -0,0 +1,1629 @@ +/* +* cs47l24-tables.c -- data tables for CS47L24 codec
Please remove this filename.
They have a habit of becoming unaligned.
Quoted 8 lines
drivers/mfd/cs47l24-tables.c new file +8
-0+* Copyright 2015 Cirrus Logic, Inc. +* +* Author: Richard Fitzgerald <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/
[...]
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 linux-gpio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html