Skip to content

L
linux
Commit da2495fb authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/sgtl5000',... 

Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/sgtl5000', 'asoc/topic/si476x' and 'asoc/topic/sirf' into asoc-next
parents 8ee67bb8 5ba04c66 c4e50b1d 8fcfe24c f49f49aa
Show whitespace changes
Inline Side-by-side
Showing with 362 additions and 290 deletions
Documentation/devicetree/bindings/sound/sgtl5000.txt
View file @ da2495fb
...@@ -5,6 +5,8 @@ Required properties: ...@@ -5,6 +5,8 @@ Required properties:
- reg : the I2C address of the device - reg : the I2C address of the device
- #sound-dai-cells: must be equal to 0
- clocks : the clock provider of SYS_MCLK - clocks : the clock provider of SYS_MCLK
- VDDA-supply : the regulator provider of VDDA - VDDA-supply : the regulator provider of VDDA
...@@ -40,6 +42,7 @@ Example: ...@@ -40,6 +42,7 @@ Example:
codec: sgtl5000@a { codec: sgtl5000@a {
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
reg = <0x0a>; reg = <0x0a>;
#sound-dai-cells = <0>;
clocks = <&clks 150>; clocks = <&clks 150>;
micbias-resistor-k-ohms = <2>; micbias-resistor-k-ohms = <2>;
micbias-voltage-m-volts = <2250>; micbias-voltage-m-volts = <2250>;
......
sound/soc/codecs/rt5670.c
View file @ da2495fb
...@@ -423,7 +423,7 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg) ...@@ -423,7 +423,7 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg)
/** /**
* rt5670_headset_detect - Detect headset. * rt5670_headset_detect - Detect headset.
* @codec: SoC audio codec device. * @component: SoC audio component device.
* @jack_insert: Jack insert or not. * @jack_insert: Jack insert or not.
* *
* Detect whether is headset or not when jack inserted. * Detect whether is headset or not when jack inserted.
...@@ -431,46 +431,46 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg) ...@@ -431,46 +431,46 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg)
* Returns detect status. * Returns detect status.
*/ */
static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert) static int rt5670_headset_detect(struct snd_soc_component *component, int jack_insert)
{ {
int val; int val;
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
if (jack_insert) { if (jack_insert) {
snd_soc_dapm_force_enable_pin(dapm, "Mic Det Power"); snd_soc_dapm_force_enable_pin(dapm, "Mic Det Power");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x0); snd_soc_component_update_bits(component, RT5670_GEN_CTRL3, 0x4, 0x0);
snd_soc_update_bits(codec, RT5670_CJ_CTRL2, snd_soc_component_update_bits(component, RT5670_CJ_CTRL2,
RT5670_CBJ_DET_MODE | RT5670_CBJ_MN_JD, RT5670_CBJ_DET_MODE | RT5670_CBJ_MN_JD,
RT5670_CBJ_MN_JD); RT5670_CBJ_MN_JD);
snd_soc_write(codec, RT5670_GPIO_CTRL2, 0x0004); snd_soc_component_write(component, RT5670_GPIO_CTRL2, 0x0004);
snd_soc_update_bits(codec, RT5670_GPIO_CTRL1, snd_soc_component_update_bits(component, RT5670_GPIO_CTRL1,
RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_IRQ); RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_IRQ);
snd_soc_update_bits(codec, RT5670_CJ_CTRL1, snd_soc_component_update_bits(component, RT5670_CJ_CTRL1,
RT5670_CBJ_BST1_EN, RT5670_CBJ_BST1_EN); RT5670_CBJ_BST1_EN, RT5670_CBJ_BST1_EN);
snd_soc_write(codec, RT5670_JD_CTRL3, 0x00f0); snd_soc_component_write(component, RT5670_JD_CTRL3, 0x00f0);
snd_soc_update_bits(codec, RT5670_CJ_CTRL2, snd_soc_component_update_bits(component, RT5670_CJ_CTRL2,
RT5670_CBJ_MN_JD, RT5670_CBJ_MN_JD); RT5670_CBJ_MN_JD, RT5670_CBJ_MN_JD);
snd_soc_update_bits(codec, RT5670_CJ_CTRL2, snd_soc_component_update_bits(component, RT5670_CJ_CTRL2,
RT5670_CBJ_MN_JD, 0); RT5670_CBJ_MN_JD, 0);
msleep(300); msleep(300);
val = snd_soc_read(codec, RT5670_CJ_CTRL3) & 0x7; val = snd_soc_component_read32(component, RT5670_CJ_CTRL3) & 0x7;
if (val == 0x1 || val == 0x2) { if (val == 0x1 || val == 0x2) {
rt5670->jack_type = SND_JACK_HEADSET; rt5670->jack_type = SND_JACK_HEADSET;
/* for push button */ /* for push button */
snd_soc_update_bits(codec, RT5670_INT_IRQ_ST, 0x8, 0x8); snd_soc_component_update_bits(component, RT5670_INT_IRQ_ST, 0x8, 0x8);
snd_soc_update_bits(codec, RT5670_IL_CMD, 0x40, 0x40); snd_soc_component_update_bits(component, RT5670_IL_CMD, 0x40, 0x40);
snd_soc_read(codec, RT5670_IL_CMD); snd_soc_component_read32(component, RT5670_IL_CMD);
} else { } else {
snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4); snd_soc_component_update_bits(component, RT5670_GEN_CTRL3, 0x4, 0x4);
rt5670->jack_type = SND_JACK_HEADPHONE; rt5670->jack_type = SND_JACK_HEADPHONE;
snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_disable_pin(dapm, "Mic Det Power");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
} }
} else { } else {
snd_soc_update_bits(codec, RT5670_INT_IRQ_ST, 0x8, 0x0); snd_soc_component_update_bits(component, RT5670_INT_IRQ_ST, 0x8, 0x0);
snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4); snd_soc_component_update_bits(component, RT5670_GEN_CTRL3, 0x4, 0x4);
rt5670->jack_type = 0; rt5670->jack_type = 0;
snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_disable_pin(dapm, "Mic Det Power");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
...@@ -479,35 +479,35 @@ static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert) ...@@ -479,35 +479,35 @@ static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert)
return rt5670->jack_type; return rt5670->jack_type;
} }
void rt5670_jack_suspend(struct snd_soc_codec *codec) void rt5670_jack_suspend(struct snd_soc_component *component)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
rt5670->jack_type_saved = rt5670->jack_type; rt5670->jack_type_saved = rt5670->jack_type;
rt5670_headset_detect(codec, 0); rt5670_headset_detect(component, 0);
} }
EXPORT_SYMBOL_GPL(rt5670_jack_suspend); EXPORT_SYMBOL_GPL(rt5670_jack_suspend);
void rt5670_jack_resume(struct snd_soc_codec *codec) void rt5670_jack_resume(struct snd_soc_component *component)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
if (rt5670->jack_type_saved) if (rt5670->jack_type_saved)
rt5670_headset_detect(codec, 1); rt5670_headset_detect(component, 1);
} }
EXPORT_SYMBOL_GPL(rt5670_jack_resume); EXPORT_SYMBOL_GPL(rt5670_jack_resume);
static int rt5670_button_detect(struct snd_soc_codec *codec) static int rt5670_button_detect(struct snd_soc_component *component)
{ {
int btn_type, val; int btn_type, val;
val = snd_soc_read(codec, RT5670_IL_CMD); val = snd_soc_component_read32(component, RT5670_IL_CMD);
btn_type = val & 0xff80; btn_type = val & 0xff80;
snd_soc_write(codec, RT5670_IL_CMD, val); snd_soc_component_write(component, RT5670_IL_CMD, val);
if (btn_type != 0) { if (btn_type != 0) {
msleep(20); msleep(20);
val = snd_soc_read(codec, RT5670_IL_CMD); val = snd_soc_component_read32(component, RT5670_IL_CMD);
snd_soc_write(codec, RT5670_IL_CMD, val); snd_soc_component_write(component, RT5670_IL_CMD, val);
} }
return btn_type; return btn_type;
...@@ -521,25 +521,25 @@ static int rt5670_irq_detection(void *data) ...@@ -521,25 +521,25 @@ static int rt5670_irq_detection(void *data)
int val, btn_type, report = jack->status; int val, btn_type, report = jack->status;
if (rt5670->pdata.jd_mode == 1) /* 2 port */ if (rt5670->pdata.jd_mode == 1) /* 2 port */
val = snd_soc_read(rt5670->codec, RT5670_A_JD_CTRL1) & 0x0070; val = snd_soc_component_read32(rt5670->component, RT5670_A_JD_CTRL1) & 0x0070;
else else
val = snd_soc_read(rt5670->codec, RT5670_A_JD_CTRL1) & 0x0020; val = snd_soc_component_read32(rt5670->component, RT5670_A_JD_CTRL1) & 0x0020;
switch (val) { switch (val) {
/* jack in */ /* jack in */
case 0x30: /* 2 port */ case 0x30: /* 2 port */
case 0x0: /* 1 port or 2 port */ case 0x0: /* 1 port or 2 port */
if (rt5670->jack_type == 0) { if (rt5670->jack_type == 0) {
report = rt5670_headset_detect(rt5670->codec, 1); report = rt5670_headset_detect(rt5670->component, 1);
/* for push button and jack out */ /* for push button and jack out */
gpio->debounce_time = 25; gpio->debounce_time = 25;
break; break;
} }
btn_type = 0; btn_type = 0;
if (snd_soc_read(rt5670->codec, RT5670_INT_IRQ_ST) & 0x4) { if (snd_soc_component_read32(rt5670->component, RT5670_INT_IRQ_ST) & 0x4) {
/* button pressed */ /* button pressed */
report = SND_JACK_HEADSET; report = SND_JACK_HEADSET;
btn_type = rt5670_button_detect(rt5670->codec); btn_type = rt5670_button_detect(rt5670->component);
switch (btn_type) { switch (btn_type) {
case 0x2000: /* up */ case 0x2000: /* up */
report |= SND_JACK_BTN_1; report |= SND_JACK_BTN_1;
...@@ -551,7 +551,7 @@ static int rt5670_irq_detection(void *data) ...@@ -551,7 +551,7 @@ static int rt5670_irq_detection(void *data)
report |= SND_JACK_BTN_2; report |= SND_JACK_BTN_2;
break; break;
default: default:
dev_err(rt5670->codec->dev, dev_err(rt5670->component->dev,
"Unexpected button code 0x%04x\n", "Unexpected button code 0x%04x\n",
btn_type); btn_type);
break; break;
...@@ -566,8 +566,8 @@ static int rt5670_irq_detection(void *data) ...@@ -566,8 +566,8 @@ static int rt5670_irq_detection(void *data)
case 0x10: /* 2 port */ case 0x10: /* 2 port */
case 0x20: /* 1 port */ case 0x20: /* 1 port */
report = 0; report = 0;
snd_soc_update_bits(rt5670->codec, RT5670_INT_IRQ_ST, 0x1, 0x0); snd_soc_component_update_bits(rt5670->component, RT5670_INT_IRQ_ST, 0x1, 0x0);
rt5670_headset_detect(rt5670->codec, 0); rt5670_headset_detect(rt5670->component, 0);
gpio->debounce_time = 150; /* for jack in */ gpio->debounce_time = 150; /* for jack in */
break; break;
default: default:
...@@ -577,14 +577,14 @@ static int rt5670_irq_detection(void *data) ...@@ -577,14 +577,14 @@ static int rt5670_irq_detection(void *data)
return report; return report;
} }
int rt5670_set_jack_detect(struct snd_soc_codec *codec, int rt5670_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *jack) struct snd_soc_jack *jack)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
int ret; int ret;
rt5670->jack = jack; rt5670->jack = jack;
rt5670->hp_gpio.gpiod_dev = codec->dev; rt5670->hp_gpio.gpiod_dev = component->dev;
rt5670->hp_gpio.name = "headset"; rt5670->hp_gpio.name = "headset";
rt5670->hp_gpio.report = SND_JACK_HEADSET | rt5670->hp_gpio.report = SND_JACK_HEADSET |
SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2; SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2;
...@@ -596,7 +596,7 @@ int rt5670_set_jack_detect(struct snd_soc_codec *codec, ...@@ -596,7 +596,7 @@ int rt5670_set_jack_detect(struct snd_soc_codec *codec,
ret = snd_soc_jack_add_gpios(rt5670->jack, 1, ret = snd_soc_jack_add_gpios(rt5670->jack, 1,
&rt5670->hp_gpio); &rt5670->hp_gpio);
if (ret) { if (ret) {
dev_err(codec->dev, "Adding jack GPIO failed\n"); dev_err(component->dev, "Adding jack GPIO failed\n");
return ret; return ret;
} }
...@@ -699,17 +699,17 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = { ...@@ -699,17 +699,17 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = {
static int set_dmic_clk(struct snd_soc_dapm_widget *w, static int set_dmic_clk(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
int idx, rate; int idx, rate;
rate = rt5670->sysclk / rl6231_get_pre_div(rt5670->regmap, rate = rt5670->sysclk / rl6231_get_pre_div(rt5670->regmap,
RT5670_ADDA_CLK1, RT5670_I2S_PD1_SFT); RT5670_ADDA_CLK1, RT5670_I2S_PD1_SFT);
idx = rl6231_calc_dmic_clk(rate); idx = rl6231_calc_dmic_clk(rate);
if (idx < 0) if (idx < 0)
dev_err(codec->dev, "Failed to set DMIC clock\n"); dev_err(component->dev, "Failed to set DMIC clock\n");
else else
snd_soc_update_bits(codec, RT5670_DMIC_CTRL1, snd_soc_component_update_bits(component, RT5670_DMIC_CTRL1,
RT5670_DMIC_CLK_MASK, idx << RT5670_DMIC_CLK_SFT); RT5670_DMIC_CLK_MASK, idx << RT5670_DMIC_CLK_SFT);
return idx; return idx;
} }
...@@ -717,8 +717,8 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, ...@@ -717,8 +717,8 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
if (rt5670->sysclk_src == RT5670_SCLK_S_PLL1) if (rt5670->sysclk_src == RT5670_SCLK_S_PLL1)
return 1; return 1;
...@@ -729,7 +729,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, ...@@ -729,7 +729,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
static int is_using_asrc(struct snd_soc_dapm_widget *source, static int is_using_asrc(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);
unsigned int reg, shift, val; unsigned int reg, shift, val;
switch (source->shift) { switch (source->shift) {
...@@ -765,7 +765,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, ...@@ -765,7 +765,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source,
return 0; return 0;
} }
val = (snd_soc_read(codec, reg) >> shift) & 0xf; val = (snd_soc_component_read32(component, reg) >> shift) & 0xf;
switch (val) { switch (val) {
case 1: case 1:
case 2: case 2:
...@@ -781,8 +781,8 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, ...@@ -781,8 +781,8 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source,
static int can_use_asrc(struct snd_soc_dapm_widget *source, static int can_use_asrc(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
if (rt5670->sysclk > rt5670->lrck[RT5670_AIF1] * 384) if (rt5670->sysclk > rt5670->lrck[RT5670_AIF1] * 384)
return 1; return 1;
...@@ -793,7 +793,7 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source, ...@@ -793,7 +793,7 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source,
/** /**
* rt5670_sel_asrc_clk_src - select ASRC clock source for a set of filters * rt5670_sel_asrc_clk_src - select ASRC clock source for a set of filters
* @codec: SoC audio codec device. * @component: SoC audio component device.
* @filter_mask: mask of filters. * @filter_mask: mask of filters.
* @clk_src: clock source * @clk_src: clock source
* *
...@@ -805,7 +805,7 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source, ...@@ -805,7 +805,7 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source,
* set of filters specified by the mask. And the codec driver will turn on ASRC * set of filters specified by the mask. And the codec driver will turn on ASRC
* for these filters if ASRC is selected as their clock source. * for these filters if ASRC is selected as their clock source.
*/ */
int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec, int rt5670_sel_asrc_clk_src(struct snd_soc_component *component,
unsigned int filter_mask, unsigned int clk_src) unsigned int filter_mask, unsigned int clk_src)
{ {
unsigned int asrc2_mask = 0, asrc2_value = 0; unsigned int asrc2_mask = 0, asrc2_value = 0;
...@@ -863,11 +863,11 @@ int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec, ...@@ -863,11 +863,11 @@ int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec,
} }
if (asrc2_mask) if (asrc2_mask)
snd_soc_update_bits(codec, RT5670_ASRC_2, snd_soc_component_update_bits(component, RT5670_ASRC_2,
asrc2_mask, asrc2_value); asrc2_mask, asrc2_value);
if (asrc3_mask) if (asrc3_mask)
snd_soc_update_bits(codec, RT5670_ASRC_3, snd_soc_component_update_bits(component, RT5670_ASRC_3,
asrc3_mask, asrc3_value); asrc3_mask, asrc3_value);
return 0; return 0;
} }
...@@ -1421,8 +1421,8 @@ static const struct snd_kcontrol_new rt5670_vad_adc_mux = ...@@ -1421,8 +1421,8 @@ static const struct snd_kcontrol_new rt5670_vad_adc_mux =
static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w, static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
...@@ -1457,8 +1457,8 @@ static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w, ...@@ -1457,8 +1457,8 @@ static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w,
static int rt5670_hp_event(struct snd_soc_dapm_widget *w, static int rt5670_hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
...@@ -1507,16 +1507,16 @@ static int rt5670_hp_event(struct snd_soc_dapm_widget *w, ...@@ -1507,16 +1507,16 @@ static int rt5670_hp_event(struct snd_soc_dapm_widget *w,
static int rt5670_bst1_event(struct snd_soc_dapm_widget *w, static int rt5670_bst1_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_update_bits(codec, RT5670_PWR_ANLG2, snd_soc_component_update_bits(component, RT5670_PWR_ANLG2,
RT5670_PWR_BST1_P, RT5670_PWR_BST1_P); RT5670_PWR_BST1_P, RT5670_PWR_BST1_P);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5670_PWR_ANLG2, snd_soc_component_update_bits(component, RT5670_PWR_ANLG2,
RT5670_PWR_BST1_P, 0); RT5670_PWR_BST1_P, 0);
break; break;
...@@ -1530,16 +1530,16 @@ static int rt5670_bst1_event(struct snd_soc_dapm_widget *w, ...@@ -1530,16 +1530,16 @@ static int rt5670_bst1_event(struct snd_soc_dapm_widget *w,
static int rt5670_bst2_event(struct snd_soc_dapm_widget *w, static int rt5670_bst2_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_update_bits(codec, RT5670_PWR_ANLG2, snd_soc_component_update_bits(component, RT5670_PWR_ANLG2,
RT5670_PWR_BST2_P, RT5670_PWR_BST2_P); RT5670_PWR_BST2_P, RT5670_PWR_BST2_P);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5670_PWR_ANLG2, snd_soc_component_update_bits(component, RT5670_PWR_ANLG2,
RT5670_PWR_BST2_P, 0); RT5670_PWR_BST2_P, 0);
break; break;
...@@ -2322,21 +2322,21 @@ static const struct snd_soc_dapm_route rt5672_specific_dapm_routes[] = { ...@@ -2322,21 +2322,21 @@ static const struct snd_soc_dapm_route rt5672_specific_dapm_routes[] = {
static int rt5670_hw_params(struct snd_pcm_substream *substream, static int rt5670_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
unsigned int val_len = 0, val_clk, mask_clk; unsigned int val_len = 0, val_clk, mask_clk;
int pre_div, bclk_ms, frame_size; int pre_div, bclk_ms, frame_size;
rt5670->lrck[dai->id] = params_rate(params); rt5670->lrck[dai->id] = params_rate(params);
pre_div = rl6231_get_clk_info(rt5670->sysclk, rt5670->lrck[dai->id]); pre_div = rl6231_get_clk_info(rt5670->sysclk, rt5670->lrck[dai->id]);
if (pre_div < 0) { if (pre_div < 0) {
dev_err(codec->dev, "Unsupported clock setting %d for DAI %d\n", dev_err(component->dev, "Unsupported clock setting %d for DAI %d\n",
rt5670->lrck[dai->id], dai->id); rt5670->lrck[dai->id], dai->id);
return -EINVAL; return -EINVAL;
} }
frame_size = snd_soc_params_to_frame_size(params); frame_size = snd_soc_params_to_frame_size(params);
if (frame_size < 0) { if (frame_size < 0) {
dev_err(codec->dev, "Unsupported frame size: %d\n", frame_size); dev_err(component->dev, "Unsupported frame size: %d\n", frame_size);
return -EINVAL; return -EINVAL;
} }
bclk_ms = frame_size > 32; bclk_ms = frame_size > 32;
...@@ -2368,20 +2368,20 @@ static int rt5670_hw_params(struct snd_pcm_substream *substream, ...@@ -2368,20 +2368,20 @@ static int rt5670_hw_params(struct snd_pcm_substream *substream,
mask_clk = RT5670_I2S_BCLK_MS1_MASK | RT5670_I2S_PD1_MASK; mask_clk = RT5670_I2S_BCLK_MS1_MASK | RT5670_I2S_PD1_MASK;
val_clk = bclk_ms << RT5670_I2S_BCLK_MS1_SFT | val_clk = bclk_ms << RT5670_I2S_BCLK_MS1_SFT |
pre_div << RT5670_I2S_PD1_SFT; pre_div << RT5670_I2S_PD1_SFT;
snd_soc_update_bits(codec, RT5670_I2S1_SDP, snd_soc_component_update_bits(component, RT5670_I2S1_SDP,
RT5670_I2S_DL_MASK, val_len); RT5670_I2S_DL_MASK, val_len);
snd_soc_update_bits(codec, RT5670_ADDA_CLK1, mask_clk, val_clk); snd_soc_component_update_bits(component, RT5670_ADDA_CLK1, mask_clk, val_clk);
break; break;
case RT5670_AIF2: case RT5670_AIF2:
mask_clk = RT5670_I2S_BCLK_MS2_MASK | RT5670_I2S_PD2_MASK; mask_clk = RT5670_I2S_BCLK_MS2_MASK | RT5670_I2S_PD2_MASK;
val_clk = bclk_ms << RT5670_I2S_BCLK_MS2_SFT | val_clk = bclk_ms << RT5670_I2S_BCLK_MS2_SFT |
pre_div << RT5670_I2S_PD2_SFT; pre_div << RT5670_I2S_PD2_SFT;
snd_soc_update_bits(codec, RT5670_I2S2_SDP, snd_soc_component_update_bits(component, RT5670_I2S2_SDP,
RT5670_I2S_DL_MASK, val_len); RT5670_I2S_DL_MASK, val_len);
snd_soc_update_bits(codec, RT5670_ADDA_CLK1, mask_clk, val_clk); snd_soc_component_update_bits(component, RT5670_ADDA_CLK1, mask_clk, val_clk);
break; break;
default: default:
dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id); dev_err(component->dev, "Invalid dai->id: %d\n", dai->id);
return -EINVAL; return -EINVAL;
} }
...@@ -2390,8 +2390,8 @@ static int rt5670_hw_params(struct snd_pcm_substream *substream, ...@@ -2390,8 +2390,8 @@ static int rt5670_hw_params(struct snd_pcm_substream *substream,
static int rt5670_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int rt5670_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0; unsigned int reg_val = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
...@@ -2434,26 +2434,26 @@ static int rt5670_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -2434,26 +2434,26 @@ static int rt5670_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (dai->id) { switch (dai->id) {
case RT5670_AIF1: case RT5670_AIF1:
snd_soc_update_bits(codec, RT5670_I2S1_SDP, snd_soc_component_update_bits(component, RT5670_I2S1_SDP,
RT5670_I2S_MS_MASK | RT5670_I2S_BP_MASK | RT5670_I2S_MS_MASK | RT5670_I2S_BP_MASK |
RT5670_I2S_DF_MASK, reg_val); RT5670_I2S_DF_MASK, reg_val);
break; break;
case RT5670_AIF2: case RT5670_AIF2:
snd_soc_update_bits(codec, RT5670_I2S2_SDP, snd_soc_component_update_bits(component, RT5670_I2S2_SDP,
RT5670_I2S_MS_MASK | RT5670_I2S_BP_MASK | RT5670_I2S_MS_MASK | RT5670_I2S_BP_MASK |
RT5670_I2S_DF_MASK, reg_val); RT5670_I2S_DF_MASK, reg_val);
break; break;
default: default:
dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id); dev_err(component->dev, "Invalid dai->id: %d\n", dai->id);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
static int rt5670_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id, static int rt5670_set_codec_sysclk(struct snd_soc_component *component, int clk_id,
int source, unsigned int freq, int dir) int source, unsigned int freq, int dir)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0; unsigned int reg_val = 0;
switch (clk_id) { switch (clk_id) {
...@@ -2467,16 +2467,16 @@ static int rt5670_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id, ...@@ -2467,16 +2467,16 @@ static int rt5670_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id,
reg_val |= RT5670_SCLK_SRC_RCCLK; reg_val |= RT5670_SCLK_SRC_RCCLK;
break; break;
default: default:
dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id); dev_err(component->dev, "Invalid clock id (%d)\n", clk_id);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, RT5670_GLB_CLK, snd_soc_component_update_bits(component, RT5670_GLB_CLK,
RT5670_SCLK_SRC_MASK, reg_val); RT5670_SCLK_SRC_MASK, reg_val);
rt5670->sysclk = freq; rt5670->sysclk = freq;
if (clk_id != RT5670_SCLK_S_RCCLK) if (clk_id != RT5670_SCLK_S_RCCLK)
rt5670->sysclk_src = clk_id; rt5670->sysclk_src = clk_id;
dev_dbg(codec->dev, "Sysclk : %dHz clock id : %d\n", freq, clk_id); dev_dbg(component->dev, "Sysclk : %dHz clock id : %d\n", freq, clk_id);
return 0; return 0;
} }
...@@ -2484,8 +2484,8 @@ static int rt5670_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id, ...@@ -2484,8 +2484,8 @@ static int rt5670_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id,
static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
unsigned int freq_in, unsigned int freq_out) unsigned int freq_in, unsigned int freq_out)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
struct rl6231_pll_code pll_code; struct rl6231_pll_code pll_code;
int ret; int ret;
...@@ -2494,18 +2494,18 @@ static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, ...@@ -2494,18 +2494,18 @@ static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
return 0; return 0;
if (!freq_in || !freq_out) { if (!freq_in || !freq_out) {
dev_dbg(codec->dev, "PLL disabled\n"); dev_dbg(component->dev, "PLL disabled\n");
rt5670->pll_in = 0; rt5670->pll_in = 0;
rt5670->pll_out = 0; rt5670->pll_out = 0;
snd_soc_update_bits(codec, RT5670_GLB_CLK, snd_soc_component_update_bits(component, RT5670_GLB_CLK,
RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_MCLK); RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_MCLK);
return 0; return 0;
} }
switch (source) { switch (source) {
case RT5670_PLL1_S_MCLK: case RT5670_PLL1_S_MCLK:
snd_soc_update_bits(codec, RT5670_GLB_CLK, snd_soc_component_update_bits(component, RT5670_GLB_CLK,
RT5670_PLL1_SRC_MASK, RT5670_PLL1_SRC_MCLK); RT5670_PLL1_SRC_MASK, RT5670_PLL1_SRC_MCLK);
break; break;
case RT5670_PLL1_S_BCLK1: case RT5670_PLL1_S_BCLK1:
...@@ -2514,36 +2514,36 @@ static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, ...@@ -2514,36 +2514,36 @@ static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
case RT5670_PLL1_S_BCLK4: case RT5670_PLL1_S_BCLK4:
switch (dai->id) { switch (dai->id) {
case RT5670_AIF1: case RT5670_AIF1:
snd_soc_update_bits(codec, RT5670_GLB_CLK, snd_soc_component_update_bits(component, RT5670_GLB_CLK,
RT5670_PLL1_SRC_MASK, RT5670_PLL1_SRC_BCLK1); RT5670_PLL1_SRC_MASK, RT5670_PLL1_SRC_BCLK1);
break; break;
case RT5670_AIF2: case RT5670_AIF2:
snd_soc_update_bits(codec, RT5670_GLB_CLK, snd_soc_component_update_bits(component, RT5670_GLB_CLK,
RT5670_PLL1_SRC_MASK, RT5670_PLL1_SRC_BCLK2); RT5670_PLL1_SRC_MASK, RT5670_PLL1_SRC_BCLK2);
break; break;
default: default:
dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id); dev_err(component->dev, "Invalid dai->id: %d\n", dai->id);
return -EINVAL; return -EINVAL;
} }
break; break;
default: default:
dev_err(codec->dev, "Unknown PLL source %d\n", source); dev_err(component->dev, "Unknown PLL source %d\n", source);
return -EINVAL; return -EINVAL;
} }
ret = rl6231_pll_calc(freq_in, freq_out, &pll_code); ret = rl6231_pll_calc(freq_in, freq_out, &pll_code);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Unsupport input clock %d\n", freq_in); dev_err(component->dev, "Unsupport input clock %d\n", freq_in);
return ret; return ret;
} }
dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=%d\n", dev_dbg(component->dev, "bypass=%d m=%d n=%d k=%d\n",
pll_code.m_bp, (pll_code.m_bp ? 0 : pll_code.m_code), pll_code.m_bp, (pll_code.m_bp ? 0 : pll_code.m_code),
pll_code.n_code, pll_code.k_code); pll_code.n_code, pll_code.k_code);
snd_soc_write(codec, RT5670_PLL_CTRL1, snd_soc_component_write(component, RT5670_PLL_CTRL1,
pll_code.n_code << RT5670_PLL_N_SFT | pll_code.k_code); pll_code.n_code << RT5670_PLL_N_SFT | pll_code.k_code);
snd_soc_write(codec, RT5670_PLL_CTRL2, snd_soc_component_write(component, RT5670_PLL_CTRL2,
(pll_code.m_bp ? 0 : pll_code.m_code) << RT5670_PLL_M_SFT | (pll_code.m_bp ? 0 : pll_code.m_code) << RT5670_PLL_M_SFT |
pll_code.m_bp << RT5670_PLL_M_BP_SFT); pll_code.m_bp << RT5670_PLL_M_BP_SFT);
...@@ -2557,7 +2557,7 @@ static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, ...@@ -2557,7 +2557,7 @@ static int rt5670_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
static int rt5670_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5670_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
unsigned int rx_mask, int slots, int slot_width) unsigned int rx_mask, int slots, int slot_width)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
unsigned int val = 0; unsigned int val = 0;
if (rx_mask || tx_mask) if (rx_mask || tx_mask)
...@@ -2595,75 +2595,75 @@ static int rt5670_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, ...@@ -2595,75 +2595,75 @@ static int rt5670_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, RT5670_TDM_CTRL_1, 0x7c00, val); snd_soc_component_update_bits(component, RT5670_TDM_CTRL_1, 0x7c00, val);
return 0; return 0;
} }
static int rt5670_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) static int rt5670_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
dev_dbg(codec->dev, "%s ratio=%d\n", __func__, ratio); dev_dbg(component->dev, "%s ratio=%d\n", __func__, ratio);
if (dai->id != RT5670_AIF1) if (dai->id != RT5670_AIF1)
return 0; return 0;
if ((ratio % 50) == 0) if ((ratio % 50) == 0)
snd_soc_update_bits(codec, RT5670_GEN_CTRL3, snd_soc_component_update_bits(component, RT5670_GEN_CTRL3,
RT5670_TDM_DATA_MODE_SEL, RT5670_TDM_DATA_MODE_50FS); RT5670_TDM_DATA_MODE_SEL, RT5670_TDM_DATA_MODE_50FS);
else else
snd_soc_update_bits(codec, RT5670_GEN_CTRL3, snd_soc_component_update_bits(component, RT5670_GEN_CTRL3,
RT5670_TDM_DATA_MODE_SEL, RT5670_TDM_DATA_MODE_NOR); RT5670_TDM_DATA_MODE_SEL, RT5670_TDM_DATA_MODE_NOR);
return 0; return 0;
} }
static int rt5670_set_bias_level(struct snd_soc_codec *codec, static int rt5670_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
switch (level) { switch (level) {
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) { if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) {
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_PWR_VREF1 | RT5670_PWR_MB | RT5670_PWR_VREF1 | RT5670_PWR_MB |
RT5670_PWR_BG | RT5670_PWR_VREF2, RT5670_PWR_BG | RT5670_PWR_VREF2,
RT5670_PWR_VREF1 | RT5670_PWR_MB | RT5670_PWR_VREF1 | RT5670_PWR_MB |
RT5670_PWR_BG | RT5670_PWR_VREF2); RT5670_PWR_BG | RT5670_PWR_VREF2);
mdelay(10); mdelay(10);
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_PWR_FV1 | RT5670_PWR_FV2, RT5670_PWR_FV1 | RT5670_PWR_FV2,
RT5670_PWR_FV1 | RT5670_PWR_FV2); RT5670_PWR_FV1 | RT5670_PWR_FV2);
snd_soc_update_bits(codec, RT5670_CHARGE_PUMP, snd_soc_component_update_bits(component, RT5670_CHARGE_PUMP,
RT5670_OSW_L_MASK | RT5670_OSW_R_MASK, RT5670_OSW_L_MASK | RT5670_OSW_R_MASK,
RT5670_OSW_L_DIS | RT5670_OSW_R_DIS); RT5670_OSW_L_DIS | RT5670_OSW_R_DIS);
snd_soc_update_bits(codec, RT5670_DIG_MISC, 0x1, 0x1); snd_soc_component_update_bits(component, RT5670_DIG_MISC, 0x1, 0x1);
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_LDO_SEL_MASK, 0x5); RT5670_LDO_SEL_MASK, 0x5);
} }
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_PWR_VREF1 | RT5670_PWR_VREF2 | RT5670_PWR_VREF1 | RT5670_PWR_VREF2 |
RT5670_PWR_FV1 | RT5670_PWR_FV2, 0); RT5670_PWR_FV1 | RT5670_PWR_FV2, 0);
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_LDO_SEL_MASK, 0x3); RT5670_LDO_SEL_MASK, 0x3);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
if (rt5670->pdata.jd_mode) if (rt5670->pdata.jd_mode)
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_PWR_VREF1 | RT5670_PWR_MB | RT5670_PWR_VREF1 | RT5670_PWR_MB |
RT5670_PWR_BG | RT5670_PWR_VREF2 | RT5670_PWR_BG | RT5670_PWR_VREF2 |
RT5670_PWR_FV1 | RT5670_PWR_FV2, RT5670_PWR_FV1 | RT5670_PWR_FV2,
RT5670_PWR_MB | RT5670_PWR_BG); RT5670_PWR_MB | RT5670_PWR_BG);
else else
snd_soc_update_bits(codec, RT5670_PWR_ANLG1, snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
RT5670_PWR_VREF1 | RT5670_PWR_MB | RT5670_PWR_VREF1 | RT5670_PWR_MB |
RT5670_PWR_BG | RT5670_PWR_VREF2 | RT5670_PWR_BG | RT5670_PWR_VREF2 |
RT5670_PWR_FV1 | RT5670_PWR_FV2, 0); RT5670_PWR_FV1 | RT5670_PWR_FV2, 0);
snd_soc_update_bits(codec, RT5670_DIG_MISC, 0x1, 0x0); snd_soc_component_update_bits(component, RT5670_DIG_MISC, 0x1, 0x0);
break; break;
default: default:
...@@ -2673,12 +2673,12 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec, ...@@ -2673,12 +2673,12 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec,
return 0; return 0;
} }
static int rt5670_probe(struct snd_soc_codec *codec) static int rt5670_probe(struct snd_soc_component *component)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
switch (snd_soc_read(codec, RT5670_RESET) & RT5670_ID_MASK) { switch (snd_soc_component_read32(component, RT5670_RESET) & RT5670_ID_MASK) {
case RT5670_ID_5670: case RT5670_ID_5670:
case RT5670_ID_5671: case RT5670_ID_5671:
snd_soc_dapm_new_controls(dapm, snd_soc_dapm_new_controls(dapm,
...@@ -2697,37 +2697,36 @@ static int rt5670_probe(struct snd_soc_codec *codec) ...@@ -2697,37 +2697,36 @@ static int rt5670_probe(struct snd_soc_codec *codec)
ARRAY_SIZE(rt5672_specific_dapm_routes)); ARRAY_SIZE(rt5672_specific_dapm_routes));
break; break;
default: default:
dev_err(codec->dev, dev_err(component->dev,
"The driver is for RT5670 RT5671 or RT5672 only\n"); "The driver is for RT5670 RT5671 or RT5672 only\n");
return -ENODEV; return -ENODEV;
} }
rt5670->codec = codec; rt5670->component = component;
return 0; return 0;
} }
static int rt5670_remove(struct snd_soc_codec *codec) static void rt5670_remove(struct snd_soc_component *component)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
regmap_write(rt5670->regmap, RT5670_RESET, 0); regmap_write(rt5670->regmap, RT5670_RESET, 0);
snd_soc_jack_free_gpios(rt5670->jack, 1, &rt5670->hp_gpio); snd_soc_jack_free_gpios(rt5670->jack, 1, &rt5670->hp_gpio);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int rt5670_suspend(struct snd_soc_codec *codec) static int rt5670_suspend(struct snd_soc_component *component)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5670->regmap, true); regcache_cache_only(rt5670->regmap, true);
regcache_mark_dirty(rt5670->regmap); regcache_mark_dirty(rt5670->regmap);
return 0; return 0;
} }
static int rt5670_resume(struct snd_soc_codec *codec) static int rt5670_resume(struct snd_soc_component *component)
{ {
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec); struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5670->regmap, false); regcache_cache_only(rt5670->regmap, false);
regcache_sync(rt5670->regmap); regcache_sync(rt5670->regmap);
...@@ -2794,22 +2793,22 @@ static struct snd_soc_dai_driver rt5670_dai[] = { ...@@ -2794,22 +2793,22 @@ static struct snd_soc_dai_driver rt5670_dai[] = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_rt5670 = { static const struct snd_soc_component_driver soc_component_dev_rt5670 = {
.probe = rt5670_probe, .probe = rt5670_probe,
.remove = rt5670_remove, .remove = rt5670_remove,
.suspend = rt5670_suspend, .suspend = rt5670_suspend,
.resume = rt5670_resume, .resume = rt5670_resume,
.set_bias_level = rt5670_set_bias_level, .set_bias_level = rt5670_set_bias_level,
.idle_bias_off = true,
.set_sysclk = rt5670_set_codec_sysclk, .set_sysclk = rt5670_set_codec_sysclk,
.component_driver = {
.controls = rt5670_snd_controls, .controls = rt5670_snd_controls,
.num_controls = ARRAY_SIZE(rt5670_snd_controls), .num_controls = ARRAY_SIZE(rt5670_snd_controls),
.dapm_widgets = rt5670_dapm_widgets, .dapm_widgets = rt5670_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(rt5670_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(rt5670_dapm_widgets),
.dapm_routes = rt5670_dapm_routes, .dapm_routes = rt5670_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(rt5670_dapm_routes), .num_dapm_routes = ARRAY_SIZE(rt5670_dapm_routes),
}, .use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct regmap_config rt5670_regmap = { static const struct regmap_config rt5670_regmap = {
...@@ -3171,7 +3170,8 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, ...@@ -3171,7 +3170,8 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
pm_runtime_enable(&i2c->dev); pm_runtime_enable(&i2c->dev);
pm_request_idle(&i2c->dev); pm_request_idle(&i2c->dev);
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5670, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_component_dev_rt5670,
rt5670_dai, ARRAY_SIZE(rt5670_dai)); rt5670_dai, ARRAY_SIZE(rt5670_dai));
if (ret < 0) if (ret < 0)
goto err; goto err;
...@@ -3188,7 +3188,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, ...@@ -3188,7 +3188,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
static int rt5670_i2c_remove(struct i2c_client *i2c) static int rt5670_i2c_remove(struct i2c_client *i2c)
{ {
pm_runtime_disable(&i2c->dev); pm_runtime_disable(&i2c->dev);
snd_soc_unregister_codec(&i2c->dev);
return 0; return 0;
} }
......
sound/soc/codecs/rt5670.h
View file @ da2495fb
...@@ -1986,11 +1986,11 @@ enum { ...@@ -1986,11 +1986,11 @@ enum {
RT5670_DOWN_RATE_FILTER = (0x1 << 7), RT5670_DOWN_RATE_FILTER = (0x1 << 7),
}; };
int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec, int rt5670_sel_asrc_clk_src(struct snd_soc_component *component,
unsigned int filter_mask, unsigned int clk_src); unsigned int filter_mask, unsigned int clk_src);
struct rt5670_priv { struct rt5670_priv {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct rt5670_platform_data pdata; struct rt5670_platform_data pdata;
struct regmap *regmap; struct regmap *regmap;
struct snd_soc_jack *jack; struct snd_soc_jack *jack;
...@@ -2012,8 +2012,8 @@ struct rt5670_priv { ...@@ -2012,8 +2012,8 @@ struct rt5670_priv {
int jack_type_saved; int jack_type_saved;
}; };
void rt5670_jack_suspend(struct snd_soc_codec *codec); void rt5670_jack_suspend(struct snd_soc_component *component);
void rt5670_jack_resume(struct snd_soc_codec *codec); void rt5670_jack_resume(struct snd_soc_component *component);
int rt5670_set_jack_detect(struct snd_soc_codec *codec, int rt5670_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *jack); struct snd_soc_jack *jack);
#endif /* __RT5670_H__ */ #endif /* __RT5670_H__ */
sound/soc/codecs/sgtl5000.c
View file @ da2495fb
...@@ -147,19 +147,19 @@ struct sgtl5000_priv { ...@@ -147,19 +147,19 @@ struct sgtl5000_priv {
static int mic_bias_event(struct snd_soc_dapm_widget *w, static int mic_bias_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
/* change mic bias resistor */ /* change mic bias resistor */
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_MIC_CTRL,
SGTL5000_BIAS_R_MASK, SGTL5000_BIAS_R_MASK,
sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT); sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_MIC_CTRL,
SGTL5000_BIAS_R_MASK, 0); SGTL5000_BIAS_R_MASK, 0);
break; break;
} }
...@@ -174,12 +174,12 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w, ...@@ -174,12 +174,12 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w,
static int power_vag_event(struct snd_soc_dapm_widget *w, static int power_vag_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
const u32 mask = SGTL5000_DAC_POWERUP | SGTL5000_ADC_POWERUP; const u32 mask = SGTL5000_DAC_POWERUP | SGTL5000_ADC_POWERUP;
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP); SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP);
msleep(400); msleep(400);
break; break;
...@@ -190,9 +190,9 @@ static int power_vag_event(struct snd_soc_dapm_widget *w, ...@@ -190,9 +190,9 @@ static int power_vag_event(struct snd_soc_dapm_widget *w,
* operational to prevent inadvertently starving the * operational to prevent inadvertently starving the
* other one of them. * other one of them.
*/ */
if ((snd_soc_read(codec, SGTL5000_CHIP_ANA_POWER) & if ((snd_soc_component_read32(component, SGTL5000_CHIP_ANA_POWER) &
mask) != mask) { mask) != mask) {
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
SGTL5000_VAG_POWERUP, 0); SGTL5000_VAG_POWERUP, 0);
msleep(400); msleep(400);
} }
...@@ -216,17 +216,54 @@ static SOC_ENUM_SINGLE_DECL(adc_enum, ...@@ -216,17 +216,54 @@ static SOC_ENUM_SINGLE_DECL(adc_enum,
static const struct snd_kcontrol_new adc_mux = static const struct snd_kcontrol_new adc_mux =
SOC_DAPM_ENUM("Capture Mux", adc_enum); SOC_DAPM_ENUM("Capture Mux", adc_enum);
/* input sources for headphone */
static const char *hp_mux_text[] = {
"DAC", "LINE_IN"
};
static SOC_ENUM_SINGLE_DECL(hp_enum,
SGTL5000_CHIP_ANA_CTRL, 6,
hp_mux_text);
static const struct snd_kcontrol_new hp_mux =
SOC_DAPM_ENUM("Headphone Mux", hp_enum);
/* input sources for DAC */ /* input sources for DAC */
static const char *dac_mux_text[] = { static const char *dac_mux_text[] = {
"DAC", "LINE_IN" "ADC", "I2S", "Rsvrd", "DAP"
}; };
static SOC_ENUM_SINGLE_DECL(dac_enum, static SOC_ENUM_SINGLE_DECL(dac_enum,
SGTL5000_CHIP_ANA_CTRL, 6, SGTL5000_CHIP_SSS_CTRL, SGTL5000_DAC_SEL_SHIFT,
dac_mux_text); dac_mux_text);
static const struct snd_kcontrol_new dac_mux = static const struct snd_kcontrol_new dac_mux =
SOC_DAPM_ENUM("Headphone Mux", dac_enum); SOC_DAPM_ENUM("Digital Input Mux", dac_enum);
/* input sources for DAP */
static const char *dap_mux_text[] = {
"ADC", "I2S"
};
static SOC_ENUM_SINGLE_DECL(dap_enum,
SGTL5000_CHIP_SSS_CTRL, SGTL5000_DAP_SEL_SHIFT,
dap_mux_text);
static const struct snd_kcontrol_new dap_mux =
SOC_DAPM_ENUM("DAP Mux", dap_enum);
/* input sources for DAP mix */
static const char *dapmix_mux_text[] = {
"ADC", "I2S"
};
static SOC_ENUM_SINGLE_DECL(dapmix_enum,
SGTL5000_CHIP_SSS_CTRL, SGTL5000_DAP_MIX_SEL_SHIFT,
dapmix_mux_text);
static const struct snd_kcontrol_new dapmix_mux =
SOC_DAPM_ENUM("DAP MIX Mux", dapmix_enum);
static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("LINE_IN"), SND_SOC_DAPM_INPUT("LINE_IN"),
...@@ -243,7 +280,12 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { ...@@ -243,7 +280,12 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0),
SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux), SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux),
SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &dac_mux), SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &hp_mux),
SND_SOC_DAPM_MUX("Digital Input Mux", SND_SOC_NOPM, 0, 0, &dac_mux),
SND_SOC_DAPM_MUX("DAP Mux", SGTL5000_DAP_CTRL, 0, 0, &dap_mux),
SND_SOC_DAPM_MUX("DAP MIX Mux", SGTL5000_DAP_CTRL, 4, 0, &dapmix_mux),
SND_SOC_DAPM_MIXER("DAP", SGTL5000_CHIP_DIG_POWER, 4, 0, NULL, 0),
/* aif for i2s input */ /* aif for i2s input */
SND_SOC_DAPM_AIF_IN("AIFIN", "Playback", SND_SOC_DAPM_AIF_IN("AIFIN", "Playback",
...@@ -270,7 +312,19 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = { ...@@ -270,7 +312,19 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = {
{"ADC", NULL, "Capture Mux"}, /* adc_mux --> adc */ {"ADC", NULL, "Capture Mux"}, /* adc_mux --> adc */
{"AIFOUT", NULL, "ADC"}, /* adc --> i2s_out */ {"AIFOUT", NULL, "ADC"}, /* adc --> i2s_out */
{"DAC", NULL, "AIFIN"}, /* i2s-->dac,skip audio mux */ {"DAP Mux", "ADC", "ADC"}, /* adc --> DAP mux */
{"DAP Mux", NULL, "AIFIN"}, /* i2s --> DAP mux */
{"DAP", NULL, "DAP Mux"}, /* DAP mux --> dap */
{"DAP MIX Mux", "ADC", "ADC"}, /* adc --> DAP MIX mux */
{"DAP MIX Mux", NULL, "AIFIN"}, /* i2s --> DAP MIX mux */
{"DAP", NULL, "DAP MIX Mux"}, /* DAP MIX mux --> dap */
{"Digital Input Mux", "ADC", "ADC"}, /* adc --> audio mux */
{"Digital Input Mux", NULL, "AIFIN"}, /* i2s --> audio mux */
{"Digital Input Mux", NULL, "DAP"}, /* dap --> audio mux */
{"DAC", NULL, "Digital Input Mux"}, /* audio mux --> dac */
{"Headphone Mux", "DAC", "DAC"}, /* dac --> hp_mux */ {"Headphone Mux", "DAC", "DAC"}, /* dac --> hp_mux */
{"LO", NULL, "DAC"}, /* dac --> line_out */ {"LO", NULL, "DAC"}, /* dac --> line_out */
...@@ -318,12 +372,12 @@ static int dac_info_volsw(struct snd_kcontrol *kcontrol, ...@@ -318,12 +372,12 @@ static int dac_info_volsw(struct snd_kcontrol *kcontrol,
static int dac_get_volsw(struct snd_kcontrol *kcontrol, static int dac_get_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
int reg; int reg;
int l; int l;
int r; int r;
reg = snd_soc_read(codec, SGTL5000_CHIP_DAC_VOL); reg = snd_soc_component_read32(component, SGTL5000_CHIP_DAC_VOL);
/* get left channel volume */ /* get left channel volume */
l = (reg & SGTL5000_DAC_VOL_LEFT_MASK) >> SGTL5000_DAC_VOL_LEFT_SHIFT; l = (reg & SGTL5000_DAC_VOL_LEFT_MASK) >> SGTL5000_DAC_VOL_LEFT_SHIFT;
...@@ -371,7 +425,7 @@ static int dac_get_volsw(struct snd_kcontrol *kcontrol, ...@@ -371,7 +425,7 @@ static int dac_get_volsw(struct snd_kcontrol *kcontrol,
static int dac_put_volsw(struct snd_kcontrol *kcontrol, static int dac_put_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
int reg; int reg;
int l; int l;
int r; int r;
...@@ -391,7 +445,7 @@ static int dac_put_volsw(struct snd_kcontrol *kcontrol, ...@@ -391,7 +445,7 @@ static int dac_put_volsw(struct snd_kcontrol *kcontrol,
reg = l << SGTL5000_DAC_VOL_LEFT_SHIFT | reg = l << SGTL5000_DAC_VOL_LEFT_SHIFT |
r << SGTL5000_DAC_VOL_RIGHT_SHIFT; r << SGTL5000_DAC_VOL_RIGHT_SHIFT;
snd_soc_write(codec, SGTL5000_CHIP_DAC_VOL, reg); snd_soc_component_write(component, SGTL5000_CHIP_DAC_VOL, reg);
return 0; return 0;
} }
...@@ -409,9 +463,9 @@ static int dac_put_volsw(struct snd_kcontrol *kcontrol, ...@@ -409,9 +463,9 @@ static int dac_put_volsw(struct snd_kcontrol *kcontrol,
static int avc_get_threshold(struct snd_kcontrol *kcontrol, static int avc_get_threshold(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
int db, i; int db, i;
u16 reg = snd_soc_read(codec, SGTL5000_DAP_AVC_THRESHOLD); u16 reg = snd_soc_component_read32(component, SGTL5000_DAP_AVC_THRESHOLD);
/* register value 0 => -96dB */ /* register value 0 => -96dB */
if (!reg) { if (!reg) {
...@@ -442,7 +496,7 @@ static int avc_get_threshold(struct snd_kcontrol *kcontrol, ...@@ -442,7 +496,7 @@ static int avc_get_threshold(struct snd_kcontrol *kcontrol,
static int avc_put_threshold(struct snd_kcontrol *kcontrol, static int avc_put_threshold(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
int db; int db;
u16 reg; u16 reg;
...@@ -450,7 +504,7 @@ static int avc_put_threshold(struct snd_kcontrol *kcontrol, ...@@ -450,7 +504,7 @@ static int avc_put_threshold(struct snd_kcontrol *kcontrol,
if (db < 0 || db > 96) if (db < 0 || db > 96)
return -EINVAL; return -EINVAL;
reg = avc_thr_db2reg[db]; reg = avc_thr_db2reg[db];
snd_soc_write(codec, SGTL5000_DAP_AVC_THRESHOLD, reg); snd_soc_component_write(component, SGTL5000_DAP_AVC_THRESHOLD, reg);
return 0; return 0;
} }
...@@ -463,6 +517,12 @@ static const DECLARE_TLV_DB_RANGE(mic_gain_tlv, ...@@ -463,6 +517,12 @@ static const DECLARE_TLV_DB_RANGE(mic_gain_tlv,
1, 3, TLV_DB_SCALE_ITEM(2000, 1000, 0) 1, 3, TLV_DB_SCALE_ITEM(2000, 1000, 0)
); );
/* tlv for DAP channels, 0% - 100% - 200% */
static const DECLARE_TLV_DB_SCALE(dap_volume, 0, 1, 0);
/* tlv for bass bands, -11.75db to 12.0db, step .25db */
static const DECLARE_TLV_DB_SCALE(bass_band, -1175, 25, 0);
/* tlv for hp volume, -51.5db to 12.0db, step .5db */ /* tlv for hp volume, -51.5db to 12.0db, step .5db */
static const DECLARE_TLV_DB_SCALE(headphone_volume, -5150, 50, 0); static const DECLARE_TLV_DB_SCALE(headphone_volume, -5150, 50, 0);
...@@ -514,6 +574,11 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = { ...@@ -514,6 +574,11 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = {
lineout_volume), lineout_volume),
SOC_SINGLE("Lineout Playback Switch", SGTL5000_CHIP_ANA_CTRL, 8, 1, 1), SOC_SINGLE("Lineout Playback Switch", SGTL5000_CHIP_ANA_CTRL, 8, 1, 1),
SOC_SINGLE_TLV("DAP Main channel", SGTL5000_DAP_MAIN_CHAN,
0, 0xffff, 0, dap_volume),
SOC_SINGLE_TLV("DAP Mix channel", SGTL5000_DAP_MIX_CHAN,
0, 0xffff, 0, dap_volume),
/* Automatic Volume Control (DAP AVC) */ /* Automatic Volume Control (DAP AVC) */
SOC_SINGLE("AVC Switch", SGTL5000_DAP_AVC_CTRL, 0, 1, 0), SOC_SINGLE("AVC Switch", SGTL5000_DAP_AVC_CTRL, 0, 1, 0),
SOC_SINGLE("AVC Hard Limiter Switch", SGTL5000_DAP_AVC_CTRL, 5, 1, 0), SOC_SINGLE("AVC Hard Limiter Switch", SGTL5000_DAP_AVC_CTRL, 5, 1, 0),
...@@ -523,12 +588,27 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = { ...@@ -523,12 +588,27 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = {
SOC_SINGLE_EXT_TLV("AVC Threshold Volume", SGTL5000_DAP_AVC_THRESHOLD, SOC_SINGLE_EXT_TLV("AVC Threshold Volume", SGTL5000_DAP_AVC_THRESHOLD,
0, 96, 0, avc_get_threshold, avc_put_threshold, 0, 96, 0, avc_get_threshold, avc_put_threshold,
avc_threshold), avc_threshold),
SOC_SINGLE_TLV("BASS 0", SGTL5000_DAP_EQ_BASS_BAND0,
0, 0x5F, 0, bass_band),
SOC_SINGLE_TLV("BASS 1", SGTL5000_DAP_EQ_BASS_BAND1,
0, 0x5F, 0, bass_band),
SOC_SINGLE_TLV("BASS 2", SGTL5000_DAP_EQ_BASS_BAND2,
0, 0x5F, 0, bass_band),
SOC_SINGLE_TLV("BASS 3", SGTL5000_DAP_EQ_BASS_BAND3,
0, 0x5F, 0, bass_band),
SOC_SINGLE_TLV("BASS 4", SGTL5000_DAP_EQ_BASS_BAND4,
0, 0x5F, 0, bass_band),
}; };
/* mute the codec used by alsa core */ /* mute the codec used by alsa core */
static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute) static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
u16 i2s_pwr = SGTL5000_I2S_IN_POWERUP; u16 i2s_pwr = SGTL5000_I2S_IN_POWERUP;
/* /*
...@@ -536,7 +616,7 @@ static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute) ...@@ -536,7 +616,7 @@ static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute)
* because LINE_IN would be muted aswell. We want to mute * because LINE_IN would be muted aswell. We want to mute
* only I2S block - this can be done by powering it off * only I2S block - this can be done by powering it off
*/ */
snd_soc_update_bits(codec, SGTL5000_CHIP_DIG_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_DIG_POWER,
i2s_pwr, mute ? 0 : i2s_pwr); i2s_pwr, mute ? 0 : i2s_pwr);
return 0; return 0;
...@@ -545,8 +625,8 @@ static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute) ...@@ -545,8 +625,8 @@ static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute)
/* set codec format */ /* set codec format */
static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
u16 i2sctl = 0; u16 i2sctl = 0;
sgtl5000->master = 0; sgtl5000->master = 0;
...@@ -604,7 +684,7 @@ static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -604,7 +684,7 @@ static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
return -EINVAL; return -EINVAL;
} }
snd_soc_write(codec, SGTL5000_CHIP_I2S_CTRL, i2sctl); snd_soc_component_write(component, SGTL5000_CHIP_I2S_CTRL, i2sctl);
return 0; return 0;
} }
...@@ -613,8 +693,8 @@ static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -613,8 +693,8 @@ static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
static int sgtl5000_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int sgtl5000_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case SGTL5000_SYSCLK: case SGTL5000_SYSCLK:
...@@ -640,9 +720,9 @@ static int sgtl5000_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -640,9 +720,9 @@ static int sgtl5000_set_dai_sysclk(struct snd_soc_dai *codec_dai,
* and above. * and above.
* 3. usage of sys_mclk is preferred over pll to save power. * 3. usage of sys_mclk is preferred over pll to save power.
*/ */
static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate) static int sgtl5000_set_clock(struct snd_soc_component *component, int frame_rate)
{ {
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
int clk_ctl = 0; int clk_ctl = 0;
int sys_fs; /* sample freq */ int sys_fs; /* sample freq */
...@@ -695,7 +775,7 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate) ...@@ -695,7 +775,7 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate)
clk_ctl |= SGTL5000_SYS_FS_96k << SGTL5000_SYS_FS_SHIFT; clk_ctl |= SGTL5000_SYS_FS_96k << SGTL5000_SYS_FS_SHIFT;
break; break;
default: default:
dev_err(codec->dev, "frame rate %d not supported\n", dev_err(component->dev, "frame rate %d not supported\n",
frame_rate); frame_rate);
return -EINVAL; return -EINVAL;
} }
...@@ -724,9 +804,9 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate) ...@@ -724,9 +804,9 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate)
clk_ctl |= SGTL5000_MCLK_FREQ_PLL << clk_ctl |= SGTL5000_MCLK_FREQ_PLL <<
SGTL5000_MCLK_FREQ_SHIFT; SGTL5000_MCLK_FREQ_SHIFT;
} else { } else {
dev_err(codec->dev, dev_err(component->dev,
"PLL not supported in slave mode\n"); "PLL not supported in slave mode\n");
dev_err(codec->dev, "%d ratio is not supported. " dev_err(component->dev, "%d ratio is not supported. "
"SYS_MCLK needs to be 256, 384 or 512 * fs\n", "SYS_MCLK needs to be 256, 384 or 512 * fs\n",
sgtl5000->sysclk / frame_rate); sgtl5000->sysclk / frame_rate);
return -EINVAL; return -EINVAL;
...@@ -759,31 +839,31 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate) ...@@ -759,31 +839,31 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate)
pll_ctl = int_div << SGTL5000_PLL_INT_DIV_SHIFT | pll_ctl = int_div << SGTL5000_PLL_INT_DIV_SHIFT |
frac_div << SGTL5000_PLL_FRAC_DIV_SHIFT; frac_div << SGTL5000_PLL_FRAC_DIV_SHIFT;
snd_soc_write(codec, SGTL5000_CHIP_PLL_CTRL, pll_ctl); snd_soc_component_write(component, SGTL5000_CHIP_PLL_CTRL, pll_ctl);
if (div2) if (div2)
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
SGTL5000_CHIP_CLK_TOP_CTRL, SGTL5000_CHIP_CLK_TOP_CTRL,
SGTL5000_INPUT_FREQ_DIV2, SGTL5000_INPUT_FREQ_DIV2,
SGTL5000_INPUT_FREQ_DIV2); SGTL5000_INPUT_FREQ_DIV2);
else else
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
SGTL5000_CHIP_CLK_TOP_CTRL, SGTL5000_CHIP_CLK_TOP_CTRL,
SGTL5000_INPUT_FREQ_DIV2, SGTL5000_INPUT_FREQ_DIV2,
0); 0);
/* power up pll */ /* power up pll */
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
SGTL5000_PLL_POWERUP | SGTL5000_VCOAMP_POWERUP, SGTL5000_PLL_POWERUP | SGTL5000_VCOAMP_POWERUP,
SGTL5000_PLL_POWERUP | SGTL5000_VCOAMP_POWERUP); SGTL5000_PLL_POWERUP | SGTL5000_VCOAMP_POWERUP);
/* if using pll, clk_ctrl must be set after pll power up */ /* if using pll, clk_ctrl must be set after pll power up */
snd_soc_write(codec, SGTL5000_CHIP_CLK_CTRL, clk_ctl); snd_soc_component_write(component, SGTL5000_CHIP_CLK_CTRL, clk_ctl);
} else { } else {
/* otherwise, clk_ctrl must be set before pll power down */ /* otherwise, clk_ctrl must be set before pll power down */
snd_soc_write(codec, SGTL5000_CHIP_CLK_CTRL, clk_ctl); snd_soc_component_write(component, SGTL5000_CHIP_CLK_CTRL, clk_ctl);
/* power down pll */ /* power down pll */
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
SGTL5000_PLL_POWERUP | SGTL5000_VCOAMP_POWERUP, SGTL5000_PLL_POWERUP | SGTL5000_VCOAMP_POWERUP,
0); 0);
} }
...@@ -799,8 +879,8 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -799,8 +879,8 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
int channels = params_channels(params); int channels = params_channels(params);
int i2s_ctl = 0; int i2s_ctl = 0;
int stereo; int stereo;
...@@ -808,7 +888,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -808,7 +888,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
/* sysclk should already set */ /* sysclk should already set */
if (!sgtl5000->sysclk) { if (!sgtl5000->sysclk) {
dev_err(codec->dev, "%s: set sysclk first!\n", __func__); dev_err(component->dev, "%s: set sysclk first!\n", __func__);
return -EFAULT; return -EFAULT;
} }
...@@ -818,11 +898,11 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -818,11 +898,11 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
stereo = SGTL5000_ADC_STEREO; stereo = SGTL5000_ADC_STEREO;
/* set mono to save power */ /* set mono to save power */
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, stereo, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER, stereo,
channels == 1 ? 0 : stereo); channels == 1 ? 0 : stereo);
/* set codec clock base on lrclk */ /* set codec clock base on lrclk */
ret = sgtl5000_set_clock(codec, params_rate(params)); ret = sgtl5000_set_clock(component, params_rate(params));
if (ret) if (ret)
return ret; return ret;
...@@ -856,7 +936,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -856,7 +936,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, SGTL5000_CHIP_I2S_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_I2S_CTRL,
SGTL5000_I2S_DLEN_MASK | SGTL5000_I2S_SCLKFREQ_MASK, SGTL5000_I2S_DLEN_MASK | SGTL5000_I2S_SCLKFREQ_MASK,
i2s_ctl); i2s_ctl);
...@@ -873,10 +953,10 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -873,10 +953,10 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
* stop: * stop:
* on --> prepare --> standby * on --> prepare --> standby
*/ */
static int sgtl5000_set_bias_level(struct snd_soc_codec *codec, static int sgtl5000_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct sgtl5000_priv *sgtl = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
...@@ -890,13 +970,13 @@ static int sgtl5000_set_bias_level(struct snd_soc_codec *codec, ...@@ -890,13 +970,13 @@ static int sgtl5000_set_bias_level(struct snd_soc_codec *codec,
return ret; return ret;
} }
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
SGTL5000_REFTOP_POWERUP, SGTL5000_REFTOP_POWERUP,
SGTL5000_REFTOP_POWERUP); SGTL5000_REFTOP_POWERUP);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
regcache_cache_only(sgtl->regmap, true); regcache_cache_only(sgtl->regmap, true);
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
SGTL5000_REFTOP_POWERUP, 0); SGTL5000_REFTOP_POWERUP, 0);
break; break;
} }
...@@ -1036,7 +1116,7 @@ static const u8 vol_quot_table[] = { ...@@ -1036,7 +1116,7 @@ static const u8 vol_quot_table[] = {
* 1. vddd provided by external or not * 1. vddd provided by external or not
* 2. vdda and vddio voltage value. > 3.1v or not * 2. vdda and vddio voltage value. > 3.1v or not
*/ */
static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) static int sgtl5000_set_power_regs(struct snd_soc_component *component)
{ {
int vddd; int vddd;
int vdda; int vdda;
...@@ -1048,7 +1128,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1048,7 +1128,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
int vol_quot; int vol_quot;
int lo_vol; int lo_vol;
size_t i; size_t i;
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
vdda = regulator_get_voltage(sgtl5000->supplies[VDDA].consumer); vdda = regulator_get_voltage(sgtl5000->supplies[VDDA].consumer);
vddio = regulator_get_voltage(sgtl5000->supplies[VDDIO].consumer); vddio = regulator_get_voltage(sgtl5000->supplies[VDDIO].consumer);
...@@ -1061,14 +1141,14 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1061,14 +1141,14 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
vddd = vddd / 1000; vddd = vddd / 1000;
if (vdda <= 0 || vddio <= 0 || vddd < 0) { if (vdda <= 0 || vddio <= 0 || vddd < 0) {
dev_err(codec->dev, "regulator voltage not set correctly\n"); dev_err(component->dev, "regulator voltage not set correctly\n");
return -EINVAL; return -EINVAL;
} }
/* according to datasheet, maximum voltage of supplies */ /* according to datasheet, maximum voltage of supplies */
if (vdda > 3600 || vddio > 3600 || vddd > 1980) { if (vdda > 3600 || vddio > 3600 || vddd > 1980) {
dev_err(codec->dev, dev_err(component->dev,
"exceed max voltage vdda %dmV vddio %dmV vddd %dmV\n", "exceed max voltage vdda %dmV vddio %dmV vddd %dmV\n",
vdda, vddio, vddd); vdda, vddio, vddd);
...@@ -1076,15 +1156,15 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1076,15 +1156,15 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
} }
/* reset value */ /* reset value */
ana_pwr = snd_soc_read(codec, SGTL5000_CHIP_ANA_POWER); ana_pwr = snd_soc_component_read32(component, SGTL5000_CHIP_ANA_POWER);
ana_pwr |= SGTL5000_DAC_STEREO | ana_pwr |= SGTL5000_DAC_STEREO |
SGTL5000_ADC_STEREO | SGTL5000_ADC_STEREO |
SGTL5000_REFTOP_POWERUP; SGTL5000_REFTOP_POWERUP;
lreg_ctrl = snd_soc_read(codec, SGTL5000_CHIP_LINREG_CTRL); lreg_ctrl = snd_soc_component_read32(component, SGTL5000_CHIP_LINREG_CTRL);
if (vddio < 3100 && vdda < 3100) { if (vddio < 3100 && vdda < 3100) {
/* enable internal oscillator used for charge pump */ /* enable internal oscillator used for charge pump */
snd_soc_update_bits(codec, SGTL5000_CHIP_CLK_TOP_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_CLK_TOP_CTRL,
SGTL5000_INT_OSC_EN, SGTL5000_INT_OSC_EN,
SGTL5000_INT_OSC_EN); SGTL5000_INT_OSC_EN);
/* Enable VDDC charge pump */ /* Enable VDDC charge pump */
...@@ -1097,9 +1177,9 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1097,9 +1177,9 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
SGTL5000_VDDC_MAN_ASSN_SHIFT; SGTL5000_VDDC_MAN_ASSN_SHIFT;
} }
snd_soc_write(codec, SGTL5000_CHIP_LINREG_CTRL, lreg_ctrl); snd_soc_component_write(component, SGTL5000_CHIP_LINREG_CTRL, lreg_ctrl);
snd_soc_write(codec, SGTL5000_CHIP_ANA_POWER, ana_pwr); snd_soc_component_write(component, SGTL5000_CHIP_ANA_POWER, ana_pwr);
/* /*
* set ADC/DAC VAG to vdda / 2, * set ADC/DAC VAG to vdda / 2,
...@@ -1114,7 +1194,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1114,7 +1194,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
else else
vag = (vag - SGTL5000_ANA_GND_BASE) / SGTL5000_ANA_GND_STP; vag = (vag - SGTL5000_ANA_GND_BASE) / SGTL5000_ANA_GND_STP;
snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_REF_CTRL,
SGTL5000_ANA_GND_MASK, vag << SGTL5000_ANA_GND_SHIFT); SGTL5000_ANA_GND_MASK, vag << SGTL5000_ANA_GND_SHIFT);
/* set line out VAG to vddio / 2, in range (0.8v, 1.675v) */ /* set line out VAG to vddio / 2, in range (0.8v, 1.675v) */
...@@ -1128,7 +1208,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1128,7 +1208,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
lo_vag = (lo_vag - SGTL5000_LINE_OUT_GND_BASE) / lo_vag = (lo_vag - SGTL5000_LINE_OUT_GND_BASE) /
SGTL5000_LINE_OUT_GND_STP; SGTL5000_LINE_OUT_GND_STP;
snd_soc_update_bits(codec, SGTL5000_CHIP_LINE_OUT_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_LINE_OUT_CTRL,
SGTL5000_LINE_OUT_CURRENT_MASK | SGTL5000_LINE_OUT_CURRENT_MASK |
SGTL5000_LINE_OUT_GND_MASK, SGTL5000_LINE_OUT_GND_MASK,
lo_vag << SGTL5000_LINE_OUT_GND_SHIFT | lo_vag << SGTL5000_LINE_OUT_GND_SHIFT |
...@@ -1151,7 +1231,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) ...@@ -1151,7 +1231,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
break; break;
} }
snd_soc_update_bits(codec, SGTL5000_CHIP_LINE_OUT_VOL, snd_soc_component_update_bits(component, SGTL5000_CHIP_LINE_OUT_VOL,
SGTL5000_LINE_OUT_VOL_RIGHT_MASK | SGTL5000_LINE_OUT_VOL_RIGHT_MASK |
SGTL5000_LINE_OUT_VOL_LEFT_MASK, SGTL5000_LINE_OUT_VOL_LEFT_MASK,
lo_vol << SGTL5000_LINE_OUT_VOL_RIGHT_SHIFT | lo_vol << SGTL5000_LINE_OUT_VOL_RIGHT_SHIFT |
...@@ -1199,62 +1279,56 @@ static int sgtl5000_enable_regulators(struct i2c_client *client) ...@@ -1199,62 +1279,56 @@ static int sgtl5000_enable_regulators(struct i2c_client *client)
return ret; return ret;
} }
static int sgtl5000_probe(struct snd_soc_codec *codec) static int sgtl5000_probe(struct snd_soc_component *component)
{ {
int ret; int ret;
u16 reg; u16 reg;
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
/* power up sgtl5000 */ /* power up sgtl5000 */
ret = sgtl5000_set_power_regs(codec); ret = sgtl5000_set_power_regs(component);
if (ret) if (ret)
goto err; goto err;
/* enable small pop, introduce 400ms delay in turning off */ /* enable small pop, introduce 400ms delay in turning off */
snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_REF_CTRL,
SGTL5000_SMALL_POP, 1); SGTL5000_SMALL_POP, 1);
/* disable short cut detector */ /* disable short cut detector */
snd_soc_write(codec, SGTL5000_CHIP_SHORT_CTRL, 0); snd_soc_component_write(component, SGTL5000_CHIP_SHORT_CTRL, 0);
/* snd_soc_component_write(component, SGTL5000_CHIP_DIG_POWER,
* set i2s as default input of sound switch
* TODO: add sound switch to control and dapm widge.
*/
snd_soc_write(codec, SGTL5000_CHIP_SSS_CTRL,
SGTL5000_DAC_SEL_I2S_IN << SGTL5000_DAC_SEL_SHIFT);
snd_soc_write(codec, SGTL5000_CHIP_DIG_POWER,
SGTL5000_ADC_EN | SGTL5000_DAC_EN); SGTL5000_ADC_EN | SGTL5000_DAC_EN);
/* enable dac volume ramp by default */ /* enable dac volume ramp by default */
snd_soc_write(codec, SGTL5000_CHIP_ADCDAC_CTRL, snd_soc_component_write(component, SGTL5000_CHIP_ADCDAC_CTRL,
SGTL5000_DAC_VOL_RAMP_EN | SGTL5000_DAC_VOL_RAMP_EN |
SGTL5000_DAC_MUTE_RIGHT | SGTL5000_DAC_MUTE_RIGHT |
SGTL5000_DAC_MUTE_LEFT); SGTL5000_DAC_MUTE_LEFT);
reg = ((sgtl5000->lrclk_strength) << SGTL5000_PAD_I2S_LRCLK_SHIFT | 0x5f); reg = ((sgtl5000->lrclk_strength) << SGTL5000_PAD_I2S_LRCLK_SHIFT | 0x5f);
snd_soc_write(codec, SGTL5000_CHIP_PAD_STRENGTH, reg); snd_soc_component_write(component, SGTL5000_CHIP_PAD_STRENGTH, reg);
snd_soc_write(codec, SGTL5000_CHIP_ANA_CTRL, snd_soc_component_write(component, SGTL5000_CHIP_ANA_CTRL,
SGTL5000_HP_ZCD_EN | SGTL5000_HP_ZCD_EN |
SGTL5000_ADC_ZCD_EN); SGTL5000_ADC_ZCD_EN);
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_MIC_CTRL,
SGTL5000_BIAS_R_MASK, SGTL5000_BIAS_R_MASK,
sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT); sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_MIC_CTRL,
SGTL5000_BIAS_VOLT_MASK, SGTL5000_BIAS_VOLT_MASK,
sgtl5000->micbias_voltage << SGTL5000_BIAS_VOLT_SHIFT); sgtl5000->micbias_voltage << SGTL5000_BIAS_VOLT_SHIFT);
/* /*
* disable DAP * enable DAP Graphic EQ
* TODO: * TODO:
* Enable DAP in kcontrol and dapm. * Add control for changing between PEQ/Tone Control/GEQ
*/ */
snd_soc_write(codec, SGTL5000_DAP_CTRL, 0); snd_soc_component_write(component, SGTL5000_DAP_AUDIO_EQ, SGTL5000_DAP_SEL_GEQ);
/* Unmute DAC after start */ /* Unmute DAC after start */
snd_soc_update_bits(codec, SGTL5000_CHIP_ADCDAC_CTRL, snd_soc_component_update_bits(component, SGTL5000_CHIP_ADCDAC_CTRL,
SGTL5000_DAC_MUTE_LEFT | SGTL5000_DAC_MUTE_RIGHT, 0); SGTL5000_DAC_MUTE_LEFT | SGTL5000_DAC_MUTE_RIGHT, 0);
return 0; return 0;
...@@ -1263,24 +1337,20 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) ...@@ -1263,24 +1337,20 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
static int sgtl5000_remove(struct snd_soc_codec *codec) static const struct snd_soc_component_driver sgtl5000_driver = {
{
return 0;
}
static const struct snd_soc_codec_driver sgtl5000_driver = {
.probe = sgtl5000_probe, .probe = sgtl5000_probe,
.remove = sgtl5000_remove,
.set_bias_level = sgtl5000_set_bias_level, .set_bias_level = sgtl5000_set_bias_level,
.suspend_bias_off = true,
.component_driver = {
.controls = sgtl5000_snd_controls, .controls = sgtl5000_snd_controls,
.num_controls = ARRAY_SIZE(sgtl5000_snd_controls), .num_controls = ARRAY_SIZE(sgtl5000_snd_controls),
.dapm_widgets = sgtl5000_dapm_widgets, .dapm_widgets = sgtl5000_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(sgtl5000_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(sgtl5000_dapm_widgets),
.dapm_routes = sgtl5000_dapm_routes, .dapm_routes = sgtl5000_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes), .num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes),
}, .suspend_bias_off = 1,
.idle_bias_on = 1,
.use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct regmap_config sgtl5000_regmap = { static const struct regmap_config sgtl5000_regmap = {
...@@ -1479,7 +1549,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, ...@@ -1479,7 +1549,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client,
/* Ensure sgtl5000 will start with sane register values */ /* Ensure sgtl5000 will start with sane register values */
sgtl5000_fill_defaults(client); sgtl5000_fill_defaults(client);
ret = snd_soc_register_codec(&client->dev, ret = devm_snd_soc_register_component(&client->dev,
&sgtl5000_driver, &sgtl5000_dai, 1); &sgtl5000_driver, &sgtl5000_dai, 1);
if (ret) if (ret)
goto disable_clk; goto disable_clk;
...@@ -1500,7 +1570,6 @@ static int sgtl5000_i2c_remove(struct i2c_client *client) ...@@ -1500,7 +1570,6 @@ static int sgtl5000_i2c_remove(struct i2c_client *client)
{ {
struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client); struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev);
clk_disable_unprepare(sgtl5000->mclk); clk_disable_unprepare(sgtl5000->mclk);
regulator_bulk_disable(sgtl5000->num_supplies, sgtl5000->supplies); regulator_bulk_disable(sgtl5000->num_supplies, sgtl5000->supplies);
regulator_bulk_free(sgtl5000->num_supplies, sgtl5000->supplies); regulator_bulk_free(sgtl5000->num_supplies, sgtl5000->supplies);
......
sound/soc/codecs/sgtl5000.h
View file @ da2495fb
...@@ -399,4 +399,11 @@ ...@@ -399,4 +399,11 @@
#define SGTL5000_SYSCLK 0x00 #define SGTL5000_SYSCLK 0x00
#define SGTL5000_LRCLK 0x01 #define SGTL5000_LRCLK 0x01
/*
* SGTL5000_DAP_AUDIO_EQ
*/
#define SGTL5000_DAP_SEL_PEQ 1
#define SGTL5000_DAP_SEL_TONE_CTRL 2
#define SGTL5000_DAP_SEL_GEQ 3
#endif #endif
sound/soc/codecs/si476x.c
View file @ da2495fb
...@@ -140,14 +140,14 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -140,14 +140,14 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
si476x_core_lock(core); si476x_core_lock(core);
err = snd_soc_update_bits(codec_dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT, err = snd_soc_component_update_bits(codec_dai->component, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
SI476X_DIGITAL_IO_OUTPUT_FORMAT_MASK, SI476X_DIGITAL_IO_OUTPUT_FORMAT_MASK,
format); format);
si476x_core_unlock(core); si476x_core_unlock(core);
if (err < 0) { if (err < 0) {
dev_err(codec_dai->codec->dev, "Failed to set output format\n"); dev_err(codec_dai->component->dev, "Failed to set output format\n");
return err; return err;
} }
...@@ -163,7 +163,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream, ...@@ -163,7 +163,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
rate = params_rate(params); rate = params_rate(params);
if (rate < 32000 || rate > 48000) { if (rate < 32000 || rate > 48000) {
dev_err(dai->codec->dev, "Rate: %d is not supported\n", rate); dev_err(dai->component->dev, "Rate: %d is not supported\n", rate);
return -EINVAL; return -EINVAL;
} }
...@@ -186,19 +186,19 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream, ...@@ -186,19 +186,19 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
si476x_core_lock(core); si476x_core_lock(core);
err = snd_soc_write(dai->codec, SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE, err = snd_soc_component_write(dai->component, SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE,
rate); rate);
if (err < 0) { if (err < 0) {
dev_err(dai->codec->dev, "Failed to set sample rate\n"); dev_err(dai->component->dev, "Failed to set sample rate\n");
goto out; goto out;
} }
err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT, err = snd_soc_component_update_bits(dai->component, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK, SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK,
(width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) | (width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) |
(width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT)); (width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT));
if (err < 0) { if (err < 0) {
dev_err(dai->codec->dev, "Failed to set output width\n"); dev_err(dai->component->dev, "Failed to set output width\n");
goto out; goto out;
} }
...@@ -239,28 +239,25 @@ static int si476x_probe(struct snd_soc_component *component) ...@@ -239,28 +239,25 @@ static int si476x_probe(struct snd_soc_component *component)
return 0; return 0;
} }
static const struct snd_soc_codec_driver soc_codec_dev_si476x = { static const struct snd_soc_component_driver soc_component_dev_si476x = {
.component_driver = {
.probe = si476x_probe, .probe = si476x_probe,
.dapm_widgets = si476x_dapm_widgets, .dapm_widgets = si476x_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets),
.dapm_routes = si476x_dapm_routes, .dapm_routes = si476x_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes), .num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes),
}, .idle_bias_on = 1,
.use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int si476x_platform_probe(struct platform_device *pdev) static int si476x_platform_probe(struct platform_device *pdev)
{ {
return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_si476x, return devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_si476x,
&si476x_dai, 1); &si476x_dai, 1);
} }
static int si476x_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
}
MODULE_ALIAS("platform:si476x-codec"); MODULE_ALIAS("platform:si476x-codec");
static struct platform_driver si476x_platform_driver = { static struct platform_driver si476x_platform_driver = {
...@@ -268,7 +265,6 @@ static struct platform_driver si476x_platform_driver = { ...@@ -268,7 +265,6 @@ static struct platform_driver si476x_platform_driver = {
.name = "si476x-codec", .name = "si476x-codec",
}, },
.probe = si476x_platform_probe, .probe = si476x_platform_probe,
.remove = si476x_platform_remove,
}; };
module_platform_driver(si476x_platform_driver); module_platform_driver(si476x_platform_driver);
......
sound/soc/intel/boards/cht_bsw_rt5672.c
View file @ da2495fb
...@@ -183,10 +183,10 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) ...@@ -183,10 +183,10 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
{ {
int ret; int ret;
struct snd_soc_dai *codec_dai = runtime->codec_dai; struct snd_soc_dai *codec_dai = runtime->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card);
if (devm_acpi_dev_add_driver_gpios(codec->dev, cht_rt5672_gpios)) if (devm_acpi_dev_add_driver_gpios(component->dev, cht_rt5672_gpios))
dev_warn(runtime->dev, "Unable to add GPIO mapping table\n"); dev_warn(runtime->dev, "Unable to add GPIO mapping table\n");
/* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
...@@ -201,7 +201,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) ...@@ -201,7 +201,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
* be supported by RT5672. Otherwise, ASRC will be disabled and cause * be supported by RT5672. Otherwise, ASRC will be disabled and cause
* noise. * noise.
*/ */
rt5670_sel_asrc_clk_src(codec, rt5670_sel_asrc_clk_src(component,
RT5670_DA_STEREO_FILTER RT5670_DA_STEREO_FILTER
| RT5670_DA_MONO_L_FILTER | RT5670_DA_MONO_L_FILTER
| RT5670_DA_MONO_R_FILTER | RT5670_DA_MONO_R_FILTER
...@@ -219,7 +219,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) ...@@ -219,7 +219,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
if (ret) if (ret)
return ret; return ret;
rt5670_set_jack_detect(codec, &ctx->headset); rt5670_set_jack_detect(component, &ctx->headset);
if (ctx->mclk) { if (ctx->mclk) {
/* /*
* The firmware might enable the clock at * The firmware might enable the clock at
...@@ -333,10 +333,9 @@ static int cht_suspend_pre(struct snd_soc_card *card) ...@@ -333,10 +333,9 @@ static int cht_suspend_pre(struct snd_soc_card *card)
list_for_each_entry(component, &card->component_dev_list, card_list) { list_for_each_entry(component, &card->component_dev_list, card_list) {
if (!strncmp(component->name, if (!strncmp(component->name,
ctx->codec_name, sizeof(ctx->codec_name))) { ctx->codec_name, sizeof(ctx->codec_name))) {
struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n"); dev_dbg(component->dev, "disabling jack detect before going to suspend.\n");
rt5670_jack_suspend(codec); rt5670_jack_suspend(component);
break; break;
} }
} }
...@@ -351,10 +350,9 @@ static int cht_resume_post(struct snd_soc_card *card) ...@@ -351,10 +350,9 @@ static int cht_resume_post(struct snd_soc_card *card)
list_for_each_entry(component, &card->component_dev_list, card_list) { list_for_each_entry(component, &card->component_dev_list, card_list) {
if (!strncmp(component->name, if (!strncmp(component->name,
ctx->codec_name, sizeof(ctx->codec_name))) { ctx->codec_name, sizeof(ctx->codec_name))) {
struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
dev_dbg(codec->dev, "enabling jack detect for resume.\n"); dev_dbg(component->dev, "enabling jack detect for resume.\n");
rt5670_jack_resume(codec); rt5670_jack_resume(component);
break; break;
} }
} }
......
sound/soc/sirf/sirf-usp.h
View file @ da2495fb
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
USP_RX_IO_DMA_INT|\ USP_RX_IO_DMA_INT|\
USP_RXFIFO_FULL_INT|\ USP_RXFIFO_FULL_INT|\
USP_RXFIFO_THD_INT|\ USP_RXFIFO_THD_INT|\
USP_RXFIFO_THD_INT|USP_RX_TIMEOUT_INT) USP_RX_TIMEOUT_INT)
#define USP_INT_ALL 0x1FFF #define USP_INT_ALL 0x1FFF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7