mfd: madera: Update DT bindings to add additional CODECs
Charles Keepax
maintainerPATCH v2 1/4 mfd: madera: Update DT bindings to add additional CODECs
From: Richard Fitzgerald <[email protected]>
This adds the cs47l15, cs42l92, cs47l92 and cs47l93 to the list of compatible strings and updates some properties that need to note the new CODECs.
---
No change since v1.
Thanks,
Charles
Documentation/devicetree/bindings/mfd/madera.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mfd/madera.txt +6 -2
@@ -11,10 +11,14 @@ bindings/sound/madera.txt Required properties: - compatible : One of the following chip-specific strings: + "cirrus,cs47l15" "cirrus,cs47l35" "cirrus,cs47l85" "cirrus,cs47l90" "cirrus,cs47l91" + "cirrus,cs42l92" + "cirrus,cs47l92" + "cirrus,cs47l93" "cirrus,wm1840" - reg : I2C slave address when connected using I2C, chip select number when
@@ -22,7 +26,7 @@ Required properties: - DCVDD-supply : Power supply for the device as defined in bindings/regulator/regulator.txt - Mandatory on CS47L35, CS47L90, CS47L91 + Mandatory on CS47L15, CS47L35, CS47L90, CS47L91, CS42L92, CS47L92, CS47L93 Optional on CS47L85, WM1840 - AVDD-supply, DBVDD1-supply, DBVDD2-supply, CPVDD1-supply, CPVDD2-supply :
@@ -35,7 +39,7 @@ Required properties: (CS47L85, WM1840) - SPKVDD-supply : Power supply for the device - (CS47L35) + (CS47L15, CS47L35) - interrupt-controller : Indicates that this device is an interrupt controller
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH v2 2/4 mfd: madera: Remove some unused registers and fix some defaults
---
New since v1 of the series.
Thanks,
Charles
drivers/mfd/cs47l35-tables.c | 54 +------------------ drivers/mfd/cs47l85-tables.c | 122 ++----------------------------------------- drivers/mfd/cs47l90-tables.c | 76 --------------------------- 3 files changed, 6 insertions(+), 246 deletions(-)
drivers/mfd/cs47l35-tables.c +1 -53
@@ -109,9 +109,8 @@ static const struct reg_default cs47l35_reg_default[] = { { 0x00000174, 0x007d }, /* R372 (0x174) - FLL1 Control 4 */ { 0x00000175, 0x0000 }, /* R373 (0x175) - FLL1 Control 5 */ { 0x00000176, 0x0000 }, /* R374 (0x176) - FLL1 Control 6 */ - { 0x00000177, 0x0281 }, /* R375 (0x177) - FLL1 Loop Filter Test 1 */ { 0x00000179, 0x0000 }, /* R377 (0x179) - FLL1 Control 7 */ - { 0x0000017a, 0x0b06 }, /* R378 (0x17a) - FLL1 EFS2 */ + { 0x0000017a, 0x2906 }, /* R378 (0x17a) - FLL1 EFS2 */ { 0x0000017f, 0x0000 }, /* R383 (0x17f) - FLL1 Synchroniser 1 */ { 0x00000180, 0x0000 }, /* R384 (0x180) - FLL1 Synchroniser 2 */ { 0x00000181, 0x0000 }, /* R385 (0x181) - FLL1 Synchroniser 3 */
@@ -174,9 +173,6 @@ static const struct reg_default cs47l35_reg_default[] = { { 0x00000434, 0x0000 }, /* R1076 (0x434) - Output Path Config 5R */ { 0x00000435, 0x0180 }, /* R1077 (0x435) - DAC Digital Volume 5R */ { 0x00000437, 0x0200 }, /* R1079 (0x437) - Noise Gate Select 5R */ - { 0x00000440, 0x0003 }, /* R1088 (0x440) - DRE Enable */ - { 0x00000448, 0x0a83 }, /* R1096 (0x448) - eDRE Enable */ - { 0x0000044a, 0x0000 }, /* R1098 (0x44a) - eDRE Manual */ { 0x00000450, 0x0000 }, /* R1104 (0x450) - DAC AEC Control 1 */ { 0x00000451, 0x0000 }, /* R1105 (0x451) - DAC AEC Control 2 */ { 0x00000458, 0x0000 }, /* R1112 (0x458) - Noise Gate Control */
@@ -720,28 +716,6 @@ static const struct reg_default cs47l35_reg_default[] = { { 0x00000ef3, 0x0000 }, /* R3827 (0xef3) - ISRC 2 CTRL 1 */ { 0x00000ef4, 0x0001 }, /* R3828 (0xef4) - ISRC 2 CTRL 2 */ { 0x00000ef5, 0x0000 }, /* R3829 (0xef5) - ISRC 2 CTRL 3 */ - { 0x00001300, 0x0000 }, /* R4864 (0x1300) - DAC Comp 1 */ - { 0x00001302, 0x0000 }, /* R4866 (0x1302) - DAC Comp 2 */ - { 0x00001380, 0x0000 }, /* R4992 (0x1380) - FRF Coefficient 1L 1 */ - { 0x00001381, 0x0000 }, /* R4993 (0x1381) - FRF Coefficient 1L 2 */ - { 0x00001382, 0x0000 }, /* R4994 (0x1382) - FRF Coefficient 1L 3 */ - { 0x00001383, 0x0000 }, /* R4995 (0x1383) - FRF Coefficient 1L 4 */ - { 0x00001390, 0x0000 }, /* R5008 (0x1390) - FRF Coefficient 1R 1 */ - { 0x00001391, 0x0000 }, /* R5009 (0x1391) - FRF Coefficient 1R 2 */ - { 0x00001392, 0x0000 }, /* R5010 (0x1392) - FRF Coefficient 1R 3 */ - { 0x00001393, 0x0000 }, /* R5011 (0x1393) - FRF Coefficient 1R 4 */ - { 0x000013a0, 0x0000 }, /* R5024 (0x13a0) - FRF Coefficient 4L 1 */ - { 0x000013a1, 0x0000 }, /* R5025 (0x13a1) - FRF Coefficient 4L 2 */ - { 0x000013a2, 0x0000 }, /* R5026 (0x13a2) - FRF Coefficient 4L 3 */ - { 0x000013a3, 0x0000 }, /* R5027 (0x13a3) - FRF Coefficient 4L 4 */ - { 0x000013b0, 0x0000 }, /* R5040 (0x13b0) - FRF Coefficient 5L 1 */ - { 0x000013b1, 0x0000 }, /* R5041 (0x13b1) - FRF Coefficient 5L 2 */ - { 0x000013b2, 0x0000 }, /* R5042 (0x13b2) - FRF Coefficient 5L 3 */ - { 0x000013b3, 0x0000 }, /* R5043 (0x13b3) - FRF Coefficient 5L 4 */ - { 0x000013c0, 0x0000 }, /* R5040 (0x13c0) - FRF Coefficient 5R 1 */ - { 0x000013c1, 0x0000 }, /* R5041 (0x13c1) - FRF Coefficient 5R 2 */ - { 0x000013c2, 0x0000 }, /* R5042 (0x13c2) - FRF Coefficient 5R 3 */ - { 0x000013c3, 0x0000 }, /* R5043 (0x13c3) - FRF Coefficient 5R 4 */ { 0x00001700, 0x2001 }, /* R5888 (0x1700) - GPIO1 Control 1 */ { 0x00001701, 0xf000 }, /* R5889 (0x1701) - GPIO1 Control 2 */ { 0x00001702, 0x2001 }, /* R5890 (0x1702) - GPIO2 Control 1 */
@@ -892,7 +866,6 @@ static bool cs47l35_16bit_readable_register(struct device *dev,case MADERA_FLL1_CONTROL_6 :case MADERA_FLL1_CONTROL_7 :case MADERA_FLL1_EFS_2 : -case MADERA_FLL1_LOOP_FILTER_TEST_1 :case CS47L35_FLL1_SYNCHRONISER_1 :case CS47L35_FLL1_SYNCHRONISER_2 :case CS47L35_FLL1_SYNCHRONISER_3 :
@@ -967,9 +940,6 @@ static bool cs47l35_16bit_readable_register(struct device *dev,case MADERA_OUTPUT_PATH_CONFIG_5R :case MADERA_DAC_DIGITAL_VOLUME_5R :case MADERA_NOISE_GATE_SELECT_5R : -case MADERA_DRE_ENABLE : -case MADERA_EDRE_ENABLE : -case MADERA_EDRE_MANUAL :case MADERA_DAC_AEC_CONTROL_1 :case MADERA_DAC_AEC_CONTROL_2 :case MADERA_NOISE_GATE_CONTROL :
@@ -1439,28 +1409,6 @@ static bool cs47l35_16bit_readable_register(struct device *dev,case MADERA_ISRC_2_CTRL_1 :case MADERA_ISRC_2_CTRL_2 :case MADERA_ISRC_2_CTRL_3 : -case MADERA_DAC_COMP_1 : -case MADERA_DAC_COMP_2 : -case MADERA_FRF_COEFFICIENT_1L_1 : -case MADERA_FRF_COEFFICIENT_1L_2 : -case MADERA_FRF_COEFFICIENT_1L_3 : -case MADERA_FRF_COEFFICIENT_1L_4 : -case MADERA_FRF_COEFFICIENT_1R_1 : -case MADERA_FRF_COEFFICIENT_1R_2 : -case MADERA_FRF_COEFFICIENT_1R_3 : -case MADERA_FRF_COEFFICIENT_1R_4 : -case CS47L35_FRF_COEFFICIENT_4L_1 : -case CS47L35_FRF_COEFFICIENT_4L_2 : -case CS47L35_FRF_COEFFICIENT_4L_3 : -case CS47L35_FRF_COEFFICIENT_4L_4 : -case CS47L35_FRF_COEFFICIENT_5L_1 : -case CS47L35_FRF_COEFFICIENT_5L_2 : -case CS47L35_FRF_COEFFICIENT_5L_3 : -case CS47L35_FRF_COEFFICIENT_5L_4 : -case CS47L35_FRF_COEFFICIENT_5R_1 : -case CS47L35_FRF_COEFFICIENT_5R_2 : -case CS47L35_FRF_COEFFICIENT_5R_3 : -case CS47L35_FRF_COEFFICIENT_5R_4 : case MADERA_GPIO1_CTRL_1 ... MADERA_GPIO16_CTRL_2: case MADERA_IRQ1_STATUS_1 ... MADERA_IRQ1_STATUS_33: case MADERA_IRQ1_MASK_1 ... MADERA_IRQ1_MASK_33:
drivers/mfd/cs47l85-tables.c +5 -117
195 lines not on this page · raw message
drivers/mfd/cs47l90-tables.c +0 -76
124 lines not on this page · raw message
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH v2 3/4 mfd: madera: Add Madera core support for CS47L15
In reply to Charles KeepaxFrom: Richard Fitzgerald <[email protected]>
This patch adds all the core support and defines for the Cirrus Logic CS47L15 smart audio CODEC.
Registers or fields are named MADERA_* if it is part of the common hardware platform and does not conflict with any other Madera codecs. It is named CS47L15_* if it is unique to CS47L15 and conflicts with definitions on other codecs.
---
Changes since v1:
- Corrected a couple of register defaults and removed a couple of registers
Thanks,
Charles
drivers/mfd/Kconfig | 7 + drivers/mfd/Makefile | 3 + drivers/mfd/cs47l15-tables.c | 1300 ++++++++++++++++++++++++++++++++++ drivers/mfd/madera-core.c | 44 ++ drivers/mfd/madera-i2c.c | 7 + drivers/mfd/madera-spi.c | 7 + drivers/mfd/madera.h | 6 + include/linux/mfd/madera/core.h | 2 + include/linux/mfd/madera/registers.h | 5 + 9 files changed, 1381 insertions(+) create mode 100644 drivers/mfd/cs47l15-tables.c
drivers/mfd/Kconfig +7 -0
@@ -260,6 +260,13 @@ config MFD_MADERA_SPI Support for the Cirrus Logic Madera platform audio SoC core functionality controlled via SPI. +config MFD_CS47L15 + bool "Cirrus Logic CS47L15" + select PINCTRL_CS47L15 + depends on MFD_MADERA + help + Support for Cirrus Logic CS47L15 Smart Codec + config MFD_CS47L35 bool "Cirrus Logic CS47L35" select PINCTRL_CS47L35
drivers/mfd/Makefile +3 -0
@@ -75,6 +75,9 @@ obj-$(CONFIG_MFD_WM8994) += wm8994.o obj-$(CONFIG_MFD_WM97xx) += wm97xx-core.o madera-objs := madera-core.o +ifeq ($(CONFIG_MFD_CS47L15),y) +madera-objs += cs47l15-tables.o +endif ifeq ($(CONFIG_MFD_CS47L35),y) madera-objs += cs47l35-tables.o endif
drivers/mfd/cs47l15-tables.c new file +1300 -0
1,300 lines not on this page · raw message
drivers/mfd/madera-core.c +44 -0
86 lines not on this page · raw message
drivers/mfd/madera-i2c.c +7 -0
@@ -39,6 +39,12 @@ static int madera_i2c_probe(struct i2c_client *i2c, type = id->driver_data;switch (type) { +case CS47L15 : +if (IS_ENABLED (CONFIG_MFD_CS47L15 )) { + regmap_16bit_config = &cs47l15_16bit_i2c_regmap; + regmap_32bit_config = &cs47l15_32bit_i2c_regmap; + } +break ;case CS47L35 :if (IS_ENABLED (CONFIG_MFD_CS47L35 )) { regmap_16bit_config = &cs47l35_16bit_i2c_regmap;
@@ -113,6 +119,7 @@ static int madera_i2c_remove(struct i2c_client *i2c) }static const struct i2c_device_id madera_i2c_id[] = { + {"cs47l15" ,CS47L15 }, {"cs47l35" ,CS47L35 }, {"cs47l85" ,CS47L85 }, {"cs47l90" ,CS47L90 },
drivers/mfd/madera-spi.c +7 -0
@@ -39,6 +39,12 @@ static int madera_spi_probe(struct spi_device *spi) type = id->driver_data;switch (type) { +case CS47L15 : +if (IS_ENABLED (CONFIG_MFD_CS47L15 )) { + regmap_16bit_config = &cs47l15_16bit_spi_regmap; + regmap_32bit_config = &cs47l15_32bit_spi_regmap; + } +break ;case CS47L35 :if (IS_ENABLED (CONFIG_MFD_CS47L35 )) { regmap_16bit_config = &cs47l35_16bit_spi_regmap;
@@ -112,6 +118,7 @@ static int madera_spi_remove(struct spi_device *spi) }static const struct spi_device_id madera_spi_ids[] = { + {"cs47l15" ,CS47L15 }, {"cs47l35" ,CS47L35 }, {"cs47l85" ,CS47L85 }, {"cs47l90" ,CS47L90 },
drivers/mfd/madera.h +6 -0
@@ -24,6 +24,12 @@ int madera_dev_exit(struct madera *madera);const char *madera_name_from_type (enum madera_type type); +extern const struct regmap_config cs47l15_16bit_spi_regmap; +extern const struct regmap_config cs47l15_32bit_spi_regmap; +extern const struct regmap_config cs47l15_16bit_i2c_regmap; +extern const struct regmap_config cs47l15_32bit_i2c_regmap; +int cs47l15_patch (struct madera *madera); +extern const struct regmap_config cs47l35_16bit_spi_regmap;extern const struct regmap_config cs47l35_32bit_spi_regmap;extern const struct regmap_config cs47l35_16bit_i2c_regmap;
include/linux/mfd/madera/core.h +2 -0
@@ -27,11 +27,13 @@ enum madera_type {CS47L90 =3 ,CS47L91 =4 ,WM1840 =7 , + CS47L15 = 8, };#define MADERA_MAX_CORE_SUPPLIES 2#define MADERA_MAX_GPIOS 40 +#define CS47L15_NUM_GPIOS 15#define CS47L35_NUM_GPIOS 16#define CS47L85_NUM_GPIOS 40#define CS47L90_NUM_GPIOS 38
include/linux/mfd/madera/registers.h +5 -0
@@ -244,6 +244,8 @@#define MADERA_IN6R_CONTROL 0x33C#define MADERA_ADC_DIGITAL_VOLUME_6R 0x33D#define MADERA_DMIC6R_CONTROL 0x33E +#define CS47L15_ADC_INT_BIAS 0x3A8 +#define CS47L15_PGA_BIAS_SEL 0x3C4#define MADERA_OUTPUT_ENABLES_1 0x400#define MADERA_OUTPUT_STATUS_1 0x401#define MADERA_RAW_OUTPUT_STATUS_1 0x406
@@ -1202,6 +1204,8 @@#define MADERA_GPIO1_CTRL_2 0x1701#define MADERA_GPIO2_CTRL_1 0x1702#define MADERA_GPIO2_CTRL_2 0x1703 +#define MADERA_GPIO15_CTRL_1 0x171C +#define MADERA_GPIO15_CTRL_2 0x171D#define MADERA_GPIO16_CTRL_1 0x171E#define MADERA_GPIO16_CTRL_2 0x171F#define MADERA_GPIO38_CTRL_1 0x174A
@@ -1232,6 +1236,7 @@#define MADERA_IRQ2_CTRL 0x1A82#define MADERA_INTERRUPT_RAW_STATUS_1 0x1AA0#define MADERA_WSEQ_SEQUENCE_1 0x3000 +#define MADERA_WSEQ_SEQUENCE_225 0x31C0#define MADERA_WSEQ_SEQUENCE_252 0x31F6#define CS47L35_OTP_HPDET_CAL_1 0x31F8#define CS47L35_OTP_HPDET_CAL_2 0x31FA
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH v2 4/4 mfd: madera: Add Madera core support for CS47L92
In reply to Charles KeepaxFrom: Richard Fitzgerald <[email protected]>
This patch adds all the core support and defines for the Cirrus Logic CS42L92, CS47L92 and CS47L93 smart audio CODECs.
Registers or fields are named MADERA_* if it is part of the common hardware platform and does not conflict with any other Madera codecs. It is named CS47L15_* if it is unique to CS47L15 and conflicts with definitions on other codecs.
---
Changes since v1:
- Corrected a couple of register defaults and removed a couple of registers
Thanks,
Charles
drivers/mfd/Kconfig | 7 + drivers/mfd/Makefile | 3 + drivers/mfd/cs47l92-tables.c | 1947 ++++++++++++++++++++++++++++++++++ drivers/mfd/madera-core.c | 58 + drivers/mfd/madera-i2c.c | 11 + drivers/mfd/madera-spi.c | 11 + drivers/mfd/madera.h | 7 + include/linux/mfd/madera/core.h | 4 + include/linux/mfd/madera/registers.h | 195 ++++ 9 files changed, 2243 insertions(+) create mode 100644 drivers/mfd/cs47l92-tables.c
drivers/mfd/Kconfig +7 -0
@@ -288,6 +288,13 @@ config MFD_CS47L90 help Support for Cirrus Logic CS47L90 and CS47L91 Smart Codecs +config MFD_CS47L92 + bool "Cirrus Logic CS47L92/93" + select PINCTRL_CS47L92 + depends on MFD_MADERA + help + Support for Cirrus Logic CS42L92, CS47L92 and CS47L93 Smart Codecs + config MFD_ASIC3 bool "Compaq ASIC3" depends on GPIOLIB && ARM
drivers/mfd/Makefile +3 -0
@@ -87,6 +87,9 @@ endif ifeq ($(CONFIG_MFD_CS47L90),y) madera-objs += cs47l90-tables.o endif +ifeq ($(CONFIG_MFD_CS47L92),y) +madera-objs += cs47l92-tables.o +endif obj-$(CONFIG_MFD_MADERA) += madera.o obj-$(CONFIG_MFD_MADERA_I2C) += madera-i2c.o obj-$(CONFIG_MFD_MADERA_SPI) += madera-spi.o
drivers/mfd/cs47l92-tables.c new file +1947 -0
1,947 lines not on this page · raw message
drivers/mfd/madera-core.c +58 -0
100 lines not on this page · raw message
drivers/mfd/madera-i2c.c +11 -0
@@ -65,6 +65,14 @@ static int madera_i2c_probe(struct i2c_client *i2c, regmap_32bit_config = &cs47l90_32bit_i2c_regmap; }break ; +case CS42L92 : +case CS47L92 : +case CS47L93 : +if (IS_ENABLED (CONFIG_MFD_CS47L92 )) { + regmap_16bit_config = &cs47l92_16bit_i2c_regmap; + regmap_32bit_config = &cs47l92_32bit_i2c_regmap; + } +break ;default :dev_err (&i2c->dev,"Unknown Madera I2C device type %ld\n" , type);
@@ -124,6 +132,9 @@ static const struct i2c_device_id madera_i2c_id[] = { { "cs47l85", CS47L85 }, { "cs47l90", CS47L90 }, { "cs47l91", CS47L91 }, + { "cs42l92", CS42L92 }, + { "cs47l92", CS47L92 }, + { "cs47l93", CS47L93 }, { "wm1840", WM1840 }, { } };
drivers/mfd/madera-spi.c +11 -0
@@ -65,6 +65,14 @@ static int madera_spi_probe(struct spi_device *spi) regmap_32bit_config = &cs47l90_32bit_spi_regmap; }break ; +case CS42L92 : +case CS47L92 : +case CS47L93 : +if (IS_ENABLED (CONFIG_MFD_CS47L92 )) { + regmap_16bit_config = &cs47l92_16bit_spi_regmap; + regmap_32bit_config = &cs47l92_32bit_spi_regmap; + } +break ;default :dev_err (&spi->dev,"Unknown Madera SPI device type %ld\n" , type);
@@ -123,6 +131,9 @@ static const struct spi_device_id madera_spi_ids[] = { { "cs47l85", CS47L85 }, { "cs47l90", CS47L90 }, { "cs47l91", CS47L91 }, + { "cs42l92", CS42L92 }, + { "cs47l92", CS47L92 }, + { "cs47l93", CS47L93 }, { "wm1840", WM1840 }, { } };
drivers/mfd/madera.h +7 -0
@@ -47,4 +47,11 @@ extern const struct regmap_config cs47l90_32bit_spi_regmap;extern const struct regmap_config cs47l90_16bit_i2c_regmap;extern const struct regmap_config cs47l90_32bit_i2c_regmap;int cs47l90_patch (struct madera *madera); + +extern const struct regmap_config cs47l92_16bit_spi_regmap; +extern const struct regmap_config cs47l92_32bit_spi_regmap; +extern const struct regmap_config cs47l92_16bit_i2c_regmap; +extern const struct regmap_config cs47l92_32bit_i2c_regmap; +int cs47l92_patch (struct madera *madera); +#endif
include/linux/mfd/madera/core.h +4 -0
@@ -26,8 +26,11 @@ enum madera_type {CS47L85 =2 ,CS47L90 =3 ,CS47L91 =4 , +CS47L92 =5 , +CS47L93 =6 ,WM1840 =7 ,CS47L15 =8 , + CS42L92 = 9, };#define MADERA_MAX_CORE_SUPPLIES 2
@@ -37,6 +40,7 @@ enum madera_type {#define CS47L35_NUM_GPIOS 16#define CS47L85_NUM_GPIOS 40#define CS47L90_NUM_GPIOS 38 +#define CS47L92_NUM_GPIOS 16#define MADERA_MAX_MICBIAS 4
include/linux/mfd/madera/registers.h +195 -0
299 lines not on this page · raw message
Signature · 1 line
2.11.0