mfd: wm8994: Store platform data in device
Subsystems (4)
PATCH 1/2 mfd: wm8994: Store platform data in device
This is better style as platform data is supposed to be discardable after init (though hotplug usually prevents this) and will ease implementation of device tree property bindings.
Signed-off-by Mark Brown <[email protected]>
---
Patch 2 which uses this is going to collide with some other ASoC changes
- is it OK to merge this one via the ASoC tree as well?
drivers/mfd/wm8994-core.c | 35 +++++++++++++++++++---------------- include/linux/mfd/wm8994/core.h | 4 ++++ 2 files changed, 23 insertions(+), 16 deletions(-)
drivers/mfd/wm8994-core.c +19 -16
@@ -401,13 +401,19 @@ static const __devinitconst struct reg_default wm1811_reva_patch[] = {*/ static __devinit int wm8994_device_init (struct wm8994 *wm8994,int irq) { -struct wm8994_pdata *pdata = wm8994->dev->platform_data; +struct wm8994_pdata *pdata;struct regmap_config *regmap_config;const struct reg_default *regmap_patch =NULL ;const char *devname;int ret, i, patch_regs;int pulls =0 ; +if (dev_get_platdata (wm8994->dev)) { + pdata =dev_get_platdata (wm8994->dev); + wm8994->pdata = *pdata; + } + pdata = &wm8994->pdata; +dev_set_drvdata (wm8994->dev, wm8994);/* Add the on-chip regulators first for bootstrapping */
@@ -604,24 +610,21 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) } } -if (pdata) { - wm8994->irq_base = pdata->irq_base; - wm8994->gpio_base = pdata->gpio_base; - -/* GPIO configuration is only applied if it's non-zero */ -for (i =0 ; i <ARRAY_SIZE (pdata->gpio_defaults); i++) { -if (pdata->gpio_defaults[i]) { -wm8994_set_bits (wm8994,WM8994_GPIO_1 + i, -0xffff , - pdata->gpio_defaults[i]); - } + wm8994->irq_base = pdata->irq_base; + wm8994->gpio_base = pdata->gpio_base; + +/* GPIO configuration is only applied if it's non-zero */ +for (i =0 ; i <ARRAY_SIZE (pdata->gpio_defaults); i++) { +if (pdata->gpio_defaults[i]) { +wm8994_set_bits (wm8994,WM8994_GPIO_1 + i, +0xffff , pdata->gpio_defaults[i]); } + } - wm8994->ldo_ena_always_driven = pdata->ldo_ena_always_driven; + wm8994->ldo_ena_always_driven = pdata->ldo_ena_always_driven; -if (pdata->spkmode_pu) - pulls |=WM8994_SPKMODE_PU ; - } +if (pdata->spkmode_pu) + pulls |=WM8994_SPKMODE_PU ;/* Disable unneeded pulls */ wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
include/linux/mfd/wm8994/core.h +4 -0
@@ -19,6 +19,8 @@#include <linux/interrupt.h> #include <linux/regmap.h> +#include <linux/mfd/wm8994/pdata.h> +enum wm8994_type {WM8994 =0 ,WM8958 =1 ,
@@ -55,6 +57,8 @@ struct regulator_bulk_data;struct wm8994 {struct mutex irq_lock; +struct wm8994_pdata pdata; +enum wm8994_type type;int revision;int cust_id;
Signature · 1 line
1.7.10.4
PATCH 2/2 ASoC: wm8994: Use pdata cached in MFD driver
This is better style and facilitates implementation of device tree support for the driver.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8958-dsp2.c | 48 +++++++++++++++++++--------------------- sound/soc/codecs/wm8994.c | 48 ++++++++++++++++++++++------------------ sound/soc/codecs/wm8994.h | 1 - 3 files changed, 50 insertions(+), 47 deletions(-)
sound/soc/codecs/wm8958-dsp2.c +23 -25
@@ -195,7 +195,7 @@ ok:static void wm8958_dsp_start_mbc (struct snd_soc_codec *codec,int path) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int i;/* If the DSP is already running then noop */
@@ -210,9 +210,9 @@ static void wm8958_dsp_start_mbc(struct snd_soc_codec *codec, int path) WM8958_DSP2_ENA, WM8958_DSP2_ENA);/* If we've got user supplied MBC settings use them */ -if (pdata && pdata->num_mbc_cfgs) { +if (control->pdata.num_mbc_cfgs) {struct wm8958_mbc_cfg *cfg - = &pdata->mbc_cfgs[wm8994->mbc_cfg]; + = &control->pdata.mbc_cfgs[wm8994->mbc_cfg];for (i =0 ; i <ARRAY_SIZE (cfg->coeff_regs); i++) snd_soc_write(codec, i + WM8958_MBC_BAND_1_K_1,
@@ -239,7 +239,7 @@ static void wm8958_dsp_start_mbc(struct snd_soc_codec *codec, int path)static void wm8958_dsp_start_vss (struct snd_soc_codec *codec,int path) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int i, ena;if (wm8994->mbc_vss)
@@ -249,26 +249,26 @@ static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path) WM8958_DSP2_ENA, WM8958_DSP2_ENA);/* If we've got user supplied settings use them */ -if (pdata && pdata->num_mbc_cfgs) { +if (control->pdata.num_mbc_cfgs) {struct wm8958_mbc_cfg *cfg - = &pdata->mbc_cfgs[wm8994->mbc_cfg]; + = &control->pdata.mbc_cfgs[wm8994->mbc_cfg];for (i =0 ; i <ARRAY_SIZE (cfg->combined_regs); i++)snd_soc_write (codec, i +0x2800 , cfg->combined_regs[i]); } -if (pdata && pdata->num_vss_cfgs) { +if (control->pdata.num_vss_cfgs) {struct wm8958_vss_cfg *cfg - = &pdata->vss_cfgs[wm8994->vss_cfg]; + = &control->pdata.vss_cfgs[wm8994->vss_cfg];for (i =0 ; i <ARRAY_SIZE (cfg->regs); i++)snd_soc_write (codec, i +0x2600 , cfg->regs[i]); } -if (pdata && pdata->num_vss_hpf_cfgs) { +if (control->pdata.num_vss_hpf_cfgs) {struct wm8958_vss_hpf_cfg *cfg - = &pdata->vss_hpf_cfgs[wm8994->vss_hpf_cfg]; + = &control->pdata.vss_hpf_cfgs[wm8994->vss_hpf_cfg];for (i =0 ; i <ARRAY_SIZE (cfg->regs); i++)snd_soc_write (codec, i +0x2400 , cfg->regs[i]);
@@ -300,7 +300,7 @@ static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path)static void wm8958_dsp_start_enh_eq (struct snd_soc_codec *codec,int path) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int i;wm8958_dsp2_fw (codec,"ENH_EQ" , wm8994->enh_eq, false);
@@ -309,9 +309,9 @@ static void wm8958_dsp_start_enh_eq(struct snd_soc_codec *codec, int path) WM8958_DSP2_ENA, WM8958_DSP2_ENA);/* If we've got user supplied settings use them */ -if (pdata && pdata->num_enh_eq_cfgs) { +if (control->pdata.num_enh_eq_cfgs) {struct wm8958_enh_eq_cfg *cfg - = &pdata->enh_eq_cfgs[wm8994->enh_eq_cfg]; + = &control->pdata.enh_eq_cfgs[wm8994->enh_eq_cfg];for (i =0 ; i <ARRAY_SIZE (cfg->regs); i++) snd_soc_write(codec, i + 0x2200,
@@ -458,7 +458,7 @@ static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int value = ucontrol->value.integer.value[0 ];int reg;
@@ -467,7 +467,7 @@ static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol,if (reg <0 || reg &WM8958_DSP2CLK_ENA )return -EBUSY ; -if (value >= pdata->num_mbc_cfgs) +if (value >= control->pdata.num_mbc_cfgs)return -EINVAL ; wm8994->mbc_cfg = value;
@@ -548,7 +548,7 @@ static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int value = ucontrol->value.integer.value[0 ];int reg;
@@ -557,7 +557,7 @@ static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol,if (reg <0 || reg &WM8958_DSP2CLK_ENA )return -EBUSY ; -if (value >= pdata->num_vss_cfgs) +if (value >= control->pdata.num_vss_cfgs)return -EINVAL ; wm8994->vss_cfg = value;
@@ -581,7 +581,7 @@ static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int value = ucontrol->value.integer.value[0 ];int reg;
@@ -590,7 +590,7 @@ static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol,if (reg <0 || reg &WM8958_DSP2CLK_ENA )return -EBUSY ; -if (value >= pdata->num_vss_hpf_cfgs) +if (value >= control->pdata.num_vss_hpf_cfgs)return -EINVAL ; wm8994->vss_hpf_cfg = value;
@@ -748,7 +748,7 @@ static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994;int value = ucontrol->value.integer.value[0 ];int reg;
@@ -757,7 +757,7 @@ static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol,if (reg <0 || reg &WM8958_DSP2CLK_ENA )return -EBUSY ; -if (value >= pdata->num_enh_eq_cfgs) +if (value >= control->pdata.num_enh_eq_cfgs)return -EINVAL ; wm8994->enh_eq_cfg = value;
@@ -900,7 +900,8 @@ static void wm8958_mbc_loaded(const struct firmware *fw, void *context)void wm8958_dsp2_init (struct snd_soc_codec *codec) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994_pdata *pdata = wm8994->pdata; +struct wm8994 *control = wm8994->wm8994; +struct wm8994_pdata *pdata = &control->pdata;int ret, i; wm8994->dsp_active =-1 ;
@@ -924,9 +925,6 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) "wm8958_enh_eq.wfw", codec->dev, GFP_KERNEL, codec, wm8958_enh_eq_loaded); -if (!pdata) -return ; - if (pdata->num_mbc_cfgs) { struct snd_kcontrol_new control[] = { SOC_ENUM_EXT("MBC Mode", wm8994->mbc_enum,
sound/soc/codecs/wm8994.c +27 -21
154 lines not on this page · raw message
sound/soc/codecs/wm8994.h +0 -1
@@ -143,7 +143,6 @@ struct wm8994_priv {int micdet_irq;int revision; -struct wm8994_pdata *pdata; unsigned int aif1clk_enable:1; unsigned int aif2clk_enable:1;
Signature · 1 line
1.7.10.4