Merge remote-tracking branches 'asoc/fix/msm8916', 'asoc/fix/nau8825', 'asoc/fix...
authorMark Brown <broonie@kernel.org>
Wed, 20 Dec 2017 15:43:11 +0000 (15:43 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 20 Dec 2017 15:43:11 +0000 (15:43 +0000)
1  2  3  4  5 
sound/soc/codecs/rt5645.c

index f020d2d1eef4a98baa8c91442485ee64257c708e,f020d2d1eef4a98baa8c91442485ee64257c708e,f020d2d1eef4a98baa8c91442485ee64257c708e,5f24df4fae8ece83f0258a022938b722e3a39dbd,fcd02c2c76f168b9bd4d79b25dd0c509fde9813f..edc152c8a1fe7596e9bbc5760574d973a9185d16
@@@@@@ -3346,9 -3346,9 -3346,9 -3346,9 -3346,9 +3346,9 @@@@@@ static irqreturn_t rt5645_irq(int irq, 
        return IRQ_HANDLED;
     }
     
   --static void rt5645_btn_check_callback(unsigned long data)
   ++static void rt5645_btn_check_callback(struct timer_list *t)
     {
   --   struct rt5645_priv *rt5645 = (struct rt5645_priv *)data;
   ++   struct rt5645_priv *rt5645 = from_timer(rt5645, t, btn_check_timer);
     
        queue_delayed_work(system_power_efficient_wq,
                   &rt5645->jack_detect_work, msecs_to_jiffies(5));
@@@@@@ -3823,6 -3823,6 -3823,6 -3823,6 -3823,8 +3823,8 @@@@@@ static int rt5645_i2c_probe(struct i2c_
        regmap_read(regmap, RT5645_VENDOR_ID, &val);
        rt5645->v_id = val & 0xff;
     
++++    regmap_write(rt5645->regmap, RT5645_AD_DA_MIXER, 0x8080);
++++ 
        ret = regmap_register_patch(rt5645->regmap, init_list,
                                    ARRAY_SIZE(init_list));
        if (ret != 0)
                regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,
                        RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV);
        }
   --   setup_timer(&rt5645->btn_check_timer,
   --           rt5645_btn_check_callback, (unsigned long)rt5645);
   ++   timer_setup(&rt5645->btn_check_timer, rt5645_btn_check_callback, 0);
     
        INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work);
        INIT_DELAYED_WORK(&rt5645->rcclock_work, rt5645_rcclock_work);