Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5640', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:36:48 +0000 (16:36 +0000)
committerMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:36:48 +0000 (16:36 +0000)
1  2  3  4  5  6 
sound/soc/codecs/rt5640.c
sound/soc/codecs/rt5645.c

index b857a715ef648b66dc652a59ea130eeaa02545bb,e29a6defefa006dda473856fb30ca64ba152bdd9,33e080f80585ecd7297cf43c1a19a11be8795717,e29a6defefa006dda473856fb30ca64ba152bdd9,e29a6defefa006dda473856fb30ca64ba152bdd9,e29a6defefa006dda473856fb30ca64ba152bdd9..1584ccc3a87bb9feffcdc09e8d800dfed045e43b
@@@@@@@ -995,7 -995,7 -995,7 -995,7 -995,7 -995,7 +995,7 @@@@@@@ static int rt5640_hp_event(struct snd_s
      
        case SND_SOC_DAPM_PRE_PMD:
                rt5640->hp_mute = 1;
-- ---          usleep_range(70000, 75000);
++ +++          msleep(70);
                break;
      
        default:
@@@@@@@ -1059,7 -1059,7 -1059,7 -1059,7 -1059,7 -1059,7 +1059,7 @@@@@@@ static int rt5640_hp_post_event(struct 
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
                if (!rt5640->hp_mute)
-- ---                  usleep_range(80000, 85000);
++ +++                  msleep(80);
      
                break;
      
@@@@@@@ -1227,6 -1227,6 -1227,10 -1227,6 -1227,6 -1227,6 +1227,10 @@@@@@@ static const struct snd_soc_dapm_widge
                RT5640_PWR_DAC_L1_BIT, 0, NULL, 0),
        SND_SOC_DAPM_SUPPLY("DAC R1 Power", RT5640_PWR_DIG1,
                RT5640_PWR_DAC_R1_BIT, 0, NULL, 0),
++ +++  SND_SOC_DAPM_SUPPLY("DAC L2 Power", RT5640_PWR_DIG1,
++ +++          RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),
++ +++  SND_SOC_DAPM_SUPPLY("DAC R2 Power", RT5640_PWR_DIG1,
++ +++          RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),
        /* SPK/OUT Mixer */
        SND_SOC_DAPM_MIXER("SPK MIXL", RT5640_PWR_MIXER, RT5640_PWR_SM_L_BIT,
                0, rt5640_spk_l_mix, ARRAY_SIZE(rt5640_spk_l_mix)),
@@@@@@@ -1322,10 -1322,10 -1326,6 -1322,10 -1322,10 -1322,10 +1326,6 @@@@@@@ static const struct snd_soc_dapm_widge
                rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)),
        SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1,
                RT5640_PWR_MA_BIT, 0, NULL, 0),
-- ---  SND_SOC_DAPM_SUPPLY("DAC L2 Power", RT5640_PWR_DIG1,
-- ---          RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),
-- ---  SND_SOC_DAPM_SUPPLY("DAC R2 Power", RT5640_PWR_DIG1,
-- ---          RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),
      
        SND_SOC_DAPM_OUTPUT("MONOP"),
        SND_SOC_DAPM_OUTPUT("MONON"),
@@@@@@@ -2313,7 -2313,6 -2313,6 -2313,6 -2313,6 -2313,6 +2313,7 @@@@@@@ MODULE_DEVICE_TABLE(of, rt5640_of_match
      #ifdef CONFIG_ACPI
      static const struct acpi_device_id rt5640_acpi_match[] = {
        { "INT33CA", 0 },
 +++++  { "10EC3276", 0 },
        { "10EC5640", 0 },
        { "10EC5642", 0 },
        { "INTCCFFD", 0 },
index 43dee1b5779ddd101450ede09ce6afe65ccc684e,10c2a564a715dc82e198a4bb50c5691662685c7a,10c2a564a715dc82e198a4bb50c5691662685c7a,e09fa19f44c0cb4a1f407d3ad84212ff830f9b39,10c2a564a715dc82e198a4bb50c5691662685c7a,10c2a564a715dc82e198a4bb50c5691662685c7a..e149f3ce540154252fa882000b020da691d4d3db
@@@@@@@ -3109,7 -3109,7 -3109,7 -3109,7 -3109,7 -3109,7 +3109,7 @@@@@@@ static int rt5645_jack_detect(struct sn
        unsigned int val;
      
        if (jack_insert) {
--- --          regmap_write(rt5645->regmap, RT5645_CHARGE_PUMP, 0x0006);
+++ ++          regmap_write(rt5645->regmap, RT5645_CHARGE_PUMP, 0x0e06);
      
                /* for jack type detect */
                snd_soc_dapm_force_enable_pin(dapm, "LDO2");
@@@@@@@ -3545,10 -3545,8 -3545,8 -3545,8 -3545,8 -3545,8 +3545,10 @@@@@@@ MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id)
      #ifdef CONFIG_ACPI
      static const struct acpi_device_id rt5645_acpi_match[] = {
        { "10EC5645", 0 },
 +++++  { "10EC5648", 0 },
        { "10EC5650", 0 },
        { "10EC5640", 0 },
 +++++  { "10EC3270", 0 },
        {},
      };
      MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match);
@@@@@@@ -3660,8 -3658,8 -3658,8 -3658,14 -3658,8 -3658,8 +3660,14 @@@@@@@ static int rt5645_i2c_probe(struct i2c_
                                                       GPIOD_IN);
      
        if (IS_ERR(rt5645->gpiod_hp_det)) {
--- --          dev_err(&i2c->dev, "failed to initialize gpiod\n");
--- --          return PTR_ERR(rt5645->gpiod_hp_det);
+++ ++          dev_info(&i2c->dev, "failed to initialize gpiod\n");
+++ ++          ret = PTR_ERR(rt5645->gpiod_hp_det);
+++ ++          /*
+++ ++           * Continue if optional gpiod is missing, bail for all other
+++ ++           * errors, including -EPROBE_DEFER
+++ ++           */
+++ ++          if (ret != -ENOENT)
+++ ++                  return ret;
        }
      
        for (i = 0; i < ARRAY_SIZE(rt5645->supplies); i++)
                }
        }
      
 ++ ++  regmap_update_bits(rt5645->regmap, RT5645_ADDA_CLK1,
 ++ ++          RT5645_I2S_PD1_MASK, RT5645_I2S_PD1_2);
 ++ ++
        if (rt5645->pdata.jd_invert) {
                regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,
                        RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV);