Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/ts3a277e' and ...

diff --combined sound/soc/codecs/ts3a227e.c
index 9f2dced,65f8ec2,6528bfe,1d12057..9fd80ac
--- 1/sound/soc/codecs/ts3a227e.c
--- 2/sound/soc/codecs/ts3a227e.c
--- 3/sound/soc/codecs/ts3a227e.c
--- 4/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@@@@ -20,6 -20,6 -20,8 -20,6 +20,8 @@@@@
    #include <sound/jack.h>
    #include <sound/soc.h>
    
++ +#include "ts3a227e.h"
++ +
    struct ts3a227e {
        struct regmap *regmap;
        struct snd_soc_jack *jack;
@@@@@ -79,6 -79,10 -81,6 -79,6 +81,10 @@@@@ static const int ts3a227e_buttons[] = 
    /* TS3A227E_REG_SETTING_2 0x05 */
    #define KP_ENABLE 0x04
    
+ ++/* TS3A227E_REG_SETTING_3 0x06 */
+ ++#define MICBIAS_SETTING_SFT (3)
+ ++#define MICBIAS_SETTING_MASK (0x7 << MICBIAS_SETTING_SFT)
+ ++
    /* TS3A227E_REG_ACCESSORY_STATUS  0x0b */
    #define TYPE_3_POLE 0x01
    #define TYPE_4_POLE_OMTP 0x02
@@@@@ -221,9 -225,9 -223,9 -221,9 +227,9 @@@@@ int ts3a227e_enable_jack_detect(struct 
        struct ts3a227e *ts3a227e = snd_soc_component_get_drvdata(component);
    
        snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA);
- --    snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
- --    snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
- --    snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
+ ++    snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
+ ++    snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
+ ++    snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
    
        ts3a227e->jack = jack;
        ts3a227e_jack_report(ts3a227e);
@@@@@ -248,13 -252,27 -250,12 -248,12 +254,28 @@@@@ static const struct regmap_config ts3a2
        .num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults),
    };
    
+ ++static int ts3a227e_parse_dt(struct ts3a227e *ts3a227e, struct device_node *np)
+ ++{
+ ++    u32 micbias;
+ ++    int err;
+ ++
+ ++    err = of_property_read_u32(np, "ti,micbias", &micbias);
+ ++    if (!err) {
+ ++            regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3,
+ ++                    MICBIAS_SETTING_MASK,
+ ++                    (micbias & 0x07) << MICBIAS_SETTING_SFT);
+ ++    }
+ ++
+ ++    return 0;
+ ++}
+ ++
    static int ts3a227e_i2c_probe(struct i2c_client *i2c,
                              const struct i2c_device_id *id)
    {
        struct ts3a227e *ts3a227e;
        struct device *dev = &i2c->dev;
        int ret;
 +++    unsigned int acc_reg;
    
        ts3a227e = devm_kzalloc(&i2c->dev, sizeof(*ts3a227e), GFP_KERNEL);
        if (ts3a227e == NULL)
@@@@@ -266,6 -284,14 -267,6 -265,6 +287,14 @@@@@
        if (IS_ERR(ts3a227e->regmap))
                return PTR_ERR(ts3a227e->regmap);
    
+ ++    if (dev->of_node) {
+ ++            ret = ts3a227e_parse_dt(ts3a227e, dev->of_node);
+ ++            if (ret) {
+ ++                    dev_err(dev, "Failed to parse device tree: %d\n", ret);
+ ++                    return ret;
+ ++            }
+ ++    }
+ ++
        ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt,
                                        IRQF_TRIGGER_LOW | IRQF_ONESHOT,
                                        "TS3A227E", ts3a227e);
@@@@@ -284,11 -310,6 -285,6 -283,6 +313,11 @@@@@
                           INTB_DISABLE | ADC_COMPLETE_INT_DISABLE,
                           ADC_COMPLETE_INT_DISABLE);
    
 +++    /* Read jack status because chip might not trigger interrupt at boot. */
 +++    regmap_read(ts3a227e->regmap, TS3A227E_REG_ACCESSORY_STATUS, &acc_reg);
 +++    ts3a227e_new_jack_state(ts3a227e, acc_reg);
 +++    ts3a227e_jack_report(ts3a227e);
 +++
        return 0;
    }