~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,12 +1,10 @@
1		-/*
2		- * max9867.c -- max9867 ALSA SoC Audio driver
3		- *
4		- * Copyright 2013-15 Maxim Integrated Products
5		- *
6		- * This program is free software; you can redistribute it and/or modify
7		- * it under the terms of the GNU General Public License version 2 as
8		- * published by the Free Software Foundation.
9		- */
	1	+// SPDX-License-Identifier: GPL-2.0
	2	+//
	3	+// MAX9867 ALSA SoC codec driver
	4	+//
	5	+// Copyright 2013-2015 Maxim Integrated Products
	6	+// Copyright 2018 Ladislav Michl <ladis@linux-mips.org>
	7	+//
10	8
11	9	#include <linux/delay.h>
12	10	#include <linux/i2c.h>
..	..	@@ -17,185 +15,365 @@
17	15	#include <sound/tlv.h>
18	16	#include "max9867.h"
19	17
	18	+struct max9867_priv {
	19	+ struct regmap *regmap;
	20	+ const struct snd_pcm_hw_constraint_list *constraints;
	21	+ unsigned int sysclk, pclk;
	22	+ bool master, dsp_a;
	23	+ unsigned int adc_dac_active;
	24	+};
	25	+
20	26	static const char *const max9867_spmode[] = {
21	27	"Stereo Diff", "Mono Diff",
22	28	"Stereo Cap", "Mono Cap",
23	29	"Stereo Single", "Mono Single",
24	30	"Stereo Single Fast", "Mono Single Fast"
25	31	};
26		-static const char *const max9867_sidetone_text[] = {
27		- "None", "Left", "Right", "LeftRight", "LeftRightDiv2",
28		-};
29	32	static const char *const max9867_filter_text[] = {"IIR", "FIR"};
30	33
31		-static SOC_ENUM_SINGLE_DECL(max9867_filter, MAX9867_CODECFLTR, 7,
32		- max9867_filter_text);
	34	+static const char *const max9867_adc_dac_filter_text[] = {
	35	+ "Disabled",
	36	+ "Elliptical/16/256",
	37	+ "Butterworth/16/500",
	38	+ "Elliptical/8/256",
	39	+ "Butterworth/8/500",
	40	+ "Butterworth/8-24"
	41	+};
	42	+
	43	+enum max9867_adc_dac {
	44	+ MAX9867_ADC_LEFT,
	45	+ MAX9867_ADC_RIGHT,
	46	+ MAX9867_DAC_LEFT,
	47	+ MAX9867_DAC_RIGHT,
	48	+};
	49	+
	50	+static int max9867_adc_dac_event(struct snd_soc_dapm_widget *w,
	51	+ struct snd_kcontrol *kcontrol, int event)
	52	+{
	53	+ struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
	54	+ struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
	55	+ enum max9867_adc_dac adc_dac;
	56	+
	57	+ if (!strcmp(w->name, "ADCL"))
	58	+ adc_dac = MAX9867_ADC_LEFT;
	59	+ else if (!strcmp(w->name, "ADCR"))
	60	+ adc_dac = MAX9867_ADC_RIGHT;
	61	+ else if (!strcmp(w->name, "DACL"))
	62	+ adc_dac = MAX9867_DAC_LEFT;
	63	+ else if (!strcmp(w->name, "DACR"))
	64	+ adc_dac = MAX9867_DAC_RIGHT;
	65	+ else
	66	+ return 0;
	67	+
	68	+ if (SND_SOC_DAPM_EVENT_ON(event))
	69	+ max9867->adc_dac_active \|= BIT(adc_dac);
	70	+ else if (SND_SOC_DAPM_EVENT_OFF(event))
	71	+ max9867->adc_dac_active &= ~BIT(adc_dac);
	72	+
	73	+ return 0;
	74	+}
	75	+
	76	+static int max9867_filter_get(struct snd_kcontrol *kcontrol,
	77	+ struct snd_ctl_elem_value *ucontrol)
	78	+{
	79	+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
	80	+ struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
	81	+ unsigned int reg;
	82	+ int ret;
	83	+
	84	+ ret = regmap_read(max9867->regmap, MAX9867_CODECFLTR, &reg);
	85	+ if (ret)
	86	+ return -EINVAL;
	87	+
	88	+ if (reg & MAX9867_CODECFLTR_MODE)
	89	+ ucontrol->value.enumerated.item[0] = 1;
	90	+ else
	91	+ ucontrol->value.enumerated.item[0] = 0;
	92	+
	93	+ return 0;
	94	+}
	95	+
	96	+static int max9867_filter_set(struct snd_kcontrol *kcontrol,
	97	+ struct snd_ctl_elem_value *ucontrol)
	98	+{
	99	+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
	100	+ struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
	101	+ unsigned int reg, mode = ucontrol->value.enumerated.item[0];
	102	+ int ret;
	103	+
	104	+ if (mode > 1)
	105	+ return -EINVAL;
	106	+
	107	+ /* don't allow change if ADC/DAC active */
	108	+ if (max9867->adc_dac_active)
	109	+ return -EBUSY;
	110	+
	111	+ /* read current filter mode */
	112	+ ret = regmap_read(max9867->regmap, MAX9867_CODECFLTR, &reg);
	113	+ if (ret)
	114	+ return -EINVAL;
	115	+
	116	+ if (mode)
	117	+ mode = MAX9867_CODECFLTR_MODE;
	118	+
	119	+ /* check if change is needed */
	120	+ if ((reg & MAX9867_CODECFLTR_MODE) == mode)
	121	+ return 0;
	122	+
	123	+ /* shutdown codec before switching filter mode */
	124	+ regmap_update_bits(max9867->regmap, MAX9867_PWRMAN,
	125	+ MAX9867_PWRMAN_SHDN, 0);
	126	+
	127	+ /* switch filter mode */
	128	+ regmap_update_bits(max9867->regmap, MAX9867_CODECFLTR,
	129	+ MAX9867_CODECFLTR_MODE, mode);
	130	+
	131	+ /* out of shutdown now */
	132	+ regmap_update_bits(max9867->regmap, MAX9867_PWRMAN,
	133	+ MAX9867_PWRMAN_SHDN, MAX9867_PWRMAN_SHDN);
	134	+
	135	+ return 0;
	136	+}
	137	+
	138	+static SOC_ENUM_SINGLE_EXT_DECL(max9867_filter, max9867_filter_text);
	139	+static SOC_ENUM_SINGLE_DECL(max9867_dac_filter, MAX9867_CODECFLTR, 0,
	140	+ max9867_adc_dac_filter_text);
	141	+static SOC_ENUM_SINGLE_DECL(max9867_adc_filter, MAX9867_CODECFLTR, 4,
	142	+ max9867_adc_dac_filter_text);
