Add support for Wolfson WM8998 and WM1814 codecs
Subsystems (8)
v2 cover Add support for Wolfson WM8998 and WM1814 codecs
This set of patches adds support for the Wolfson Microelectronics WM8998 and WM1814 codecs.
Richard Fitzgerald (8):
mfd: arizona: Split INx_MODE into two fields
ASoC: arizona: add defines for single-input gain control
mfd: arizona: Add support for WM8998 and WM1814
gpio: arizona: add support for WM8998 and WM1814
regulator: arizona: add support for WM8998 and WM1814
extcon: arizona: Add support for WM8998 and WM1814
ASoC: wm8998: Initial WM8998 codec driver
Documentation: Add WM8998/WM1814 device tree bindings
Documentation/devicetree/bindings/mfd/arizona.txt | 13 +- drivers/extcon/extcon-arizona.c | 33 +- drivers/gpio/gpio-arizona.c | 2 + drivers/mfd/Kconfig | 6 + drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 105 ++- drivers/mfd/arizona-i2c.c | 8 + drivers/mfd/arizona-irq.c | 9 + drivers/mfd/arizona.h | 5 + drivers/mfd/wm8998-tables.c | 1592 +++++++++++++++++++++ drivers/regulator/arizona-ldo1.c | 2 + include/linux/mfd/arizona/core.h | 3 + include/linux/mfd/arizona/pdata.h | 7 +- include/linux/mfd/arizona/registers.h | 247 +++- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/arizona.c | 7 + sound/soc/codecs/arizona.h | 7 +- sound/soc/codecs/wm8998.c | 1394 ++++++++++++++++++ sound/soc/codecs/wm8998.h | 23 + 20 files changed, 3442 insertions(+), 32 deletions(-) create mode 100644 drivers/mfd/wm8998-tables.c create mode 100644 sound/soc/codecs/wm8998.c create mode 100644 sound/soc/codecs/wm8998.h
Signature · 1 line
1.7.2.5
PATCH v2 1/8 mfd: arizona: Split INx_MODE into two fields
Later arizona silicon has the single/differential selector in a different register, and IN1_MODE only selects between analogue or digital. Prepare for this by splitting the INx_MODE definition into two fields.
--- drivers/mfd/arizona-core.c | 8 ++++++-- include/linux/mfd/arizona/pdata.h | 5 ++++- include/linux/mfd/arizona/registers.h | 27 ++++++++++++++++++--------- 3 files changed, 28 insertions(+), 12 deletions(-)
drivers/mfd/arizona-core.c +6 -2
@@ -977,12 +977,16 @@ int arizona_dev_init(struct arizona *arizona)/* Default for both is 0 so noop with defaults */ val = arizona->pdata.dmic_ref[i] <<ARIZONA_IN1_DMIC_SUP_SHIFT ; - val |= arizona->pdata.inmode[i] <<ARIZONA_IN1_MODE_SHIFT ; +if (arizona->pdata.inmode[i] &ARIZONA_INMODE_DMIC ) + val |=1 <<ARIZONA_IN1_MODE_SHIFT ; +if (arizona->pdata.inmode[i] &ARIZONA_INMODE_SE ) + val |=1 <<ARIZONA_IN1_SINGLE_ENDED_SHIFT ;regmap_update_bits (arizona->regmap,ARIZONA_IN1L_CONTROL + (i *8 ),ARIZONA_IN1_DMIC_SUP_MASK | -ARIZONA_IN1_MODE_MASK , val); +ARIZONA_IN1_MODE_MASK | +ARIZONA_IN1_SINGLE_ENDED_MASK , val); }for (i =0 ; i <ARIZONA_MAX_OUTPUT ; i++) {
include/linux/mfd/arizona/pdata.h +4 -1
@@ -156,7 +156,10 @@ struct arizona_pdata {/** MICBIAS configurations */ struct arizona_micbias micbias[ARIZONA_MAX_MICBIAS ]; -/** Mode of input structures */ +/** +* Mode of input structures +* One of the ARIZONA_INMODE_xxx values +*/ int inmode[ARIZONA_MAX_INPUT ];/** Mode for outputs */
include/linux/mfd/arizona/registers.h +18 -9
@@ -2515,9 +2515,12 @@#define ARIZONA_IN1_DMIC_SUP_MASK 0x1800/* IN1_DMIC_SUP - [12:11] */ #define ARIZONA_IN1_DMIC_SUP_SHIFT 11/* IN1_DMIC_SUP - [12:11] */ #define ARIZONA_IN1_DMIC_SUP_WIDTH 2/* IN1_DMIC_SUP - [12:11] */ -#define ARIZONA_IN1_MODE_MASK 0x0600/* IN1_MODE - [10:9] */ -#define ARIZONA_IN1_MODE_SHIFT 9/* IN1_MODE - [10:9] */ -#define ARIZONA_IN1_MODE_WIDTH 2/* IN1_MODE - [10:9] */ +#define ARIZONA_IN1_MODE_MASK 0x0400/* IN1_MODE - [10] */ +#define ARIZONA_IN1_MODE_SHIFT 10/* IN1_MODE - [10] */ +#define ARIZONA_IN1_MODE_WIDTH 1/* IN1_MODE - [10] */ +#define ARIZONA_IN1_SINGLE_ENDED_MASK 0x0200/* IN1_MODE - [9] */ +#define ARIZONA_IN1_SINGLE_ENDED_SHIFT 9/* IN1_MODE - [9] */ +#define ARIZONA_IN1_SINGLE_ENDED_WIDTH 1/* IN1_MODE - [9] */ #define ARIZONA_IN1L_PGA_VOL_MASK 0x00FE/* IN1L_PGA_VOL - [7:1] */ #define ARIZONA_IN1L_PGA_VOL_SHIFT 1/* IN1L_PGA_VOL - [7:1] */ #define ARIZONA_IN1L_PGA_VOL_WIDTH 7/* IN1L_PGA_VOL - [7:1] */
@@ -2588,9 +2591,12 @@#define ARIZONA_IN2_DMIC_SUP_MASK 0x1800/* IN2_DMIC_SUP - [12:11] */ #define ARIZONA_IN2_DMIC_SUP_SHIFT 11/* IN2_DMIC_SUP - [12:11] */ #define ARIZONA_IN2_DMIC_SUP_WIDTH 2/* IN2_DMIC_SUP - [12:11] */ -#define ARIZONA_IN2_MODE_MASK 0x0600/* IN2_MODE - [10:9] */ -#define ARIZONA_IN2_MODE_SHIFT 9/* IN2_MODE - [10:9] */ -#define ARIZONA_IN2_MODE_WIDTH 2/* IN2_MODE - [10:9] */ +#define ARIZONA_IN2_MODE_MASK 0x0400/* IN2_MODE - [10] */ +#define ARIZONA_IN2_MODE_SHIFT 10/* IN2_MODE - [10] */ +#define ARIZONA_IN2_MODE_WIDTH 1/* IN2_MODE - [10] */ +#define ARIZONA_IN2_SINGLE_ENDED_MASK 0x0200/* IN2_MODE - [9] */ +#define ARIZONA_IN2_SINGLE_ENDED_SHIFT 9/* IN2_MODE - [9] */ +#define ARIZONA_IN2_SINGLE_ENDED_WIDTH 1/* IN2_MODE - [9] */ #define ARIZONA_IN2L_PGA_VOL_MASK 0x00FE/* IN2L_PGA_VOL - [7:1] */ #define ARIZONA_IN2L_PGA_VOL_SHIFT 1/* IN2L_PGA_VOL - [7:1] */ #define ARIZONA_IN2L_PGA_VOL_WIDTH 7/* IN2L_PGA_VOL - [7:1] */
@@ -2661,9 +2667,12 @@#define ARIZONA_IN3_DMIC_SUP_MASK 0x1800/* IN3_DMIC_SUP - [12:11] */ #define ARIZONA_IN3_DMIC_SUP_SHIFT 11/* IN3_DMIC_SUP - [12:11] */ #define ARIZONA_IN3_DMIC_SUP_WIDTH 2/* IN3_DMIC_SUP - [12:11] */ -#define ARIZONA_IN3_MODE_MASK 0x0600/* IN3_MODE - [10:9] */ -#define ARIZONA_IN3_MODE_SHIFT 9/* IN3_MODE - [10:9] */ -#define ARIZONA_IN3_MODE_WIDTH 2/* IN3_MODE - [10:9] */ +#define ARIZONA_IN3_MODE_MASK 0x0400/* IN3_MODE - [10] */ +#define ARIZONA_IN3_MODE_SHIFT 10/* IN3_MODE - [10] */ +#define ARIZONA_IN3_MODE_WIDTH 1/* IN3_MODE - [10] */ +#define ARIZONA_IN3_SINGLE_ENDED_MASK 0x0200/* IN3_MODE - [9] */ +#define ARIZONA_IN3_SINGLE_ENDED_SHIFT 9/* IN3_MODE - [9] */ +#define ARIZONA_IN3_SINGLE_ENDED_WIDTH 1/* IN3_MODE - [9] */ #define ARIZONA_IN3L_PGA_VOL_MASK 0x00FE/* IN3L_PGA_VOL - [7:1] */ #define ARIZONA_IN3L_PGA_VOL_SHIFT 1/* IN3L_PGA_VOL - [7:1] */ #define ARIZONA_IN3L_PGA_VOL_WIDTH 7/* IN3L_PGA_VOL - [7:1] */
Signature · 1 line
1.7.2.5
PATCH v2 2/8 ASoC: arizona: add defines for single-input gain control
In reply to Richard FitzgeraldAdds convenience defines for declaring a gain control that has an input mux. These blocks are functionally equivalent to the existing mixer blocks but can only have a single input active at once.
--- sound/soc/codecs/arizona.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/codecs/arizona.h +5 -0
@@ -92,6 +92,11 @@ extern const unsigned int arizona_mixer_tlv[];extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS ];extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS ]; +#define ARIZONA_GAINMUX_CONTROLS (name, base) \ + SOC_SINGLE_RANGE_TLV(name " Input Volume", base + 1, \ + ARIZONA_MIXER_VOL_SHIFT, 0x20, 0x50, 0, \ + arizona_mixer_tlv) +#define ARIZONA_MIXER_CONTROLS (name, base) \ SOC_SINGLE_RANGE_TLV(name " Input 1 Volume", base + 1, \ ARIZONA_MIXER_VOL_SHIFT, 0x20, 0x50, 0, \
Signature · 1 line
1.7.2.5
PATCH v2 3/8 mfd: arizona: Add support for WM8998 and WM1814
In reply to Richard Fitzgerald--- drivers/mfd/Kconfig | 6 + drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 105 ++- drivers/mfd/arizona-i2c.c | 8 + drivers/mfd/arizona-irq.c | 9 + drivers/mfd/arizona.h | 5 + drivers/mfd/wm8998-tables.c | 1592 +++++++++++++++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + include/linux/mfd/arizona/pdata.h | 2 + include/linux/mfd/arizona/registers.h | 220 +++++ 10 files changed, 1945 insertions(+), 8 deletions(-) create mode 100644 drivers/mfd/wm8998-tables.c
drivers/mfd/Kconfig +6 -0
@@ -1359,6 +1359,12 @@ config MFD_WM8997 help Support for Wolfson Microelectronics WM8997 low power audio SoC +config MFD_WM8998 + bool "Wolfson Microelectronics WM8998" + depends on MFD_ARIZONA + help + Support for Wolfson Microelectronics WM8998 low power audio SoC + config MFD_WM8400 bool "Wolfson Microelectronics WM8400" select MFD_CORE
drivers/mfd/Makefile +3 -0
@@ -50,6 +50,9 @@ endif ifneq ($(CONFIG_MFD_WM8997),n) obj-$(CONFIG_MFD_ARIZONA) += wm8997-tables.o endif +ifneq ($(CONFIG_MFD_WM8998),n) +obj-$(CONFIG_MFD_ARIZONA) += wm8998-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 +97 -8
175 lines not on this page · raw message
drivers/mfd/arizona-i2c.c +8 -0
@@ -53,6 +53,12 @@ static int arizona_i2c_probe(struct i2c_client *i2c, regmap_config = &wm8997_i2c_regmap;break ;#endif +#ifdef CONFIG_MFD_WM8998 +case WM8998 : +case WM1814 : + regmap_config = &wm8998_i2c_regmap; +break ; +#endif default :dev_err (&i2c->dev,"Unknown device type %ld\n" , id->driver_data);
@@ -90,6 +96,8 @@ static const struct i2c_device_id arizona_i2c_id[] = { { "wm5110", WM5110 }, { "wm8280", WM8280 }, { "wm8997", WM8997 }, + { "wm8998", WM8998 }, + { "wm1814", WM1814 }, { } };MODULE_DEVICE_TABLE (i2c, arizona_i2c_id);
drivers/mfd/arizona-irq.c +9 -0
@@ -234,6 +234,15 @@ int arizona_irq_init(struct arizona *arizona) arizona->ctrlif_error = false;break ;#endif +#ifdef CONFIG_MFD_WM8998 +case WM8998 : +case WM1814 : + aod = &wm8998_aod; + irq = &wm8998_irq; + + arizona->ctrlif_error = false; +break ; +#endif default :BUG_ON ("Unknown Arizona class device" ==NULL );return -EINVAL ;
drivers/mfd/arizona.h +5 -0
@@ -27,6 +27,8 @@ extern const struct regmap_config wm5110_spi_regmap;extern const struct regmap_config wm8997_i2c_regmap; +extern const struct regmap_config wm8998_i2c_regmap; +extern const struct dev_pm_ops arizona_pm_ops;extern const struct of_device_id arizona_of_match[];
@@ -41,6 +43,9 @@ extern const struct regmap_irq_chip wm5110_revd_irq;extern const struct regmap_irq_chip wm8997_aod;extern const struct regmap_irq_chip wm8997_irq; +extern struct regmap_irq_chip wm8998_aod; +extern struct regmap_irq_chip wm8998_irq; +int arizona_dev_init (struct arizona *arizona);int arizona_dev_exit (struct arizona *arizona);int arizona_irq_init (struct arizona *arizona);
drivers/mfd/wm8998-tables.c new file +1592 -0
1,592 lines not on this page · raw message
include/linux/mfd/arizona/core.h +3 -0
@@ -25,6 +25,8 @@ enum arizona_type {WM5110 =2 ,WM8997 =3 ,WM8280 =4 , +WM8998 =5 , + WM1814 = 6, };#define ARIZONA_IRQ_GP1 0
@@ -156,6 +158,7 @@ int arizona_set_irq_wake(struct arizona *arizona, int irq, int on);int wm5102_patch (struct arizona *arizona);int wm5110_patch (struct arizona *arizona);int wm8997_patch (struct arizona *arizona); +int wm8998_patch (struct arizona *arizona);extern int arizona_of_get_named_gpio (struct arizona *arizona,const char *prop,bool mandatory);
include/linux/mfd/arizona/pdata.h +2 -0
@@ -159,6 +159,8 @@ struct arizona_pdata {/** * Mode of input structures * One of the ARIZONA_INMODE_xxx values +* wm5102/wm5110/wm8280/wm8997: [0]=IN1 [1]=IN2 [2]=IN3 [3]=IN4 +* wm8998: [0]=IN1A [1]=IN2A [2]=IN1B [3]=IN2B */ int inmode[ARIZONA_MAX_INPUT ];
include/linux/mfd/arizona/registers.h +220 -0
329 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH v2 4/8 gpio: arizona: add support for WM8998 and WM1814
In reply to Richard Fitzgerald--- drivers/gpio/gpio-arizona.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpio/gpio-arizona.c +2 -0
@@ -118,6 +118,8 @@ static int arizona_gpio_probe(struct platform_device *pdev)case WM5110 :case WM8280 :case WM8997 : +case WM8998 : +case WM1814 : arizona_gpio->gpio_chip.ngpio =5 ;break ;default :
Signature · 1 line
1.7.2.5
PATCH v2 5/8 regulator: arizona: add support for WM8998 and WM1814
In reply to Richard Fitzgerald--- drivers/regulator/arizona-ldo1.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/regulator/arizona-ldo1.c +2 -0
@@ -240,6 +240,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)switch (arizona->type) {case WM5102 :case WM8997 : +case WM8998 : +case WM1814 : desc = &arizona_ldo1_hc; ldo1->init_data = arizona_ldo1_dvfs;break ;
Signature · 1 line
1.7.2.5
PATCH v2 6/8 extcon: arizona: Add support for WM8998 and WM1814
In reply to Richard Fitzgerald--- drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-)
drivers/extcon/extcon-arizona.c +22 -11
@@ -1,7 +1,7 @@/* * extcon-arizona.c - Extcon driver Wolfson Arizona devices * -* Copyright (C) 2012 Wolfson Microelectronics plc +* Copyright (C) 2012-2014 Wolfson Microelectronics plc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -140,10 +140,14 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info, bool clamp) {struct arizona *arizona = info->arizona; -unsigned int mask =0 , val =0 ; +unsigned int mask, val =0 ;int ret;switch (arizona->type) { +case WM8998 : +case WM1814 : + mask =0 ; +break ;case WM5110 : mask =ARIZONA_HP1L_SHRTO |ARIZONA_HP1L_FLWR |ARIZONA_HP1L_SHRTI ;
@@ -175,17 +179,19 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info, ret); } - ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1L , - mask, val); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to do clamp: %d\n" , +if (mask) { + ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1L , + mask, val); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to do clamp: %d\n" , ret); - ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1R , - mask, val); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to do clamp: %d\n" , - ret); + ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1R , + mask, val); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to do clamp: %d\n" , + ret); + }/* Restore the desired state while not doing the clamp */ if (!clamp) {
@@ -1176,6 +1182,11 @@ static int arizona_extcon_probe(struct platform_device *pdev)break ; }break ; +case WM8998 : +case WM1814 : + info->micd_clamp = true; + info->hpdet_ip_version =2 ; +break ;default :break ; }
Signature · 1 line
1.7.2.5
PATCH v2 7/8 ASoC: wm8998: Initial WM8998 codec driver
In reply to Richard Fitzgerald--- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/arizona.c | 7 + sound/soc/codecs/arizona.h | 2 +- sound/soc/codecs/wm8998.c | 1394 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8998.h | 23 + 6 files changed, 1433 insertions(+), 1 deletions(-) create mode 100644 sound/soc/codecs/wm8998.c create mode 100644 sound/soc/codecs/wm8998.h
sound/soc/codecs/Kconfig +6 -0
@@ -165,6 +165,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8996 if I2C select SND_SOC_WM8997 if MFD_WM8997 + select SND_SOC_WM8998 if MFD_WM8998 select SND_SOC_WM9081 if I2C select SND_SOC_WM9090 if I2C select SND_SOC_WM9705 if SND_SOC_AC97_BUS
@@ -189,9 +190,11 @@ config SND_SOC_ARIZONA default y if SND_SOC_WM5102=y default y if SND_SOC_WM5110=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_WM8997=m + default m if SND_SOC_WM8998=m config SND_SOC_WM_HUBS tristate
@@ -829,6 +832,9 @@ config SND_SOC_WM8996 config SND_SOC_WM8997 tristate +config SND_SOC_WM8998 + tristate + config SND_SOC_WM9081 tristate
sound/soc/codecs/Makefile +2 -0
@@ -169,6 +169,7 @@ snd-soc-wm8993-objs := wm8993.o snd-soc-wm8994-objs := wm8994.o wm8958-dsp2.o snd-soc-wm8995-objs := wm8995.o snd-soc-wm8997-objs := wm8997.o +snd-soc-wm8998-objs := wm8998.o snd-soc-wm9081-objs := wm9081.o snd-soc-wm9090-objs := wm9090.o snd-soc-wm9705-objs := wm9705.o
@@ -350,6 +351,7 @@ obj-$(CONFIG_SND_SOC_WM8993) += snd-soc-wm8993.o obj-$(CONFIG_SND_SOC_WM8994) += snd-soc-wm8994.o obj-$(CONFIG_SND_SOC_WM8995) += snd-soc-wm8995.o obj-$(CONFIG_SND_SOC_WM8997) += snd-soc-wm8997.o +obj-$(CONFIG_SND_SOC_WM8998) += snd-soc-wm8998.o obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
sound/soc/codecs/arizona.c +7 -0
@@ -314,6 +314,7 @@ const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {"Tone Generator 2" ,"Haptics" ,"AEC" , +"AEC2" ,"Mic Mute Mixer" ,"Noise Generator" , "IN1L",
@@ -421,6 +422,7 @@ int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = {0x05 ,0x06 ,/* Haptics */ 0x08 ,/* AEC */ +0x09 ,/* AEC2 */ 0x0c ,/* Noise mixer */ 0x0d ,/* Comfort noise */ 0x10, /* IN1L */
@@ -1733,6 +1735,11 @@ static int arizona_calc_fratio(struct arizona_fll *fll,if (fll->arizona->rev <3 || sync)return init_ratio;break ; +case WM8998 : +case WM1814 : +if (sync) +return init_ratio; +break ;default :return init_ratio; }
sound/soc/codecs/arizona.h +1 -1
@@ -86,7 +86,7 @@ struct arizona_priv { unsigned int spk_ena_pending:1; }; -#define ARIZONA_NUM_MIXER_INPUTS 103 +#define ARIZONA_NUM_MIXER_INPUTS 104extern const unsigned int arizona_mixer_tlv[];extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS ];
sound/soc/codecs/wm8998.c new file +1394 -0
1,394 lines not on this page · raw message
sound/soc/codecs/wm8998.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* wm8998.h -- ALSA SoC Audio driver for WM8998 codecs +* +* Copyright 2012-2014 Wolfson Microelectronics plc +* +* 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 _WM8998_H +#define _WM8998_H + +#include "arizona.h" + +#define WM8998_FLL1 1 +#define WM8998_FLL2 2 +#define WM8998_FLL1_REFCLK 3 +#define WM8998_FLL2_REFCLK 4 + +#endif
Signature · 1 line
1.7.2.5
PATCH v2 8/8 Documentation: Add WM8998/WM1814 device tree bindings
In reply to Richard Fitzgerald--- Documentation/devicetree/bindings/mfd/arizona.txt | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mfd/arizona.txt +9 -4
@@ -10,6 +10,9 @@ Required properties: "wlf,wm5110" "wlf,wm8280" "wlf,wm8997" + "wlf,wm8998" + "wlf,wm1814" + - reg : I2C slave address when connected using I2C, chip select number when using SPI.
@@ -31,10 +34,10 @@ Required properties: as covered in Documentation/devicetree/bindings/regulator/regulator.txt - DBVDD2-supply, DBVDD3-supply : Additional databus power supplies (wm5102, - wm5110, wm8280) + wm5110, wm8280, wm8998, wm1814) - SPKVDDL-supply, SPKVDDR-supply : Speaker driver power supplies (wm5102, - wm5110, wm8280) + wm5110, wm8280, wm8998, wm1814) - SPKVDD-supply : Speaker driver power supply (wm8997)
@@ -53,8 +56,10 @@ Optional properties: of input signals. Valid values are 0 (Differential), 1 (Single-ended) and 2 (Digital Microphone). If absent, INn_MODE registers set to 0 by default. If present, values must be specified less than or equal to the number of - input singals. If values less than the number of input signals, elements - that has not been specifed are set to 0 by default. + input signals. If values less than the number of input signals, elements + that have not been specified are set to 0 by default. Entries are: + <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997) + <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814) - wlf,dmic-ref : DMIC reference voltage source for each input, can be selected from either MICVDD or one of the MICBIAS's, defines
Signature · 1 line
1.7.2.5
Chanwoo Choi
maintainerRe: [PATCH v2 6/8] extcon: arizona: Add support for WM8998 and WM1814
In reply to Richard FitzgeraldHi Richard,
This patch didn't include any description?
I think that you better to add the patch description.
Thanks,
Chanwoo Choi
Quoted 77 lines · Richard Fitzgerald
Signed-off-by Richard Fitzgerald <[email protected]>Acked-by Chanwoo Choi <[email protected]>--- drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-)drivers/extcon/extcon-arizona.c +22
-11@@ -1,7 +1,7 @@/* * extcon-arizona.c - Extcon driver Wolfson Arizona devices * -* Copyright (C) 2012 Wolfson Microelectronics plc +* Copyright (C) 2012-2014 Wolfson Microelectronics plc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -140,10 +140,14 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info, bool clamp) {struct arizona *arizona = info->arizona; -unsigned int mask =0 , val =0 ; +unsigned int mask, val =0 ;int ret;switch (arizona->type) { +case WM8998 : +case WM1814 : + mask =0 ; +break ;case WM5110 : mask =ARIZONA_HP1L_SHRTO |ARIZONA_HP1L_FLWR |ARIZONA_HP1L_SHRTI ;@@ -175,17 +179,19 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info, ret); } - ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1L , - mask, val); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to do clamp: %d\n" , +if (mask) { + ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1L , + mask, val); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to do clamp: %d\n" , ret); - ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1R , - mask, val); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to do clamp: %d\n" , - ret); + ret =regmap_update_bits (arizona->regmap,ARIZONA_HP_CTRL_1R , + mask, val); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to do clamp: %d\n" , + ret); + }/* Restore the desired state while not doing the clamp */ if (!clamp) {@@ -1176,6 +1182,11 @@ static int arizona_extcon_probe(struct platform_device *pdev)break ; }break ; +case WM8998 : +case WM1814 : + info->micd_clamp = true; + info->hpdet_ip_version =2 ; +break ;default :break ; }