ASoC: max98927: Modified chip default register values

[sfrench/cifs-2.6.git] / sound / soc / codecs / max98927.c

diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index b5ee29499e166d887f6e62e3b2dfcfc05ef3aa4c..5b853604120a1cce14e3d69f0f3ce5da33e80dd1 100644 (file)
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -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},
@@ -159,7 +159,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;
        }
 
@@ -175,7 +175,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;
        }
 
@@ -311,7 +311,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;
        }
@@ -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;