33	143	static SOC_ENUM_SINGLE_DECL(max9867_spkmode, MAX9867_MODECONFIG, 0,
34	144	max9867_spmode);
35		-static SOC_ENUM_SINGLE_DECL(max9867_sidetone, MAX9867_DACGAIN, 6,
36		- max9867_sidetone_text);
37		-static DECLARE_TLV_DB_SCALE(max9860_capture_tlv, -600, 200, 0);
38		-static DECLARE_TLV_DB_SCALE(max9860_mic_tlv, 2000, 100, 1);
39		-static DECLARE_TLV_DB_SCALE(max9860_adc_left_tlv, -1200, 100, 1);
40		-static DECLARE_TLV_DB_SCALE(max9860_adc_right_tlv, -1200, 100, 1);
41		-static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(max98088_micboost_tlv,
42		- 0, 1, TLV_DB_SCALE_ITEM(0, 2000, 0),
43		- 2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0),
	145	+static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(max9867_master_tlv,
	146	+ 0, 2, TLV_DB_SCALE_ITEM(-8600, 200, 1),
	147	+ 3, 17, TLV_DB_SCALE_ITEM(-7800, 400, 0),
	148	+ 18, 25, TLV_DB_SCALE_ITEM(-2000, 200, 0),
	149	+ 26, 34, TLV_DB_SCALE_ITEM( -500, 100, 0),
	150	+ 35, 40, TLV_DB_SCALE_ITEM( 350, 50, 0),
	151	+);
	152	+static DECLARE_TLV_DB_SCALE(max9867_mic_tlv, 0, 100, 0);
	153	+static DECLARE_TLV_DB_SCALE(max9867_line_tlv, -600, 200, 0);
	154	+static DECLARE_TLV_DB_SCALE(max9867_adc_tlv, -1200, 100, 0);
	155	+static DECLARE_TLV_DB_SCALE(max9867_dac_tlv, -1500, 100, 0);
	156	+static DECLARE_TLV_DB_SCALE(max9867_dacboost_tlv, 0, 600, 0);
	157	+static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(max9867_micboost_tlv,
	158	+ 0, 2, TLV_DB_SCALE_ITEM(-2000, 2000, 1),
	159	+ 3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0),
44	160	);
45	161
46	162	static const struct snd_kcontrol_new max9867_snd_controls[] = {
47		- SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL,
48		- MAX9867_RIGHTVOL, 0, 63, 1),
49		- SOC_DOUBLE_R_TLV("Capture Volume", MAX9867_LEFTMICGAIN,
50		- MAX9867_RIGHTMICGAIN,
51		- 0, 15, 1, max9860_capture_tlv),
52		- SOC_DOUBLE_R_TLV("Mic Volume", MAX9867_LEFTMICGAIN,
53		- MAX9867_RIGHTMICGAIN, 0, 31, 1, max9860_mic_tlv),
54		- SOC_DOUBLE_R_TLV("Mic Boost Volume", MAX9867_LEFTMICGAIN,
55		- MAX9867_RIGHTMICGAIN, 5, 3, 0, max98088_micboost_tlv),
56		- SOC_ENUM("Digital Sidetone Src", max9867_sidetone),
57		- SOC_SINGLE("Sidetone Volume", MAX9867_DACGAIN, 0, 31, 1),
58		- SOC_SINGLE("DAC Volume", MAX9867_DACLEVEL, 4, 3, 0),
59		- SOC_SINGLE("DAC Attenuation", MAX9867_DACLEVEL, 0, 15, 1),
60		- SOC_SINGLE_TLV("ADC Left Volume", MAX9867_ADCLEVEL,
61		- 4, 15, 1, max9860_adc_left_tlv),
62		- SOC_SINGLE_TLV("ADC Right Volume", MAX9867_ADCLEVEL,
63		- 0, 15, 1, max9860_adc_right_tlv),
	163	+ SOC_DOUBLE_R_TLV("Master Playback Volume", MAX9867_LEFTVOL,
	164	+ MAX9867_RIGHTVOL, 0, 40, 1, max9867_master_tlv),
	165	+ SOC_DOUBLE_R_TLV("Line Capture Volume", MAX9867_LEFTLINELVL,
	166	+ MAX9867_RIGHTLINELVL, 0, 15, 1, max9867_line_tlv),
	167	+ SOC_DOUBLE_R_TLV("Mic Capture Volume", MAX9867_LEFTMICGAIN,
	168	+ MAX9867_RIGHTMICGAIN, 0, 20, 1, max9867_mic_tlv),
	169	+ SOC_DOUBLE_R_TLV("Mic Boost Capture Volume", MAX9867_LEFTMICGAIN,
	170	+ MAX9867_RIGHTMICGAIN, 5, 3, 0, max9867_micboost_tlv),
	171	+ SOC_SINGLE("Digital Sidetone Volume", MAX9867_SIDETONE, 0, 31, 1),
	172	+ SOC_SINGLE_TLV("Digital Playback Volume", MAX9867_DACLEVEL, 0, 15, 1,
	173	+ max9867_dac_tlv),
	174	+ SOC_SINGLE_TLV("Digital Boost Playback Volume", MAX9867_DACLEVEL, 4, 3, 0,
	175	+ max9867_dacboost_tlv),
	176	+ SOC_DOUBLE_TLV("Digital Capture Volume", MAX9867_ADCLEVEL, 4, 0, 15, 1,
	177	+ max9867_adc_tlv),
