staging: max98927: Added TDM support
PATCH 1/7 staging: max98927: Added TDM support
--- sound/soc/codecs/max98927.c | 141 ++++++++++++++++++++++++++++++++++++-------- sound/soc/codecs/max98927.h | 6 +- 2 files changed, 120 insertions(+), 27 deletions(-)
sound/soc/codecs/max98927.c +116 -25
@@ -1,7 +1,7 @@/* * max98927.c -- MAX98927 ALSA Soc Audio driver * -* Copyright (C) 2016 Maxim Integrated Products +* Copyright (C) 2016-2017 Maxim Integrated Products * Author: Ryan Lee <[email protected]> * * This program is free software; you can redistribute it and/or modify it
@@ -146,6 +146,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)struct max98927_priv *max98927 =snd_soc_codec_get_drvdata (codec);unsigned int mode =0 ;unsigned int format =0 ; +bool use_pdm = false;unsigned int invert =0 ;dev_dbg (codec->dev,"%s: fmt 0x%08X\n" , __func__, fmt);
@@ -187,22 +188,27 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)/* interface format */ switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) {case SND_SOC_DAIFMT_I2S : - max98927->iface |=SND_SOC_DAIFMT_I2S ; format =MAX98927_PCM_FORMAT_I2S ;break ;case SND_SOC_DAIFMT_LEFT_J : - max98927->iface |=SND_SOC_DAIFMT_LEFT_J ; format =MAX98927_PCM_FORMAT_LJ ;break ; +case SND_SOC_DAIFMT_DSP_A : + format =MAX98927_PCM_FORMAT_TDM_MODE1 ; +break ; +case SND_SOC_DAIFMT_DSP_B : + format =MAX98927_PCM_FORMAT_TDM_MODE0 ; +break ;case SND_SOC_DAIFMT_PDM : - max98927->iface |=SND_SOC_DAIFMT_PDM ; + use_pdm = true;break ;default :return -EINVAL ; } + max98927->iface = fmt &SND_SOC_DAIFMT_FORMAT_MASK ; -/* pcm channel configuration */ -if (max98927->iface & (SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_LEFT_J )) { +if (!use_pdm) { +/* pcm channel configuration */ regmap_update_bits(max98927->regmap, MAX98927_R0018_PCM_RX_EN_A, MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN,
@@ -217,13 +223,12 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)MAX98927_R003B_SPK_SRC_SEL , MAX98927_SPK_SRC_MASK, 0); - }else regmap_update_bits (max98927->regmap, -MAX98927_R0018_PCM_RX_EN_A , -MAX98927_PCM_RX_CH0_EN |MAX98927_PCM_RX_CH1_EN ,0 ); +MAX98927_R0035_PDM_RX_CTRL , +MAX98927_PDM_RX_EN_MASK ,0 ); -/* pdm channel configuration */ -if (max98927->iface &SND_SOC_DAIFMT_PDM ) { + }else { +/* pdm channel configuration */ regmap_update_bits (max98927->regmap,MAX98927_R0035_PDM_RX_CTRL ,MAX98927_PDM_RX_EN_MASK ,1 );
@@ -231,10 +236,12 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)regmap_update_bits (max98927->regmap,MAX98927_R003B_SPK_SRC_SEL ,MAX98927_SPK_SRC_MASK ,3 ); - }else +regmap_update_bits (max98927->regmap, -MAX98927_R0035_PDM_RX_CTRL , -MAX98927_PDM_RX_EN_MASK ,0 ); +MAX98927_R0018_PCM_RX_EN_A , +MAX98927_PCM_RX_CH0_EN |MAX98927_PCM_RX_CH1_EN ,0 ); + + }return 0 ; }
@@ -245,6 +252,21 @@ static const int rate_table[] = { 13000000, 19200000, }; +/* BCLKs per LRCLK */ +static const int bclk_sel_table[] = { +32 ,48 ,64 ,96 ,128 ,192 ,256 ,384 ,512 , +}; + +static int max98927_get_bclk_sel (int bclk) +{ +int i; +/* match BCLKs per LRCLK */ +for (i =0 ; i <ARRAY_SIZE (bclk_sel_table); i++) { +if (bclk_sel_table[i] == bclk) +return i +2 ; + } +return 0 ; +}static int max98927_set_clock (struct max98927_priv *max98927,struct snd_pcm_hw_params *params) {
@@ -270,19 +292,17 @@ static int max98927_set_clock(struct max98927_priv *max98927, i << MAX98927_PCM_MASTER_MODE_MCLK_RATE_SHIFT); } -switch (blr_clk_ratio) { -case 32 : - value =2 ; -break ; -case 48 : - value =3 ; -break ; -case 64 : - value =4 ; -break ; -default : +if ((max98927->iface ==SND_SOC_DAIFMT_DSP_A ) || + (max98927->iface ==SND_SOC_DAIFMT_DSP_B )) +return 0 ; + +/* BCLK configuration */ + value =max98927_get_bclk_sel (blr_clk_ratio); +if (!value) { +dev_err (codec->dev,"BCLK %d not supported\n" , blr_clk_ratio);return -EINVAL ; } + regmap_update_bits(max98927->regmap, MAX98927_R0022_PCM_CLK_SETUP, MAX98927_PCM_CLK_SETUP_BSEL_MASK,
@@ -386,6 +406,76 @@ static int max98927_dai_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } +static int max98927_dai_tdm_slot (struct snd_soc_dai *dai, +unsigned int tx_mask,unsigned int rx_mask, +int slots,int slot_width) +{ +struct snd_soc_codec *codec = dai->codec; +struct max98927_priv *max98927 =snd_soc_codec_get_drvdata (codec); +int bsel =0 ; +unsigned int chan_sz =0 ; + +/* BCLK configuration */ + bsel =max98927_get_bclk_sel (slots * slot_width); +if (bsel ==0 ) { +dev_err (codec->dev,"BCLK %d not supported\n" , + slots * slot_width); +return -EINVAL ; + } + +regmap_update_bits (max98927->regmap, +MAX98927_R0022_PCM_CLK_SETUP , +MAX98927_PCM_CLK_SETUP_BSEL_MASK , + bsel); + +/* Channel size configuration */ +switch (slot_width) { +case 16 : + chan_sz =MAX98927_PCM_MODE_CFG_CHANSZ_16 ; +break ; +case 24 : + chan_sz =MAX98927_PCM_MODE_CFG_CHANSZ_24 ; +break ; +case 32 : + chan_sz =MAX98927_PCM_MODE_CFG_CHANSZ_32 ; +break ; +default : +dev_err (codec->dev,"format unsupported %d\n" , + slot_width); +return -EINVAL ; + } + +regmap_update_bits (max98927->regmap, +MAX98927_R0020_PCM_MODE_CFG , +MAX98927_PCM_MODE_CFG_CHANSZ_MASK , chan_sz); + +/* Rx slot configuration */ +regmap_write (max98927->regmap, +MAX98927_R0018_PCM_RX_EN_A , + rx_mask &0xFF ); +regmap_write (max98927->regmap, +MAX98927_R0019_PCM_RX_EN_B , + (rx_mask &0xFF00 ) >>8 ); + +/* Tx slot configuration */ +regmap_write (max98927->regmap, +MAX98927_R001A_PCM_TX_EN_A , + tx_mask &0xFF ); +regmap_write (max98927->regmap, +MAX98927_R001B_PCM_TX_EN_B , + (tx_mask &0xFF00 ) >>8 ); + +/* Tx slot Hi-Z configuration */ +regmap_write (max98927->regmap, +MAX98927_R001C_PCM_TX_HIZ_CTRL_A , + ~tx_mask &0xFF ); +regmap_write (max98927->regmap, +MAX98927_R001D_PCM_TX_HIZ_CTRL_B , + (~tx_mask &0xFF00 ) >>8 ); + +return 0 ; +} +#define MAX98927_RATES SNDRV_PCM_RATE_8000_48000#define MAX98927_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
@@ -405,6 +495,7 @@ static const struct snd_soc_dai_ops max98927_dai_ops = { .set_sysclk = max98927_dai_set_sysclk, .set_fmt = max98927_dai_set_fmt, .hw_params = max98927_dai_hw_params, + .set_tdm_slot = max98927_dai_tdm_slot, }; static int max98927_dac_event(struct snd_soc_dapm_widget *w,
sound/soc/codecs/max98927.h +4 -2
@@ -1,7 +1,7 @@/* * max98927.h -- MAX98927 ALSA Soc Audio driver * -* Copyright 2013-15 Maxim Integrated Products +* Copyright (C) 2016-2017 Maxim Integrated Products * Author: Ryan Lee <[email protected]> * * This program is free software; you can redistribute it and/or modify it
@@ -161,7 +161,9 @@#define MAX98927_PCM_MODE_CFG_FORMAT_SHIFT (3)#define MAX98927_PCM_FORMAT_I2S (0x0 << 0)#define MAX98927_PCM_FORMAT_LJ (0x1 << 0) - +#define MAX98927_PCM_FORMAT_TDM_MODE0 (0x3 << 0) +#define MAX98927_PCM_FORMAT_TDM_MODE1 (0x4 << 0) +#define MAX98927_PCM_FORMAT_TDM_MODE2 (0x5 << 0)#define MAX98927_PCM_MODE_CFG_CHANSZ_MASK (0x3 << 6)#define MAX98927_PCM_MODE_CFG_CHANSZ_16 (0x1 << 6)#define MAX98927_PCM_MODE_CFG_CHANSZ_24 (0x2 << 6)
Signature · 1 line
2.7.4
PATCH 2/7 staging: max98927: Added controls for Envelope tracking
--- sound/soc/codecs/max98927.c | 20 ++++++++++++++++---- sound/soc/codecs/max98927.h | 4 ++++ 2 files changed, 20 insertions(+), 4 deletions(-)
sound/soc/codecs/max98927.c +16 -4
@@ -614,6 +614,18 @@ static SOC_ENUM_SINGLE_DECL(max98927_current_limit, MAX98927_R0042_BOOST_CTRL1, 1, max98927_current_limit_text); +static const char *const max98927_env_track_headroom_text[] = { +"0.000V" ,"0.125V" ,"0.250V" ,"0.375V" ,"0.500V" ,"0.625V" , +"0.750V" ,"0.875V" ,"1.000V" ,"1.125V" ,"1.250V" ,"1.375V" , +"1.500V" ,"1.625V" ,"1.750V" ,"1.875V" ,"2.000V" ,"2.125V" , +"2.250V" ,"2.375V" ,"2.500V" ,"2.625V" ,"2.750V" ,"2.875V" , +"3.000V" ,"3.125V" ,"3.250V" ,"3.375V" ,"3.500V" +}; + +static SOC_ENUM_SINGLE_DECL(max98927_env_track_headroom, + MAX98927_R0082_ENV_TRACK_VOUT_HEADROOM, 0, + max98927_env_track_headroom_text); +static const struct snd_kcontrol_new max98927_snd_controls[] = { SOC_SINGLE_TLV("Speaker Volume", MAX98927_R003C_SPK_GAIN, 0, 6, 0,
@@ -631,6 +643,9 @@ static const struct snd_kcontrol_new max98927_snd_controls[] = { MAX98927_AMP_VOL_SEL_SHIFT, 1, 0),SOC_ENUM ("Boost Output Voltage" , max98927_boost_voltage),SOC_ENUM ("Current Limit" , max98927_current_limit), +SOC_SINGLE ("EnvTrack Switch" ,MAX98927_R0086_ENV_TRACK_CTRL , +MAX98927_ENV_TRACKER_EN_SHIFT ,1 ,0 ), + SOC_ENUM("EnvTrack Headroom", max98927_env_track_headroom), }; static const struct snd_soc_dapm_route max98927_audio_map[] = {
@@ -726,13 +741,10 @@ static int max98927_probe(struct snd_soc_codec *codec)/* Envelope Tracking configuration */ regmap_write (max98927->regmap,MAX98927_R0082_ENV_TRACK_VOUT_HEADROOM , -0x08 ); +0x0A );regmap_write (max98927->regmap,MAX98927_R0086_ENV_TRACK_CTRL ,0x01 ); -regmap_write (max98927->regmap, -MAX98927_R0087_ENV_TRACK_BOOST_VOUT_READ , -0x10 );/* voltage, current slot configuration */ regmap_write(max98927->regmap,
sound/soc/codecs/max98927.h +4 -0
@@ -250,6 +250,10 @@#define MAX98927_BROWNOUT_DSP_EN (0x1 << 2)#define MAX98927_BROWNOUT_DSP_SHIFT (2) +/* MAX98927_R0086_ENV_TRACK_CTRL */ +#define MAX98927_ENV_TRACKER_EN (0x1 << 0) +#define MAX98927_ENV_TRACKER_EN_SHIFT (0) +/* MAX98927_R0100_SOFT_RESET */ #define MAX98927_SOFT_RESET (0x1 << 0)
Signature · 1 line
2.7.4
PATCH 3/7 staging: max98927: Updated volatile register list
In reply to Ryan Lee--- sound/soc/codecs/max98927.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/codecs/max98927.c +7 -0
@@ -586,6 +586,13 @@ static bool max98927_volatile_reg(struct device *dev, unsigned int reg) {switch (reg) { case MAX98927_R0001_INT_RAW1 ... MAX98927_R0009_INT_FLAG3: +case MAX98927_R004C_MEAS_ADC_CH0_READ : +case MAX98927_R004D_MEAS_ADC_CH1_READ : +case MAX98927_R004E_MEAS_ADC_CH2_READ : +case MAX98927_R0051_BROWNOUT_STATUS : +case MAX98927_R0087_ENV_TRACK_BOOST_VOUT_READ : +case MAX98927_R01FF_REV_ID : +case MAX98927_R0100_SOFT_RESET :return true;default :return false;
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: max98927: Updated volatile register list" to the asoc tree
The patch
ASoC: max98927: Updated volatile register list
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
9c1743ebe0da614517a1b94f171924d5fd758df4Mon Sep 17 00:00:00 2001
From: Ryan Lee <[email protected]>
Date: Mon, 28 Aug 2017 16:30:55 -0700
Subject: [PATCH] ASoC: max98927: Updated volatile register list
--- sound/soc/codecs/max98927.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/codecs/max98927.c +7 -0
@@ -495,6 +495,13 @@ static bool max98927_volatile_reg(struct device *dev, unsigned int reg) {switch (reg) { case MAX98927_R0001_INT_RAW1 ... MAX98927_R0009_INT_FLAG3: +case MAX98927_R004C_MEAS_ADC_CH0_READ : +case MAX98927_R004D_MEAS_ADC_CH1_READ : +case MAX98927_R004E_MEAS_ADC_CH2_READ : +case MAX98927_R0051_BROWNOUT_STATUS : +case MAX98927_R0087_ENV_TRACK_BOOST_VOUT_READ : +case MAX98927_R01FF_REV_ID : +case MAX98927_R0100_SOFT_RESET :return true;default :return false;
Signature · 1 line
2.14.1
PATCH 4/7 staging: max98927: Added missing \n to end of dev_err messages
In reply to Ryan Lee--- sound/soc/codecs/max98927.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/max98927.c +3 -3
@@ -160,7 +160,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) mode =MAX98927_PCM_MASTER_MODE_MASTER ;break ;default : -dev_err (codec->dev,"DAI clock mode unsupported" ); +dev_err (codec->dev,"DAI clock mode unsupported\n" );return -EINVAL ; }
@@ -176,7 +176,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) invert =MAX98927_PCM_MODE_CFG_PCM_BCLKEDGE ;break ;default : -dev_err (codec->dev,"DAI invert mode unsupported" ); +dev_err (codec->dev,"DAI invert mode unsupported\n" );return -EINVAL ; }
@@ -331,7 +331,7 @@ static int max98927_dai_hw_params(struct snd_pcm_substream *substream, chan_sz =MAX98927_PCM_MODE_CFG_CHANSZ_32 ;break ;default : -dev_err (codec->dev,"format unsupported %d" , +dev_err (codec->dev,"format unsupported %d\n" ,params_format (params)); goto err; }
Signature · 1 line
2.7.4
PATCH 5/7 staging: max98927: Removed an obsolete variable
In reply to Ryan Lee--- sound/soc/codecs/max98927.h | 1 - 1 file changed, 1 deletion(-)
sound/soc/codecs/max98927.h +0 -1
@@ -263,7 +263,6 @@struct max98927_priv {struct regmap *regmap;struct snd_soc_codec *codec; -struct max98927_pdata *pdata;unsigned int spk_gain;unsigned int sysclk;unsigned int v_l_slot;
Signature · 1 line
2.7.4
PATCH 6/7 staging: max98927: Modified chip default register values
In reply to Ryan Lee--- sound/soc/codecs/max98927.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/max98927.c +5 -5
@@ -44,9 +44,9 @@ static struct reg_default max98927_reg[] = { {MAX98927_R0011_CLK_MON, 0x00}, {MAX98927_R0012_WDOG_CTRL, 0x00}, {MAX98927_R0013_WDOG_RST, 0x00}, - {MAX98927_R0014_MEAS_ADC_THERM_WARN_THRESH, 0x00}, - {MAX98927_R0015_MEAS_ADC_THERM_SHDN_THRESH, 0x00}, - {MAX98927_R0016_MEAS_ADC_THERM_HYSTERESIS, 0x00}, + {MAX98927_R0014_MEAS_ADC_THERM_WARN_THRESH, 0x75}, + {MAX98927_R0015_MEAS_ADC_THERM_SHDN_THRESH, 0x8c}, + {MAX98927_R0016_MEAS_ADC_THERM_HYSTERESIS, 0x08}, {MAX98927_R0017_PIN_CFG, 0x55}, {MAX98927_R0018_PCM_RX_EN_A, 0x00}, {MAX98927_R0019_PCM_RX_EN_B, 0x00},
@@ -82,14 +82,14 @@ static struct reg_default max98927_reg[] = { {MAX98927_R003A_AMP_EN, 0x00}, {MAX98927_R003B_SPK_SRC_SEL, 0x00}, {MAX98927_R003C_SPK_GAIN, 0x00}, - {MAX98927_R003D_SSM_CFG, 0x01}, + {MAX98927_R003D_SSM_CFG, 0x04}, {MAX98927_R003E_MEAS_EN, 0x00}, {MAX98927_R003F_MEAS_DSP_CFG, 0x04}, {MAX98927_R0040_BOOST_CTRL0, 0x00}, {MAX98927_R0041_BOOST_CTRL3, 0x00}, {MAX98927_R0042_BOOST_CTRL1, 0x00}, {MAX98927_R0043_MEAS_ADC_CFG, 0x00}, - {MAX98927_R0044_MEAS_ADC_BASE_MSB, 0x00}, + {MAX98927_R0044_MEAS_ADC_BASE_MSB, 0x01}, {MAX98927_R0045_MEAS_ADC_BASE_LSB, 0x00}, {MAX98927_R0046_ADC_CH0_DIVIDE, 0x00}, {MAX98927_R0047_ADC_CH1_DIVIDE, 0x00},
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: max98927: Modified chip default register values" to the asoc tree
The patch
ASoC: max98927: Modified chip default register values
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
848844b87a26265019215dbb7fb588a5fac0a110Mon Sep 17 00:00:00 2001
From: Ryan Lee <[email protected]>
Date: Mon, 28 Aug 2017 16:30:58 -0700
Subject: [PATCH] ASoC: max98927: Modified chip default register values
--- sound/soc/codecs/max98927.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/max98927.c +5 -5
@@ -44,9 +44,9 @@ static struct reg_default max98927_reg[] = { {MAX98927_R0011_CLK_MON, 0x00}, {MAX98927_R0012_WDOG_CTRL, 0x00}, {MAX98927_R0013_WDOG_RST, 0x00}, - {MAX98927_R0014_MEAS_ADC_THERM_WARN_THRESH, 0x00}, - {MAX98927_R0015_MEAS_ADC_THERM_SHDN_THRESH, 0x00}, - {MAX98927_R0016_MEAS_ADC_THERM_HYSTERESIS, 0x00}, + {MAX98927_R0014_MEAS_ADC_THERM_WARN_THRESH, 0x75}, + {MAX98927_R0015_MEAS_ADC_THERM_SHDN_THRESH, 0x8c}, + {MAX98927_R0016_MEAS_ADC_THERM_HYSTERESIS, 0x08}, {MAX98927_R0017_PIN_CFG, 0x55}, {MAX98927_R0018_PCM_RX_EN_A, 0x00}, {MAX98927_R0019_PCM_RX_EN_B, 0x00},
@@ -82,14 +82,14 @@ static struct reg_default max98927_reg[] = { {MAX98927_R003A_AMP_EN, 0x00}, {MAX98927_R003B_SPK_SRC_SEL, 0x00}, {MAX98927_R003C_SPK_GAIN, 0x00}, - {MAX98927_R003D_SSM_CFG, 0x01}, + {MAX98927_R003D_SSM_CFG, 0x04}, {MAX98927_R003E_MEAS_EN, 0x00}, {MAX98927_R003F_MEAS_DSP_CFG, 0x04}, {MAX98927_R0040_BOOST_CTRL0, 0x00}, {MAX98927_R0041_BOOST_CTRL3, 0x00}, {MAX98927_R0042_BOOST_CTRL1, 0x00}, {MAX98927_R0043_MEAS_ADC_CFG, 0x00}, - {MAX98927_R0044_MEAS_ADC_BASE_MSB, 0x00}, + {MAX98927_R0044_MEAS_ADC_BASE_MSB, 0x01}, {MAX98927_R0045_MEAS_ADC_BASE_LSB, 0x00}, {MAX98927_R0046_ADC_CH0_DIVIDE, 0x00}, {MAX98927_R0047_ADC_CH1_DIVIDE, 0x00},
Signature · 1 line
2.14.1
PATCH 7/7 staging: max98927: Added PM suspend and resume function
In reply to Ryan Lee--- sound/soc/codecs/max98927.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
sound/soc/codecs/max98927.c +26 -1
@@ -804,6 +804,31 @@ static int max98927_probe(struct snd_soc_codec *codec)return 0 ; } +#ifdef CONFIG_PM_SLEEP +static int max98927_suspend (struct device *dev) +{ +struct max98927_priv *max98927 =dev_get_drvdata (dev); + +regcache_cache_only (max98927->regmap, true); +regcache_mark_dirty (max98927->regmap); +return 0 ; +} +static int max98927_resume (struct device *dev) +{ +struct max98927_priv *max98927 =dev_get_drvdata (dev); + +regmap_write (max98927->regmap, +MAX98927_R0100_SOFT_RESET ,MAX98927_SOFT_RESET ); +regcache_cache_only (max98927->regmap, false); +regcache_sync (max98927->regmap); +return 0 ; +} +#endif + +static const struct dev_pm_ops max98927_pm = { +SET_SYSTEM_SLEEP_PM_OPS (max98927_suspend, max98927_resume) +}; +static const struct snd_soc_codec_driver soc_codec_dev_max98927 = { .probe = max98927_probe, .component_driver = {
@@ -937,7 +962,7 @@ static struct i2c_driver max98927_i2c_driver = { .name = "max98927", .of_match_table = of_match_ptr(max98927_of_match), .acpi_match_table = ACPI_PTR(max98927_acpi_match), - .pm = NULL, + .pm = &max98927_pm, }, .probe = max98927_i2c_probe, .remove = max98927_i2c_remove,
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: max98927: Added PM suspend and resume function" to the asoc tree
The patch
ASoC: max98927: Added PM suspend and resume function
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f81991ddd001981bbe4ea0d25f88a4f95fb018beMon Sep 17 00:00:00 2001
From: Ryan Lee <[email protected]>
Date: Mon, 28 Aug 2017 16:30:59 -0700
Subject: [PATCH] ASoC: max98927: Added PM suspend and resume function
--- sound/soc/codecs/max98927.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
sound/soc/codecs/max98927.c +26 -1
@@ -701,6 +701,31 @@ static int max98927_probe(struct snd_soc_codec *codec)return 0 ; } +#ifdef CONFIG_PM_SLEEP +static int max98927_suspend (struct device *dev) +{ +struct max98927_priv *max98927 =dev_get_drvdata (dev); + +regcache_cache_only (max98927->regmap, true); +regcache_mark_dirty (max98927->regmap); +return 0 ; +} +static int max98927_resume (struct device *dev) +{ +struct max98927_priv *max98927 =dev_get_drvdata (dev); + +regmap_write (max98927->regmap, +MAX98927_R0100_SOFT_RESET ,MAX98927_SOFT_RESET ); +regcache_cache_only (max98927->regmap, false); +regcache_sync (max98927->regmap); +return 0 ; +} +#endif + +static const struct dev_pm_ops max98927_pm = { +SET_SYSTEM_SLEEP_PM_OPS (max98927_suspend, max98927_resume) +}; +static const struct snd_soc_codec_driver soc_codec_dev_max98927 = { .probe = max98927_probe, .component_driver = {
@@ -834,7 +859,7 @@ static struct i2c_driver max98927_i2c_driver = { .name = "max98927", .of_match_table = of_match_ptr(max98927_of_match), .acpi_match_table = ACPI_PTR(max98927_acpi_match), - .pm = NULL, + .pm = &max98927_pm, }, .probe = max98927_i2c_probe, .remove = max98927_i2c_remove,
Signature · 1 line
2.14.1