diff options
-rw-r--r-- | include/sound/rt5645.h | 4 | ||||
-rw-r--r-- | sound/soc/codecs/rt5645.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index a5cf6152e778..c427f10a39ae 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h | |||
@@ -21,8 +21,8 @@ struct rt5645_platform_data { | |||
21 | /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */ | 21 | /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */ |
22 | 22 | ||
23 | unsigned int jd_mode; | 23 | unsigned int jd_mode; |
24 | /* Invert JD when jack insert */ | 24 | /* Use level triggered irq */ |
25 | bool jd_invert; | 25 | bool level_trigger_irq; |
26 | }; | 26 | }; |
27 | 27 | ||
28 | #endif | 28 | #endif |
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 8e419ea418e9..e0c09bbd3f12 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c | |||
@@ -3151,7 +3151,7 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) | |||
3151 | snd_soc_dapm_sync(dapm); | 3151 | snd_soc_dapm_sync(dapm); |
3152 | rt5645->jack_type = SND_JACK_HEADPHONE; | 3152 | rt5645->jack_type = SND_JACK_HEADPHONE; |
3153 | } | 3153 | } |
3154 | if (rt5645->pdata.jd_invert) | 3154 | if (rt5645->pdata.level_trigger_irq) |
3155 | regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, | 3155 | regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, |
3156 | RT5645_JD_1_1_MASK, RT5645_JD_1_1_NOR); | 3156 | RT5645_JD_1_1_MASK, RT5645_JD_1_1_NOR); |
3157 | } else { /* jack out */ | 3157 | } else { /* jack out */ |
@@ -3172,7 +3172,7 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) | |||
3172 | snd_soc_dapm_disable_pin(dapm, "LDO2"); | 3172 | snd_soc_dapm_disable_pin(dapm, "LDO2"); |
3173 | snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); | 3173 | snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); |
3174 | snd_soc_dapm_sync(dapm); | 3174 | snd_soc_dapm_sync(dapm); |
3175 | if (rt5645->pdata.jd_invert) | 3175 | if (rt5645->pdata.level_trigger_irq) |
3176 | regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, | 3176 | regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, |
3177 | RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); | 3177 | RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); |
3178 | } | 3178 | } |
@@ -3586,7 +3586,7 @@ static struct rt5645_platform_data buddy_platform_data = { | |||
3586 | .dmic1_data_pin = RT5645_DMIC_DATA_GPIO5, | 3586 | .dmic1_data_pin = RT5645_DMIC_DATA_GPIO5, |
3587 | .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, | 3587 | .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, |
3588 | .jd_mode = 3, | 3588 | .jd_mode = 3, |
3589 | .jd_invert = true, | 3589 | .level_trigger_irq = true, |
3590 | }; | 3590 | }; |
3591 | 3591 | ||
3592 | static struct dmi_system_id dmi_platform_intel_broadwell[] = { | 3592 | static struct dmi_system_id dmi_platform_intel_broadwell[] = { |
@@ -3838,7 +3838,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, | |||
3838 | regmap_update_bits(rt5645->regmap, RT5645_ADDA_CLK1, | 3838 | regmap_update_bits(rt5645->regmap, RT5645_ADDA_CLK1, |
3839 | RT5645_I2S_PD1_MASK, RT5645_I2S_PD1_2); | 3839 | RT5645_I2S_PD1_MASK, RT5645_I2S_PD1_2); |
3840 | 3840 | ||
3841 | if (rt5645->pdata.jd_invert) { | 3841 | if (rt5645->pdata.level_trigger_irq) { |
3842 | regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, | 3842 | regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, |
3843 | RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); | 3843 | RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); |
3844 | } | 3844 | } |