64	178	SOC_ENUM("Speaker Mode", max9867_spkmode),
65	179	SOC_SINGLE("Volume Smoothing Switch", MAX9867_MODECONFIG, 6, 1, 0),
66		- SOC_SINGLE("ZCD Switch", MAX9867_MODECONFIG, 5, 1, 0),
67		- SOC_ENUM("DSP Filter", max9867_filter),
	180	+ SOC_SINGLE("Line ZC Switch", MAX9867_MODECONFIG, 5, 1, 0),
	181	+ SOC_ENUM_EXT("DSP Filter", max9867_filter, max9867_filter_get, max9867_filter_set),
	182	+ SOC_ENUM("ADC Filter", max9867_adc_filter),
	183	+ SOC_ENUM("DAC Filter", max9867_dac_filter),
	184	+ SOC_SINGLE("Mono Playback Switch", MAX9867_IFC1B, 3, 1, 0),
68	185	};
69	186
70		-static const char *const max9867_mux[] = {"None", "Mic", "Line", "Mic_Line"};
	187	+/* Input mixer */
	188	+static const struct snd_kcontrol_new max9867_input_mixer_controls[] = {
	189	+ SOC_DAPM_DOUBLE("Line Capture Switch", MAX9867_INPUTCONFIG, 7, 5, 1, 0),
	190	+ SOC_DAPM_DOUBLE("Mic Capture Switch", MAX9867_INPUTCONFIG, 6, 4, 1, 0),
	191	+};
71	192
72		-static SOC_ENUM_SINGLE_DECL(max9867_mux_enum,
73		- MAX9867_INPUTCONFIG, MAX9867_INPUT_SHIFT,
74		- max9867_mux);
	193	+/* Output mixer */
	194	+static const struct snd_kcontrol_new max9867_output_mixer_controls[] = {
	195	+ SOC_DAPM_DOUBLE_R("Line Bypass Switch",
	196	+ MAX9867_LEFTLINELVL, MAX9867_RIGHTLINELVL, 6, 1, 1),
	197	+};
75	198
76		-static const struct snd_kcontrol_new max9867_dapm_mux_controls =
77		- SOC_DAPM_ENUM("Route", max9867_mux_enum);
	199	+/* Sidetone mixer */
	200	+static const struct snd_kcontrol_new max9867_sidetone_mixer_controls[] = {
	201	+ SOC_DAPM_DOUBLE("Sidetone Switch", MAX9867_SIDETONE, 6, 7, 1, 0),
	202	+};
78	203
79		-static const struct snd_kcontrol_new max9867_left_dapm_control =
80		- SOC_DAPM_SINGLE("Switch", MAX9867_PWRMAN, 6, 1, 0);
81		-static const struct snd_kcontrol_new max9867_right_dapm_control =
82		- SOC_DAPM_SINGLE("Switch", MAX9867_PWRMAN, 5, 1, 0);
83		-static const struct snd_kcontrol_new max9867_line_dapm_control =
84		- SOC_DAPM_SINGLE("Switch", MAX9867_LEFTLINELVL, 6, 1, 1);
	204	+/* Line out switch */
	205	+static const struct snd_kcontrol_new max9867_line_out_control =
	206	+ SOC_DAPM_DOUBLE_R("Switch",
	207	+ MAX9867_LEFTVOL, MAX9867_RIGHTVOL, 6, 1, 1);
	208	+
	209	+/* DMIC mux */
	210	+static const char *const dmic_mux_text[] = {
	211	+ "ADC", "DMIC"
	212	+};
	213	+static SOC_ENUM_SINGLE_DECL(left_dmic_mux_enum,
	214	+ MAX9867_MICCONFIG, 5, dmic_mux_text);
	215	+static SOC_ENUM_SINGLE_DECL(right_dmic_mux_enum,
	216	+ MAX9867_MICCONFIG, 4, dmic_mux_text);
	217	+static const struct snd_kcontrol_new max9867_left_dmic_mux =
	218	+ SOC_DAPM_ENUM("DMICL Mux", left_dmic_mux_enum);
	219	+static const struct snd_kcontrol_new max9867_right_dmic_mux =
	220	+ SOC_DAPM_ENUM("DMICR Mux", right_dmic_mux_enum);
