ASoC: rt5663: Seprate the DC offset between headphone and headset

The patch seprates the DC offset between headphone and headset.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/rt5663.txt b/Documentation/devicetree/bindings/sound/rt5663.txt
index f7c7cc513ee83b0d3b4c3e1c21a1e848b385b429..ff381718c51755b5d3cb06ac7c0e3ae1a1c85f48 100644 (file)
--- a/Documentation/devicetree/bindings/sound/rt5663.txt
+++ b/Documentation/devicetree/bindings/sound/rt5663.txt
@@ -14,8 +14,11 @@ Optional properties:
 
 - "realtek,dc_offset_l_manual"
 - "realtek,dc_offset_r_manual"
+- "realtek,dc_offset_l_manual_mic"
+- "realtek,dc_offset_r_manual_mic"
   Based on the different PCB layout, add the manual offset value to
-  compensate the DC offset for each L and R channel.
+  compensate the DC offset for each L and R channel, and they are different
+  between headphone and headset.
 
 Pins on the device (for linking into audio routes) for RT5663:
 

diff --git a/include/sound/rt5663.h b/include/sound/rt5663.h
index be6f1b2d8fbd901f5c77c6cead6cfd9f69b5abf8..7d00e58497063d35daa35be5448f5a8b96e26d5c 100644 (file)
--- a/include/sound/rt5663.h
+++ b/include/sound/rt5663.h
@@ -14,6 +14,8 @@
 struct rt5663_platform_data {
        unsigned int dc_offset_l_manual;
        unsigned int dc_offset_r_manual;
+       unsigned int dc_offset_l_manual_mic;
+       unsigned int dc_offset_r_manual_mic;
 };
 
 #endif

diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c
index c1f0a72c0133136143efa94e6296d787c2035f07..be93231b0f58f956b2a126803ed554fc2f773d66 100644 (file)
--- a/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
@@ -1570,9 +1570,43 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
                case 2:
                        rt5663->jack_type = SND_JACK_HEADSET;
                        rt5663_enable_push_button_irq(codec, true);
+
+                       if (rt5663->pdata.dc_offset_l_manual_mic) {
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_2,
+                                       rt5663->pdata.dc_offset_l_manual_mic >>
+                                       16);
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_3,
+                                       rt5663->pdata.dc_offset_l_manual_mic &
+                                       0xffff);
+                       }
+
+                       if (rt5663->pdata.dc_offset_r_manual_mic) {
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_5,
+                                       rt5663->pdata.dc_offset_r_manual_mic >>
+                                       16);
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_6,
+                                       rt5663->pdata.dc_offset_r_manual_mic &
+                                       0xffff);
+                       }
                        break;
                default:
                        rt5663->jack_type = SND_JACK_HEADPHONE;
+
+                       if (rt5663->pdata.dc_offset_l_manual) {
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_2,
+                                       rt5663->pdata.dc_offset_l_manual >> 16);
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_3,
+                                       rt5663->pdata.dc_offset_l_manual &
+                                       0xffff);
+                       }
+
+                       if (rt5663->pdata.dc_offset_r_manual) {
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_5,
+                                       rt5663->pdata.dc_offset_r_manual >> 16);
+                               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_6,
+                                       rt5663->pdata.dc_offset_r_manual &
+                                       0xffff);
+                       }
                        break;
                }
        } else {
@@ -3133,6 +3167,10 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev)
                &rt5663->pdata.dc_offset_l_manual);
        device_property_read_u32(dev, "realtek,dc_offset_r_manual",
                &rt5663->pdata.dc_offset_r_manual);
+       device_property_read_u32(dev, "realtek,dc_offset_l_manual_mic",
+               &rt5663->pdata.dc_offset_l_manual_mic);
+       device_property_read_u32(dev, "realtek,dc_offset_r_manual_mic",
+               &rt5663->pdata.dc_offset_r_manual_mic);
 
        return 0;
 }
@@ -3221,20 +3259,6 @@ static int rt5663_i2c_probe(struct i2c_client *i2c,
                dev_err(&i2c->dev, "%s:Unknown codec type\n", __func__);
        }
 
-       if (rt5663->pdata.dc_offset_l_manual) {
-               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_2,
-                       rt5663->pdata.dc_offset_l_manual >> 16);
-               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_3,
-                       rt5663->pdata.dc_offset_l_manual & 0xffff);
-       }
-
-       if (rt5663->pdata.dc_offset_r_manual) {
-               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_5,
-                       rt5663->pdata.dc_offset_r_manual >> 16);
-               regmap_write(rt5663->regmap, RT5663_MIC_DECRO_6,
-                       rt5663->pdata.dc_offset_r_manual & 0xffff);
-       }
-
        /* GPIO1 as IRQ */
        regmap_update_bits(rt5663->regmap, RT5663_GPIO_1, RT5663_GP1_PIN_MASK,
                RT5663_GP1_PIN_IRQ);