forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d 
 kernel/sound/soc/codecs/rt5670.c
....@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * rt5670.c  --  RT5670 ALSA SoC audio codec driver
34  *
45  * Copyright 2014 Realtek Semiconductor Corp.
56  * Author: Bard Liao <bardliao@realtek.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
107  */
118 
129 #include <linux/module.h>
....@@ -28,13 +25,12 @@
2825 #include <sound/soc-dapm.h>
2926 #include <sound/initval.h>
3027 #include <sound/tlv.h>
31
-#include <sound/rt5670.h>
3228 
3329 #include "rl6231.h"
3430 #include "rt5670.h"
3531 #include "rt5670-dsp.h"
3632 
37
-#define RT5670_DEV_GPIO			BIT(0)
33
+#define RT5670_GPIO1_IS_IRQ			BIT(0)
3834 #define RT5670_IN2_DIFF			BIT(1)
3935 #define RT5670_DMIC_EN			BIT(2)
4036 #define RT5670_DMIC1_IN2P		BIT(3)
....@@ -456,13 +452,13 @@
456452 		snd_soc_component_update_bits(component, RT5670_CJ_CTRL2,
457453 			RT5670_CBJ_MN_JD, 0);
458454 		msleep(300);
459
-		val = snd_soc_component_read32(component, RT5670_CJ_CTRL3) & 0x7;
455
+		val = snd_soc_component_read(component, RT5670_CJ_CTRL3) & 0x7;
460456 		if (val == 0x1 || val == 0x2) {
461457 			rt5670->jack_type = SND_JACK_HEADSET;
462458 			/* for push button */
463459 			snd_soc_component_update_bits(component, RT5670_INT_IRQ_ST, 0x8, 0x8);
464460 			snd_soc_component_update_bits(component, RT5670_IL_CMD, 0x40, 0x40);
465
-			snd_soc_component_read32(component, RT5670_IL_CMD);
461
+			snd_soc_component_read(component, RT5670_IL_CMD);
466462 		} else {
467463 			snd_soc_component_update_bits(component, RT5670_GEN_CTRL3, 0x4, 0x4);
468464 			rt5670->jack_type = SND_JACK_HEADPHONE;
....@@ -502,12 +498,12 @@
502498 {
503499 	int btn_type, val;
504500 
505
-	val = snd_soc_component_read32(component, RT5670_IL_CMD);
501
+	val = snd_soc_component_read(component, RT5670_IL_CMD);
506502 	btn_type = val & 0xff80;
507503 	snd_soc_component_write(component, RT5670_IL_CMD, val);
508504 	if (btn_type != 0) {
509505 		msleep(20);
510
-		val = snd_soc_component_read32(component, RT5670_IL_CMD);
506
+		val = snd_soc_component_read(component, RT5670_IL_CMD);
511507 		snd_soc_component_write(component, RT5670_IL_CMD, val);
512508 	}
513509 
....@@ -521,10 +517,10 @@
521517 	struct snd_soc_jack *jack = rt5670->jack;
522518 	int val, btn_type, report = jack->status;
523519 
524
-	if (rt5670->pdata.jd_mode == 1) /* 2 port */
525
-		val = snd_soc_component_read32(rt5670->component, RT5670_A_JD_CTRL1) & 0x0070;
520
+	if (rt5670->jd_mode == 1) /* 2 port */
521
+		val = snd_soc_component_read(rt5670->component, RT5670_A_JD_CTRL1) & 0x0070;
526522 	else
527
-		val = snd_soc_component_read32(rt5670->component, RT5670_A_JD_CTRL1) & 0x0020;
523
+		val = snd_soc_component_read(rt5670->component, RT5670_A_JD_CTRL1) & 0x0020;
528524 
529525 	switch (val) {
530526 	/* jack in */
....@@ -537,7 +533,7 @@
537533 			break;
538534 		}
539535 		btn_type = 0;
540
-		if (snd_soc_component_read32(rt5670->component, RT5670_INT_IRQ_ST) & 0x4) {
536
+		if (snd_soc_component_read(rt5670->component, RT5670_INT_IRQ_ST) & 0x4) {
541537 			/* button pressed */
542538 			report = SND_JACK_HEADSET;
543539 			btn_type = rt5670_button_detect(rt5670->component);
....@@ -606,9 +602,9 @@
606602 EXPORT_SYMBOL_GPL(rt5670_set_jack_detect);
607603 
608604 static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);
609
-static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0);
605
+static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -6562, 0);
610606 static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
611
-static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0);
607
+static const DECLARE_TLV_DB_MINMAX(adc_vol_tlv, -1762, 3000);
612608 static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
613609 
614610 /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
....@@ -766,7 +762,7 @@
766762 		return 0;
767763 	}
768764 
769
-	val = (snd_soc_component_read32(component, reg) >> shift) & 0xf;
765
+	val = (snd_soc_component_read(component, reg) >> shift) & 0xf;
770766 	switch (val) {
771767 	case 1:
772768 	case 2:
....@@ -1058,20 +1054,6 @@
10581054 			RT5670_M_OV_R_LM_SFT, 1, 1),
10591055 };
10601056 
1061
-static const struct snd_kcontrol_new rt5670_hpl_mix[] = {
1062
-	SOC_DAPM_SINGLE("DAC L1 Switch", RT5670_HPO_MIXER,
1063
-			RT5670_M_DACL1_HML_SFT, 1, 1),
1064
-	SOC_DAPM_SINGLE("INL1 Switch", RT5670_HPO_MIXER,
1065
-			RT5670_M_INL1_HML_SFT, 1, 1),
1066
-};
1067
-
1068
-static const struct snd_kcontrol_new rt5670_hpr_mix[] = {
1069
-	SOC_DAPM_SINGLE("DAC R1 Switch", RT5670_HPO_MIXER,
1070
-			RT5670_M_DACR1_HMR_SFT, 1, 1),
1071
-	SOC_DAPM_SINGLE("INR1 Switch", RT5670_HPO_MIXER,
1072
-			RT5670_M_INR1_HMR_SFT, 1, 1),
1073
-};
1074
-
10751057 static const struct snd_kcontrol_new lout_l_enable_control =
10761058 	SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5670_LOUT1,
10771059 		RT5670_L_MUTE_SFT, 1, 1);
....@@ -1197,24 +1179,6 @@
11971179 static const struct snd_kcontrol_new rt5670_sto2_adc_2_mux =
11981180 	SOC_DAPM_ENUM("Stereo2 ADC 2 Mux", rt5670_stereo2_adc2_enum);
11991181 
1200
-
1201
-/* MX-27 MX26 [10] */
1202
-static const char * const rt5670_stereo_adc_src[] = {
1203
-	"ADC1L ADC2R", "ADC3"
1204
-};
1205
-
1206
-static SOC_ENUM_SINGLE_DECL(rt5670_stereo1_adc_enum, RT5670_STO1_ADC_MIXER,
1207
-	RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src);
1208
-
1209
-static const struct snd_kcontrol_new rt5670_sto_adc_mux =
1210
-	SOC_DAPM_ENUM("Stereo1 ADC source", rt5670_stereo1_adc_enum);
1211
-
1212
-static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc_enum, RT5670_STO2_ADC_MIXER,
1213
-	RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src);
1214
-
1215
-static const struct snd_kcontrol_new rt5670_sto2_adc_mux =
1216
-	SOC_DAPM_ENUM("Stereo2 ADC source", rt5670_stereo2_adc_enum);
1217
-
12181182 /* MX-27 MX-26 [9:8] */
12191183 static const char * const rt5670_stereo_dmic_src[] = {
12201184 	"DMIC1", "DMIC2", "DMIC3"
....@@ -1231,17 +1195,6 @@
12311195 
12321196 static const struct snd_kcontrol_new rt5670_sto2_dmic_mux =
12331197 	SOC_DAPM_ENUM("Stereo2 DMIC source", rt5670_stereo2_dmic_enum);
1234
-
1235
-/* MX-27 [0] */
1236
-static const char * const rt5670_stereo_dmic3_src[] = {
1237
-	"DMIC3", "PDM ADC"
1238
-};
1239
-
1240
-static SOC_ENUM_SINGLE_DECL(rt5670_stereo_dmic3_enum, RT5670_STO1_ADC_MIXER,
1241
-	RT5670_DMIC3_SRC_SFT, rt5670_stereo_dmic3_src);
1242
-
1243
-static const struct snd_kcontrol_new rt5670_sto_dmic3_mux =
1244
-	SOC_DAPM_ENUM("Stereo DMIC3 source", rt5670_stereo_dmic3_enum);
12451198 
12461199 /* Mono ADC source */
12471200 /* MX-28 [12] */
....@@ -1334,17 +1287,6 @@
13341287 
13351288 static const struct snd_kcontrol_new rt5670_if2_adc_in_mux =
13361289 	SOC_DAPM_ENUM("IF2 ADC IN source", rt5670_if2_adc_in_enum);
1337
-
1338
-/* MX-30 [5:4] */
1339
-static const char * const rt5670_if4_adc_in_src[] = {
1340
-	"IF_ADC1", "IF_ADC2", "IF_ADC3"
1341
-};
1342
-
1343
-static SOC_ENUM_SINGLE_DECL(rt5670_if4_adc_in_enum, RT5670_DIG_INF2_DATA,
1344
-	RT5670_IF4_ADC_IN_SFT, rt5670_if4_adc_in_src);
1345
-
1346
-static const struct snd_kcontrol_new rt5670_if4_adc_in_mux =
1347
-	SOC_DAPM_ENUM("IF4 ADC IN source", rt5670_if4_adc_in_enum);
13481290 
13491291 /* MX-31 [15] [13] [11] [9] */
13501292 static const char * const rt5670_pdm_src[] = {
....@@ -1511,7 +1453,7 @@
15111453 	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
15121454 	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
15131455 
1514
-	if (!rt5670->pdata.gpio1_is_ext_spk_en)
1456
+	if (!rt5670->gpio1_is_ext_spk_en)
15151457 		return 0;
15161458 
15171459 	switch (event) {
....@@ -2681,7 +2623,7 @@
26812623 				RT5670_LDO_SEL_MASK, 0x3);
26822624 		break;
26832625 	case SND_SOC_BIAS_OFF:
2684
-		if (rt5670->pdata.jd_mode)
2626
+		if (rt5670->jd_mode)
26852627 			snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
26862628 				RT5670_PWR_VREF1 | RT5670_PWR_MB |
26872629 				RT5670_PWR_BG | RT5670_PWR_VREF2 |
....@@ -2708,7 +2650,7 @@
27082650 	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
27092651 	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
27102652 
2711
-	switch (snd_soc_component_read32(component, RT5670_RESET) & RT5670_ID_MASK) {
2653
+	switch (snd_soc_component_read(component, RT5670_RESET) & RT5670_ID_MASK) {
27122654 	case RT5670_ID_5670:
27132655 	case RT5670_ID_5671:
27142656 		snd_soc_dapm_new_controls(dapm,
....@@ -2844,7 +2786,8 @@
28442786 static const struct regmap_config rt5670_regmap = {
28452787 	.reg_bits = 8,
28462788 	.val_bits = 16,
2847
-	.use_single_rw = true,
2789
+	.use_single_read = true,
2790
+	.use_single_write = true,
28482791 	.max_register = RT5670_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5670_ranges) *
28492792 					       RT5670_PR_SPACING),
28502793 	.volatile_reg = rt5670_volatile_register,
....@@ -2890,7 +2833,7 @@
28902833 		},
28912834 		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
28922835 						 RT5670_DMIC1_IN2P |
2893
-						 RT5670_DEV_GPIO |
2836
+						 RT5670_GPIO1_IS_IRQ |
28942837 						 RT5670_JD_MODE1),
28952838 	},
28962839 	{
....@@ -2902,7 +2845,19 @@
29022845 		},
29032846 		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
29042847 						 RT5670_DMIC1_IN2P |
2905
-						 RT5670_DEV_GPIO |
2848
+						 RT5670_GPIO1_IS_IRQ |
2849
+						 RT5670_JD_MODE1),
2850
+	},
2851
+	{
2852
+		.callback = rt5670_quirk_cb,
2853
+		.ident = "Lenovo Thinkpad Tablet 8",
2854
+		.matches = {
2855
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
2856
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad 8"),
2857
+		},
2858
+		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
2859
+						 RT5670_DMIC2_INR |
2860
+						 RT5670_GPIO1_IS_IRQ |
29062861 						 RT5670_JD_MODE1),
29072862 	},
29082863 	{
....@@ -2914,7 +2869,7 @@
29142869 		},
29152870 		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
29162871 						 RT5670_DMIC1_IN2P |
2917
-						 RT5670_DEV_GPIO |
2872
+						 RT5670_GPIO1_IS_IRQ |
29182873 						 RT5670_JD_MODE1),
29192874 	},
29202875 	{
....@@ -2926,7 +2881,7 @@
29262881 		},
29272882 		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
29282883 						 RT5670_DMIC1_IN2P |
2929
-						 RT5670_DEV_GPIO |
2884
+						 RT5670_GPIO1_IS_IRQ |
29302885 						 RT5670_JD_MODE1),
29312886 	},
29322887 	{
....@@ -2950,7 +2905,31 @@
29502905 		},
29512906 		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
29522907 						 RT5670_DMIC2_INR |
2953
-						 RT5670_DEV_GPIO |
2908
+						 RT5670_GPIO1_IS_IRQ |
2909
+						 RT5670_JD_MODE3),
2910
+	},
2911
+	{
2912
+		.callback = rt5670_quirk_cb,
2913
+		.ident = "Dell Venue 10 Pro 5055",
2914
+		.matches = {
2915
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
2916
+			DMI_MATCH(DMI_PRODUCT_NAME, "Venue 10 Pro 5055"),
2917
+		},
2918
+		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
2919
+						 RT5670_DMIC2_INR |
2920
+						 RT5670_GPIO1_IS_IRQ |
2921
+						 RT5670_JD_MODE1),
2922
+	},
2923
+	{
2924
+		.callback = rt5670_quirk_cb,
2925
+		.ident = "Aegex 10 tablet (RU2)",
2926
+		.matches = {
2927
+			DMI_MATCH(DMI_SYS_VENDOR, "AEGEX"),
2928
+			DMI_MATCH(DMI_PRODUCT_VERSION, "RU2"),
2929
+		},
2930
+		.driver_data = (unsigned long *)(RT5670_DMIC_EN |
2931
+						 RT5670_DMIC2_INR |
2932
+						 RT5670_GPIO1_IS_IRQ |
29542933 						 RT5670_JD_MODE3),
29552934 	},
29562935 	{}
....@@ -2959,7 +2938,6 @@
29592938 static int rt5670_i2c_probe(struct i2c_client *i2c,
29602939 		    const struct i2c_device_id *id)
29612940 {
2962
-	struct rt5670_platform_data *pdata = dev_get_platdata(&i2c->dev);
29632941 	struct rt5670_priv *rt5670;
29642942 	int ret;
29652943 	unsigned int val;
....@@ -2972,9 +2950,6 @@
29722950 
29732951 	i2c_set_clientdata(i2c, rt5670);
29742952 
2975
-	if (pdata)
2976
-		rt5670->pdata = *pdata;
2977
-
29782953 	dmi_check_system(dmi_platform_intel_quirks);
29792954 	if (quirk_override) {
29802955 		dev_info(&i2c->dev, "Overriding quirk 0x%x => 0x%x\n",
....@@ -2982,57 +2957,57 @@
29822957 		rt5670_quirk = quirk_override;
29832958 	}
29842959 
2985
-	if (rt5670_quirk & RT5670_DEV_GPIO) {
2986
-		rt5670->pdata.dev_gpio = true;
2987
-		dev_info(&i2c->dev, "quirk dev_gpio\n");
2960
+	if (rt5670_quirk & RT5670_GPIO1_IS_IRQ) {
2961
+		rt5670->gpio1_is_irq = true;
2962
+		dev_info(&i2c->dev, "quirk GPIO1 is IRQ\n");
29882963 	}
29892964 	if (rt5670_quirk & RT5670_GPIO1_IS_EXT_SPK_EN) {
2990
-		rt5670->pdata.gpio1_is_ext_spk_en = true;
2965
+		rt5670->gpio1_is_ext_spk_en = true;
29912966 		dev_info(&i2c->dev, "quirk GPIO1 is external speaker enable\n");
29922967 	}
29932968 	if (rt5670_quirk & RT5670_IN2_DIFF) {
2994
-		rt5670->pdata.in2_diff = true;
2969
+		rt5670->in2_diff = true;
29952970 		dev_info(&i2c->dev, "quirk IN2_DIFF\n");
29962971 	}
29972972 	if (rt5670_quirk & RT5670_DMIC_EN) {
2998
-		rt5670->pdata.dmic_en = true;
2973
+		rt5670->dmic_en = true;
29992974 		dev_info(&i2c->dev, "quirk DMIC enabled\n");
30002975 	}
30012976 	if (rt5670_quirk & RT5670_DMIC1_IN2P) {
3002
-		rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
2977
+		rt5670->dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
30032978 		dev_info(&i2c->dev, "quirk DMIC1 on IN2P pin\n");
30042979 	}
30052980 	if (rt5670_quirk & RT5670_DMIC1_GPIO6) {
3006
-		rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_GPIO6;
2981
+		rt5670->dmic1_data_pin = RT5670_DMIC_DATA_GPIO6;
30072982 		dev_info(&i2c->dev, "quirk DMIC1 on GPIO6 pin\n");
30082983 	}
30092984 	if (rt5670_quirk & RT5670_DMIC1_GPIO7) {
3010
-		rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_GPIO7;
2985
+		rt5670->dmic1_data_pin = RT5670_DMIC_DATA_GPIO7;
30112986 		dev_info(&i2c->dev, "quirk DMIC1 on GPIO7 pin\n");
30122987 	}
30132988 	if (rt5670_quirk & RT5670_DMIC2_INR) {
3014
-		rt5670->pdata.dmic2_data_pin = RT5670_DMIC_DATA_IN3N;
2989
+		rt5670->dmic2_data_pin = RT5670_DMIC_DATA_IN3N;
30152990 		dev_info(&i2c->dev, "quirk DMIC2 on INR pin\n");
30162991 	}
30172992 	if (rt5670_quirk & RT5670_DMIC2_GPIO8) {
3018
-		rt5670->pdata.dmic2_data_pin = RT5670_DMIC_DATA_GPIO8;
2993
+		rt5670->dmic2_data_pin = RT5670_DMIC_DATA_GPIO8;
30192994 		dev_info(&i2c->dev, "quirk DMIC2 on GPIO8 pin\n");
30202995 	}
30212996 	if (rt5670_quirk & RT5670_DMIC3_GPIO5) {
3022
-		rt5670->pdata.dmic3_data_pin = RT5670_DMIC_DATA_GPIO5;
2997
+		rt5670->dmic3_data_pin = RT5670_DMIC_DATA_GPIO5;
30232998 		dev_info(&i2c->dev, "quirk DMIC3 on GPIO5 pin\n");
30242999 	}
30253000 
30263001 	if (rt5670_quirk & RT5670_JD_MODE1) {
3027
-		rt5670->pdata.jd_mode = 1;
3002
+		rt5670->jd_mode = 1;
30283003 		dev_info(&i2c->dev, "quirk JD mode 1\n");
30293004 	}
30303005 	if (rt5670_quirk & RT5670_JD_MODE2) {
3031
-		rt5670->pdata.jd_mode = 2;
3006
+		rt5670->jd_mode = 2;
30323007 		dev_info(&i2c->dev, "quirk JD mode 2\n");
30333008 	}
30343009 	if (rt5670_quirk & RT5670_JD_MODE3) {
3035
-		rt5670->pdata.jd_mode = 3;
3010
+		rt5670->jd_mode = 3;
30363011 		dev_info(&i2c->dev, "quirk JD mode 3\n");
30373012 	}
30383013 
....@@ -3073,11 +3048,11 @@
30733048 	regmap_update_bits(rt5670->regmap, RT5670_DIG_MISC,
30743049 				 RT5670_MCLK_DET, RT5670_MCLK_DET);
30753050 
3076
-	if (rt5670->pdata.in2_diff)
3051
+	if (rt5670->in2_diff)
30773052 		regmap_update_bits(rt5670->regmap, RT5670_IN2,
30783053 					RT5670_IN_DF2, RT5670_IN_DF2);
30793054 
3080
-	if (rt5670->pdata.dev_gpio) {
3055
+	if (rt5670->gpio1_is_irq) {
30813056 		/* for push button */
30823057 		regmap_write(rt5670->regmap, RT5670_IL_CMD, 0x0000);
30833058 		regmap_write(rt5670->regmap, RT5670_IL_CMD2, 0x0010);
....@@ -3089,14 +3064,14 @@
30893064 				   RT5670_GP1_PF_MASK, RT5670_GP1_PF_OUT);
30903065 	}
30913066 
3092
-	if (rt5670->pdata.gpio1_is_ext_spk_en) {
3067
+	if (rt5670->gpio1_is_ext_spk_en) {
30933068 		regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL1,
30943069 				   RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_GPIO1);
30953070 		regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL2,
30963071 				   RT5670_GP1_PF_MASK, RT5670_GP1_PF_OUT);
30973072 	}
30983073 
3099
-	if (rt5670->pdata.jd_mode) {
3074
+	if (rt5670->jd_mode) {
31003075 		regmap_update_bits(rt5670->regmap, RT5670_GLB_CLK,
31013076 				   RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_RCCLK);
31023077 		rt5670->sysclk = 0;
....@@ -3111,7 +3086,7 @@
31113086 				   RT5670_JD_TRI_CBJ_SEL_MASK |
31123087 				   RT5670_JD_TRI_HPO_SEL_MASK,
31133088 				   RT5670_JD_CBJ_JD1_1 | RT5670_JD_HPO_JD1_1);
3114
-		switch (rt5670->pdata.jd_mode) {
3089
+		switch (rt5670->jd_mode) {
31153090 		case 1:
31163091 			regmap_update_bits(rt5670->regmap, RT5670_A_JD_CTRL1,
31173092 					   RT5670_JD1_MODE_MASK,
....@@ -3132,12 +3107,12 @@
31323107 		}
31333108 	}
31343109 
3135
-	if (rt5670->pdata.dmic_en) {
3110
+	if (rt5670->dmic_en) {
31363111 		regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL1,
31373112 				   RT5670_GP2_PIN_MASK,
31383113 				   RT5670_GP2_PIN_DMIC1_SCL);
31393114 
3140
-		switch (rt5670->pdata.dmic1_data_pin) {
3115
+		switch (rt5670->dmic1_data_pin) {
31413116 		case RT5670_DMIC_DATA_IN2P:
31423117 			regmap_update_bits(rt5670->regmap, RT5670_DMIC_CTRL1,
31433118 					   RT5670_DMIC_1_DP_MASK,
....@@ -3166,7 +3141,7 @@
31663141 			break;
31673142 		}
31683143 
3169
-		switch (rt5670->pdata.dmic2_data_pin) {
3144
+		switch (rt5670->dmic2_data_pin) {
31703145 		case RT5670_DMIC_DATA_IN3N:
31713146 			regmap_update_bits(rt5670->regmap, RT5670_DMIC_CTRL1,
31723147 					   RT5670_DMIC_2_DP_MASK,
....@@ -3186,7 +3161,7 @@
31863161 			break;
31873162 		}
31883163 
3189
-		switch (rt5670->pdata.dmic3_data_pin) {
3164
+		switch (rt5670->dmic3_data_pin) {
31903165 		case RT5670_DMIC_DATA_GPIO5:
31913166 			regmap_update_bits(rt5670->regmap, RT5670_DMIC_CTRL2,
31923167 					   RT5670_DMIC_3_DP_MASK,