85	221
86	222	static const struct snd_soc_dapm_widget max9867_dapm_widgets[] = {
87		- SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0),
88		- SND_SOC_DAPM_DAC("Left DAC", NULL, MAX9867_PWRMAN, 3, 0),
89		- SND_SOC_DAPM_DAC("Right DAC", NULL, MAX9867_PWRMAN, 2, 0),
90		- SND_SOC_DAPM_MIXER("Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
91		- SND_SOC_DAPM_OUTPUT("HPOUT"),
	223	+ SND_SOC_DAPM_INPUT("MICL"),
	224	+ SND_SOC_DAPM_INPUT("MICR"),
	225	+ SND_SOC_DAPM_INPUT("DMICL"),
	226	+ SND_SOC_DAPM_INPUT("DMICR"),
	227	+ SND_SOC_DAPM_INPUT("LINL"),
	228	+ SND_SOC_DAPM_INPUT("LINR"),
92	229
93		- SND_SOC_DAPM_AIF_IN("DAI_IN", "HiFi Capture", 0, SND_SOC_NOPM, 0, 0),
94		- SND_SOC_DAPM_ADC("Left ADC", "HiFi Capture", MAX9867_PWRMAN, 1, 0),
95		- SND_SOC_DAPM_ADC("Right ADC", "HiFi Capture", MAX9867_PWRMAN, 0, 0),
96		- SND_SOC_DAPM_MUX("Input Mux", SND_SOC_NOPM, 0, 0,
97		- &max9867_dapm_mux_controls),
	230	+ SND_SOC_DAPM_PGA("Left Line Input", SND_SOC_NOPM, 0, 0, NULL, 0),
	231	+ SND_SOC_DAPM_PGA("Right Line Input", SND_SOC_NOPM, 0, 0, NULL, 0),
	232	+ SND_SOC_DAPM_MIXER_NAMED_CTL("Input Mixer", SND_SOC_NOPM, 0, 0,
	233	+ max9867_input_mixer_controls,
	234	+ ARRAY_SIZE(max9867_input_mixer_controls)),
	235	+ SND_SOC_DAPM_MUX("DMICL Mux", SND_SOC_NOPM, 0, 0,
	236	+ &max9867_left_dmic_mux),
	237	+ SND_SOC_DAPM_MUX("DMICR Mux", SND_SOC_NOPM, 0, 0,
	238	+ &max9867_right_dmic_mux),
	239	+ SND_SOC_DAPM_ADC_E("ADCL", "HiFi Capture", SND_SOC_NOPM, 0, 0,
	240	+ max9867_adc_dac_event,
	241	+ SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
	242	+ SND_SOC_DAPM_ADC_E("ADCR", "HiFi Capture", SND_SOC_NOPM, 0, 0,
	243	+ max9867_adc_dac_event,
	244	+ SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
98	245
99		- SND_SOC_DAPM_MIXER("Input Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
100		- SND_SOC_DAPM_SWITCH("Left Line", MAX9867_LEFTLINELVL, 6, 1,
101		- &max9867_left_dapm_control),
102		- SND_SOC_DAPM_SWITCH("Right Line", MAX9867_RIGTHLINELVL, 6, 1,
103		- &max9867_right_dapm_control),
104		- SND_SOC_DAPM_SWITCH("Line Mixer", SND_SOC_NOPM, 0, 0,
105		- &max9867_line_dapm_control),
106		- SND_SOC_DAPM_INPUT("LINE_IN"),
	246	+ SND_SOC_DAPM_MIXER("Digital", SND_SOC_NOPM, 0, 0,
	247	+ max9867_sidetone_mixer_controls,
	248	+ ARRAY_SIZE(max9867_sidetone_mixer_controls)),
	249	+ SND_SOC_DAPM_MIXER_NAMED_CTL("Output Mixer", SND_SOC_NOPM, 0, 0,
	250	+ max9867_output_mixer_controls,
	251	+ ARRAY_SIZE(max9867_output_mixer_controls)),
	252	+ SND_SOC_DAPM_DAC_E("DACL", "HiFi Playback", SND_SOC_NOPM, 0, 0,
	253	+ max9867_adc_dac_event,
	254	+ SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
	255	+ SND_SOC_DAPM_DAC_E("DACR", "HiFi Playback", SND_SOC_NOPM, 0, 0,
	256	+ max9867_adc_dac_event,
	257	+ SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
	258	+ SND_SOC_DAPM_SWITCH("Master Playback", SND_SOC_NOPM, 0, 0,
	259	+ &max9867_line_out_control),
	260	+ SND_SOC_DAPM_OUTPUT("LOUT"),
	261	+ SND_SOC_DAPM_OUTPUT("ROUT"),
107	262	};
108	263
109	264	static const struct snd_soc_dapm_route max9867_audio_map[] = {
110		- {"Left DAC", NULL, "DAI_OUT"},
111		- {"Right DAC", NULL, "DAI_OUT"},
112		- {"Output Mixer", NULL, "Left DAC"},
113		- {"Output Mixer", NULL, "Right DAC"},
114		- {"HPOUT", NULL, "Output Mixer"},
	265	+ {"Left Line Input", NULL, "LINL"},
	266	+ {"Right Line Input", NULL, "LINR"},
	267	+ {"Input Mixer", "Mic Capture Switch", "MICL"},
	268	+ {"Input Mixer", "Mic Capture Switch", "MICR"},
	269	+ {"Input Mixer", "Line Capture Switch", "Left Line Input"},
	270	+ {"Input Mixer", "Line Capture Switch", "Right Line Input"},
	271	+ {"DMICL Mux", "DMIC", "DMICL"},
	272	+ {"DMICR Mux", "DMIC", "DMICR"},
	273	+ {"DMICL Mux", "ADC", "Input Mixer"},
	274	+ {"DMICR Mux", "ADC", "Input Mixer"},
	275	+ {"ADCL", NULL, "DMICL Mux"},
	276	+ {"ADCR", NULL, "DMICR Mux"},
115	277
116		- {"Left ADC", NULL, "DAI_IN"},
117		- {"Right ADC", NULL, "DAI_IN"},
118		- {"Input Mixer", NULL, "Left ADC"},
119		- {"Input Mixer", NULL, "Right ADC"},
120		- {"Input Mux", "Line", "Input Mixer"},
121		- {"Input Mux", "Mic", "Input Mixer"},
122		- {"Input Mux", "Mic_Line", "Input Mixer"},
123		- {"Right Line", "Switch", "Input Mux"},
124		- {"Left Line", "Switch", "Input Mux"},
125		- {"LINE_IN", NULL, "Left Line"},
126		- {"LINE_IN", NULL, "Right Line"},
	278	+ {"Digital", "Sidetone Switch", "ADCL"},
	279	+ {"Digital", "Sidetone Switch", "ADCR"},
	280	+ {"DACL", NULL, "Digital"},
	281	+ {"DACR", NULL, "Digital"},
	282	+
	283	+ {"Output Mixer", "Line Bypass Switch", "Left Line Input"},
	284	+ {"Output Mixer", "Line Bypass Switch", "Right Line Input"},
	285	+ {"Output Mixer", NULL, "DACL"},
	286	+ {"Output Mixer", NULL, "DACR"},
	287	+ {"Master Playback", "Switch", "Output Mixer"},
	288	+ {"LOUT", NULL, "Master Playback"},
	289	+ {"ROUT", NULL, "Master Playback"},
127	290	};
128	291
129		-enum rates {
130		- pcm_rate_8, pcm_rate_16, pcm_rate_24,
131		- pcm_rate_32, pcm_rate_44,
132		- pcm_rate_48, max_pcm_rate,
	292	+static const unsigned int max9867_rates_44k1[] = {
	293	+ 11025, 22050, 44100,
133	294	};
134	295
135		-static const struct ni_div_rates {
136		- u32 mclk;
137		- u16 ni[max_pcm_rate];
138		-} ni_div[] = {
139		- {11289600, {0x116A, 0x22D4, 0x343F, 0x45A9, 0x6000, 0x687D} },
140		- {12000000, {0x1062, 0x20C5, 0x3127, 0x4189, 0x5A51, 0x624E} },
141		- {12288000, {0x1000, 0x2000, 0x3000, 0x4000, 0x5833, 0x6000} },
142		- {13000000, {0x0F20, 0x1E3F, 0x2D5F, 0x3C7F, 0x535F, 0x5ABE} },
143		- {19200000, {0x0A3D, 0x147B, 0x1EB8, 0x28F6, 0x3873, 0x3D71} },
144		- {24000000, {0x1062, 0x20C5, 0x1893, 0x4189, 0x5A51, 0x624E} },
145		- {26000000, {0x0F20, 0x1E3F, 0x16AF, 0x3C7F, 0x535F, 0x5ABE} },
146		- {27000000, {0x0E90, 0x1D21, 0x15D8, 0x3A41, 0x5048, 0x5762} },
	296	+static const struct snd_pcm_hw_constraint_list max9867_constraints_44k1 = {
	297	+ .list = max9867_rates_44k1,
	298	+ .count = ARRAY_SIZE(max9867_rates_44k1),
147	299	};
148	300
149		-static inline int get_ni_value(int mclk, int rate)
	301	+static const unsigned int max9867_rates_48k[] = {
	302	+ 8000, 16000, 32000, 48000,
	303	+};
	304	+
	305	+static const struct snd_pcm_hw_constraint_list max9867_constraints_48k = {
	306	+ .list = max9867_rates_48k,
	307	+ .count = ARRAY_SIZE(max9867_rates_48k),
	308	+};
	309	+
	310	+static int max9867_startup(struct snd_pcm_substream *substream,
	311	+ struct snd_soc_dai *dai)
150	312	{
151		- int i, ret = 0;
	313	+ struct max9867_priv *max9867 =
	314	+ snd_soc_component_get_drvdata(dai->component);
152	315
153		- /* find the closest rate index*/
154		- for (i = 0; i < ARRAY_SIZE(ni_div); i++) {
155		- if (ni_div[i].mclk >= mclk)
156		- break;
157		- }
158		- if (i == ARRAY_SIZE(ni_div))
159		- return -EINVAL;
	316	+ if (max9867->constraints)
	317	+ snd_pcm_hw_constraint_list(substream->runtime, 0,
	318	+ SNDRV_PCM_HW_PARAM_RATE, max9867->constraints);
160	319
161		- switch (rate) {
162		- case 8000:
163		- return ni_div[i].ni[pcm_rate_8];
164		- case 16000:
165		- return ni_div[i].ni[pcm_rate_16];
166		- case 32000:
167		- return ni_div[i].ni[pcm_rate_32];
168		- case 44100:
169		- return ni_div[i].ni[pcm_rate_44];
170		- case 48000:
171		- return ni_div[i].ni[pcm_rate_48];
172		- default:
173		- pr_err("%s wrong rate %d\n", __func__, rate);
174		- ret = -EINVAL;
175		- }
176		- return ret;
	320	+ return 0;
177	321	}
178	322
179	323	static int max9867_dai_hw_params(struct snd_pcm_substream *substream,
180	324	struct snd_pcm_hw_params params, struct snd_soc_dai dai)
181	325	{
	326	+ int value;
	327	+ unsigned long int rate, ratio;
182	328	struct snd_soc_component *component = dai->component;
183	329	struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
184		- unsigned int ni_h, ni_l;
185		- int value;
	330	+ unsigned int ni = DIV_ROUND_CLOSEST_ULL(96ULL * 0x10000 * params_rate(params),
	331	+ max9867->pclk);
186	332
187		- value = get_ni_value(max9867->sysclk, params_rate(params));
188		- if (value < 0)
189		- return value;
190		-
191		- ni_h = (0xFF00 & value) >> 8;
192		- ni_l = 0x00FF & value;
193	333	/* set up the ni value */
194	334	regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKHIGH,
195		- MAX9867_NI_HIGH_MASK, ni_h);
	335	+ MAX9867_NI_HIGH_MASK, (0xFF00 & ni) >> 8);
196	336	regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKLOW,
197		- MAX9867_NI_LOW_MASK, ni_l);
198		- if (!max9867->master) {
	337	+ MAX9867_NI_LOW_MASK, 0x00FF & ni);
	338	+ if (max9867->master) {
	339	+ if (max9867->dsp_a) {
	340	+ value = MAX9867_IFC1B_48X;
	341	+ } else {
	342	+ rate = params_rate(params) * 2 * params_width(params);
	343	+ ratio = max9867->pclk / rate;
	344	+ switch (params_width(params)) {
	345	+ case 8:
	346	+ case 16:
	347	+ switch (ratio) {
	348	+ case 2:
	349	+ value = MAX9867_IFC1B_PCLK_2;
	350	+ break;
	351	+ case 4:
	352	+ value = MAX9867_IFC1B_PCLK_4;
	353	+ break;
	354	+ case 8:
	355	+ value = MAX9867_IFC1B_PCLK_8;
	356	+ break;
	357	+ case 16:
	358	+ value = MAX9867_IFC1B_PCLK_16;
	359	+ break;
	360	+ default:
	361	+ return -EINVAL;
	362	+ }
	363	+ break;
	364	+ case 24:
	365	+ value = MAX9867_IFC1B_48X;
	366	+ break;
	367	+ case 32:
	368	+ value = MAX9867_IFC1B_64X;
	369	+ break;
	370	+ default:
	371	+ return -EINVAL;
	372	+ }
	373	+ }
	374	+ regmap_update_bits(max9867->regmap, MAX9867_IFC1B,
	375	+ MAX9867_IFC1B_BCLK_MASK, value);
	376	+ } else {
199	377	/*
200	378	* digital pll locks on to any externally supplied LRCLK signal
201	379	* and also enable rapid lock mode.
..	..	@@ -204,62 +382,17 @@
204	382	MAX9867_RAPID_LOCK, MAX9867_RAPID_LOCK);
205	383	regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKHIGH,
206	384	MAX9867_PLL, MAX9867_PLL);
207		- } else {
208		- unsigned long int bclk_rate, pclk_bclk_ratio;
209		- int bclk_value;
210		-
211		- bclk_rate = params_rate(params) * 2 * params_width(params);
212		- pclk_bclk_ratio = max9867->pclk/bclk_rate;
213		- switch (params_width(params)) {
214		- case 8:
215		- case 16:
216		- switch (pclk_bclk_ratio) {
217		- case 2:
218		- bclk_value = MAX9867_IFC1B_PCLK_2;
219		- break;
220		- case 4:
221		- bclk_value = MAX9867_IFC1B_PCLK_4;
222		- break;
223		- case 8:
224		- bclk_value = MAX9867_IFC1B_PCLK_8;
225		- break;
226		- case 16:
227		- bclk_value = MAX9867_IFC1B_PCLK_16;
228		- break;
229		- default:
230		- dev_err(component->dev,
231		- "unsupported sampling rate\n");
232		- return -EINVAL;
233		- }
234		- break;
235		- case 24:
236		- bclk_value = MAX9867_IFC1B_24BIT;
237		- break;
238		- case 32:
239		- bclk_value = MAX9867_IFC1B_32BIT;
240		- break;
241		- default:
242		- dev_err(component->dev, "unsupported sampling rate\n");
243		- return -EINVAL;
244		- }
245		- regmap_update_bits(max9867->regmap, MAX9867_IFC1B,
246		- MAX9867_IFC1B_BCLK_MASK, bclk_value);
247	385	}
248	386	return 0;
249	387	}
250	388
251		-static int max9867_mute(struct snd_soc_dai *dai, int mute)
	389	+static int max9867_mute(struct snd_soc_dai *dai, int mute, int direction)
252	390	{
253	391	struct snd_soc_component *component = dai->component;
254	392	struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
255	393
256		- if (mute)
257		- regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL,
258		- MAX9867_DAC_MUTE_MASK, MAX9867_DAC_MUTE_MASK);
259		- else
260		- regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL,
261		- MAX9867_DAC_MUTE_MASK, 0);
262		- return 0;
	394	+ return regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL,
	395	+ 1 << 6, !!mute << 6);
263	396	}
264	397
265	398	static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai,
..	..	@@ -272,21 +405,29 @@
272	405	/* Set the prescaler based on the master clock frequency*/
273	406	if (freq >= 10000000 && freq <= 20000000) {
274	407	value \|= MAX9867_PSCLK_10_20;
275		- max9867->pclk = freq;
	408	+ max9867->pclk = freq;
276	409	} else if (freq >= 20000000 && freq <= 40000000) {
277	410	value \|= MAX9867_PSCLK_20_40;
278		- max9867->pclk = freq/2;
	411	+ max9867->pclk = freq / 2;
279	412	} else if (freq >= 40000000 && freq <= 60000000) {
280	413	value \|= MAX9867_PSCLK_40_60;
281		- max9867->pclk = freq/4;
	414	+ max9867->pclk = freq / 4;
282	415	} else {
283	416	dev_err(component->dev,
284	417	"Invalid clock frequency %uHz (required 10-60MHz)\n",
285	418	freq);
286	419	return -EINVAL;
287	420	}
288		- value = value << MAX9867_PSCLK_SHIFT;
	421	+ if (freq % 48000 == 0)
	422	+ max9867->constraints = &max9867_constraints_48k;
	423	+ else if (freq % 44100 == 0)
	424	+ max9867->constraints = &max9867_constraints_44k1;
	425	+ else
	426	+ dev_warn(component->dev,
	427	+ "Unable to set exact rate with %uHz clock frequency\n",
	428	+ freq);
289	429	max9867->sysclk = freq;
	430	+ value = value << MAX9867_PSCLK_SHIFT;
290	431	/* exact integer mode is not supported */
291	432	value &= ~MAX9867_FREQ_MASK;
292	433	regmap_update_bits(max9867->regmap, MAX9867_SYSCLK,
..	..	@@ -299,16 +440,17 @@
299	440	{
300	441	struct snd_soc_component *component = codec_dai->component;
301	442	struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
302		- u8 iface1A = 0, iface1B = 0;
	443	+ u8 iface1A, iface1B;
303	444
304	445	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
305	446	case SND_SOC_DAIFMT_CBM_CFM:
306		- max9867->master = 1;
307		- iface1A \|= MAX9867_MASTER;
	447	+ max9867->master = true;
	448	+ iface1A = MAX9867_MASTER;
	449	+ iface1B = MAX9867_IFC1B_48X;
308	450	break;
309	451	case SND_SOC_DAIFMT_CBS_CFS:
310		- max9867->master = 0;
311		- iface1A &= ~MAX9867_MASTER;
	452	+ max9867->master = false;
	453	+ iface1A = iface1B = 0;
312	454	break;
313	455	default:
314	456	return -EINVAL;
..	..	@@ -316,9 +458,11 @@
316	458
317	459	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
318	460	case SND_SOC_DAIFMT_I2S:
	461	+ max9867->dsp_a = false;
319	462	iface1A \|= MAX9867_I2S_DLY;
320	463	break;
321	464	case SND_SOC_DAIFMT_DSP_A:
	465	+ max9867->dsp_a = true;
322	466	iface1A \|= MAX9867_TDM_MODE \| MAX9867_SDOUT_HIZ;
323	467	break;
324	468	default:
..	..	@@ -343,20 +487,20 @@
343	487	}
344	488
345	489	regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
346		- regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
	490	+ regmap_update_bits(max9867->regmap, MAX9867_IFC1B,
	491	+ MAX9867_IFC1B_BCLK_MASK, iface1B);
	492	+
347	493	return 0;
348	494	}
349	495
350	496	static const struct snd_soc_dai_ops max9867_dai_ops = {
351		- .set_fmt = max9867_dai_set_fmt,
352	497	.set_sysclk = max9867_set_dai_sysclk,
353		- .digital_mute = max9867_mute,
354		- .hw_params = max9867_dai_hw_params,
	498	+ .set_fmt = max9867_dai_set_fmt,
	499	+ .mute_stream = max9867_mute,
	500	+ .startup = max9867_startup,
	501	+ .hw_params = max9867_dai_hw_params,
	502	+ .no_capture_mute = 1,
355	503	};
356		-
357		-#define MAX9867_RATES (SNDRV_PCM_RATE_8000 \| SNDRV_PCM_RATE_16000 \|\
358		- SNDRV_PCM_RATE_32000 \| SNDRV_PCM_RATE_44100 \| SNDRV_PCM_RATE_48000)
359		-#define MAX9867_FORMATS (SNDRV_PCM_FMTBIT_S16_LE)
360	504
361	505	static struct snd_soc_dai_driver max9867_dai[] = {
362	506	{
..	..	@@ -365,15 +509,15 @@
365	509	.stream_name = "HiFi Playback",
366	510	.channels_min = 2,
367	511	.channels_max = 2,
368		- .rates = MAX9867_RATES,
369		- .formats = MAX9867_FORMATS,
	512	+ .rates = SNDRV_PCM_RATE_8000_48000,
	513	+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
370	514	},
371	515	.capture = {
372	516	.stream_name = "HiFi Capture",
373	517	.channels_min = 2,
374	518	.channels_max = 2,
375		- .rates = MAX9867_RATES,
376		- .formats = MAX9867_FORMATS,
	519	+ .rates = SNDRV_PCM_RATE_8000_48000,
	520	+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
377	521	},
378	522	.ops = &max9867_dai_ops,
379	523	.symmetric_rates = 1,
..	..	@@ -412,15 +556,14 @@
412	556	if (err)
413	557	return err;
414	558
415		- err = regmap_update_bits(max9867->regmap, MAX9867_PWRMAN,
416		- MAX9867_SHTDOWN, MAX9867_SHTDOWN);
	559	+ err = regmap_write(max9867->regmap,
	560	+ MAX9867_PWRMAN, 0xff);
417	561	if (err)
418	562	return err;
419	563	}
420	564	break;
421	565	case SND_SOC_BIAS_OFF:
422		- err = regmap_update_bits(max9867->regmap, MAX9867_PWRMAN,
423		- MAX9867_SHTDOWN, 0);
	566	+ err = regmap_write(max9867->regmap, MAX9867_PWRMAN, 0);
424	567	if (err)
425	568	return err;
426	569
..	..	@@ -462,35 +605,10 @@
462	605	}
463	606	}
464	607
465		-static const struct reg_default max9867_reg[] = {
466		- { 0x04, 0x00 },
467		- { 0x05, 0x00 },
468		- { 0x06, 0x00 },
469		- { 0x07, 0x00 },
470		- { 0x08, 0x00 },
471		- { 0x09, 0x00 },
472		- { 0x0A, 0x00 },
473		- { 0x0B, 0x00 },
474		- { 0x0C, 0x00 },
475		- { 0x0D, 0x00 },
476		- { 0x0E, 0x00 },
477		- { 0x0F, 0x00 },
478		- { 0x10, 0x00 },
479		- { 0x11, 0x00 },
480		- { 0x12, 0x00 },
481		- { 0x13, 0x00 },
482		- { 0x14, 0x00 },
483		- { 0x15, 0x00 },
484		- { 0x16, 0x00 },
485		- { 0x17, 0x00 },
486		-};
487		-
488	608	static const struct regmap_config max9867_regmap = {
489	609	.reg_bits = 8,
490	610	.val_bits = 8,
491	611	.max_register = MAX9867_REVISION,
492		- .reg_defaults = max9867_reg,
493		- .num_reg_defaults = ARRAY_SIZE(max9867_reg),
494	612	.volatile_reg = max9867_volatile_register,
495	613	.cache_type = REGCACHE_RBTREE,
496	614	};
..	..	@@ -499,10 +617,9 @@
499	617	const struct i2c_device_id *id)
500	618	{
501	619	struct max9867_priv *max9867;
502		- int ret = 0, reg;
	620	+ int ret, reg;
503	621
504		- max9867 = devm_kzalloc(&i2c->dev,
505		- sizeof(*max9867), GFP_KERNEL);
	622	+ max9867 = devm_kzalloc(&i2c->dev, sizeof(*max9867), GFP_KERNEL);
506	623	if (!max9867)
507	624	return -ENOMEM;
508	625
..	..	@@ -513,8 +630,7 @@
513	630	dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
514	631	return ret;
515	632	}
516		- ret = regmap_read(max9867->regmap,
517		- MAX9867_REVISION, &reg);
	633	+ ret = regmap_read(max9867->regmap, MAX9867_REVISION, &reg);
518	634	if (ret < 0) {
519	635	dev_err(&i2c->dev, "Failed to read: %d\n", ret);
520	636	return ret;
..	..	@@ -522,10 +638,8 @@
522	638	dev_info(&i2c->dev, "device revision: %x\n", reg);
523	639	ret = devm_snd_soc_register_component(&i2c->dev, &max9867_component,
524	640	max9867_dai, ARRAY_SIZE(max9867_dai));
525		- if (ret < 0) {
	641	+ if (ret < 0)
526	642	dev_err(&i2c->dev, "Failed to register component: %d\n", ret);
527		- return ret;
528		- }
529	643	return ret;
530	644	}
531	645
..	..	@@ -552,6 +666,6 @@
552	666
553	667	module_i2c_driver(max9867_i2c_driver);
554	668
555		-MODULE_AUTHOR("anish kumar <yesanishhere@gmail.com>");
556		-MODULE_DESCRIPTION("ALSA SoC MAX9867 driver");
	669	+MODULE_AUTHOR("Ladislav Michl <ladis@linux-mips.org>");
	670	+MODULE_DESCRIPTION("ASoC MAX9867 driver");
557	671	MODULE_LICENSE("GPL");