microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5651', 'asoc/topic/rt5659' and 'asoc/topic/rt5660' into asoc-next

This commit is contained in:
Mark Brown 2018-03-28 10:30:29 +08:00
Родитель bffd6430c6 79223bf190 6b2d99247b ce571b80e2 ca04dd8a9b
Коммит 8ee67bb80a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 24D68B725D5487D0
20 изменённых файлов: 729 добавлений и 638 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Documentation/devicetree/bindings/sound/rt5651.txt
Просмотреть файл

@ -18,9 +18,9 @@ Optional properties:
- realtek,jack-detect-source - realtek,jack-detect-source
u32. Valid values: u32. Valid values:
1: Use JD1_1 pin for jack-dectect 1: Use JD1_1 pin for jack-detect
2: Use JD1_2 pin for jack-dectect 2: Use JD1_2 pin for jack-detect
3: Use JD2 pin for jack-dectect 3: Use JD2 pin for jack-detect
- realtek,over-current-threshold-microamp - realtek,over-current-threshold-microamp
u32, micbias over-current detection threshold in µA, valid values are u32, micbias over-current detection threshold in µA, valid values are

15
include/dt-bindings/sound/rt5651.h Normal file
Просмотреть файл

@ -0,0 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __DT_RT5651_H
#define __DT_RT5651_H
#define RT5651_JD_NULL 0
#define RT5651_JD1_1 1
#define RT5651_JD1_2 2
#define RT5651_JD2 3
#define RT5651_OVCD_SF_0P5 0
#define RT5651_OVCD_SF_0P75 1
#define RT5651_OVCD_SF_1P0 2
#define RT5651_OVCD_SF_1P5 3
#endif /* __DT_RT5651_H */

36
include/sound/rt5651.h
Просмотреть файл

@ -1,36 +0,0 @@
/*
* linux/sound/rt286.h -- Platform data for RT286
*
* Copyright 2013 Realtek Microelectronics
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __LINUX_SND_RT5651_H
#define __LINUX_SND_RT5651_H
/*
* Note these MUST match the values from the DT binding:
* Documentation/devicetree/bindings/sound/rt5651.txt
*/
enum rt5651_jd_src {
RT5651_JD_NULL,
RT5651_JD1_1,
RT5651_JD1_2,
RT5651_JD2,
};
/*
* Note these MUST match the values from the DT binding:
* Documentation/devicetree/bindings/sound/rt5651.txt
*/
enum rt5651_ovcd_sf {
RT5651_OVCD_SF_0P5,
RT5651_OVCD_SF_0P75,
RT5651_OVCD_SF_1P0,
RT5651_OVCD_SF_1P5,
};
#endif

1
include/sound/rt5659.h
Просмотреть файл

@ -30,6 +30,7 @@ enum rt5659_dmic2_data_pin {
enum rt5659_jd_src { enum rt5659_jd_src {
RT5659_JD_NULL, RT5659_JD_NULL,
RT5659_JD3, RT5659_JD3,
RT5659_JD_HDA_HEADER,
}; };
struct rt5659_platform_data { struct rt5659_platform_data {

4
sound/soc/amd/acp-rt5645.c
Просмотреть файл

@ -71,9 +71,9 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd)
{ {
int ret; int ret;
struct snd_soc_card *card; struct snd_soc_card *card;
struct snd_soc_codec *codec; struct snd_soc_component *codec;
codec = rtd->codec; codec = rtd->codec_dai->component;
card = rtd->card; card = rtd->card;
ret = snd_soc_card_jack_new(card, "Headset Jack", ret = snd_soc_card_jack_new(card, "Headset Jack",

370
sound/soc/codecs/rt5645.c
Просмотреть файл

@ -407,7 +407,7 @@ static const char *const rt5645_supply_names[] = {
}; };
struct rt5645_priv { struct rt5645_priv {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct rt5645_platform_data pdata; struct rt5645_platform_data pdata;
struct regmap *regmap; struct regmap *regmap;
struct i2c_client *i2c; struct i2c_client *i2c;
@ -437,9 +437,9 @@ struct rt5645_priv {
int v_id; int v_id;
}; };
static int rt5645_reset(struct snd_soc_codec *codec) static int rt5645_reset(struct snd_soc_component *component)
{ {
return snd_soc_write(codec, RT5645_RESET, 0); return snd_soc_component_write(component, RT5645_RESET, 0);
} }
static bool rt5645_volatile_register(struct device *dev, unsigned int reg) static bool rt5645_volatile_register(struct device *dev, unsigned int reg)
@ -846,17 +846,17 @@ static const struct snd_kcontrol_new rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
int idx, rate; int idx, rate;
rate = rt5645->sysclk / rl6231_get_pre_div(rt5645->regmap, rate = rt5645->sysclk / rl6231_get_pre_div(rt5645->regmap,
RT5645_ADDA_CLK1, RT5645_I2S_PD1_SFT); RT5645_ADDA_CLK1, RT5645_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, RT5645_DMIC_CTRL1, snd_soc_component_update_bits(component, RT5645_DMIC_CTRL1,
RT5645_DMIC_CLK_MASK, idx << RT5645_DMIC_CLK_SFT); RT5645_DMIC_CLK_MASK, idx << RT5645_DMIC_CLK_SFT);
return idx; return idx;
} }
@ -864,10 +864,10 @@ 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);
unsigned int val; unsigned int val;
val = snd_soc_read(codec, RT5645_GLB_CLK); val = snd_soc_component_read32(component, RT5645_GLB_CLK);
val &= RT5645_SCLK_SRC_MASK; val &= RT5645_SCLK_SRC_MASK;
if (val == RT5645_SCLK_SRC_PLL1) if (val == RT5645_SCLK_SRC_PLL1)
return 1; return 1;
@ -878,7 +878,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) {
@ -910,7 +910,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:
@ -923,9 +923,9 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source,
} }
static int rt5645_enable_hweq(struct snd_soc_codec *codec) static int rt5645_enable_hweq(struct snd_soc_component *component)
{ {
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
int i; int i;
for (i = 0; i < RT5645_HWEQ_NUM; i++) { for (i = 0; i < RT5645_HWEQ_NUM; i++) {
@ -941,7 +941,7 @@ static int rt5645_enable_hweq(struct snd_soc_codec *codec)
/** /**
* rt5645_sel_asrc_clk_src - select ASRC clock source for a set of filters * rt5645_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
* *
@ -953,7 +953,7 @@ static int rt5645_enable_hweq(struct snd_soc_codec *codec)
* 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 rt5645_sel_asrc_clk_src(struct snd_soc_codec *codec, int rt5645_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; unsigned int asrc2_mask = 0;
@ -1009,11 +1009,11 @@ int rt5645_sel_asrc_clk_src(struct snd_soc_codec *codec,
} }
if (asrc2_mask) if (asrc2_mask)
snd_soc_update_bits(codec, RT5645_ASRC_2, snd_soc_component_update_bits(component, RT5645_ASRC_2,
asrc2_mask, asrc2_value); asrc2_mask, asrc2_value);
if (asrc3_mask) if (asrc3_mask)
snd_soc_update_bits(codec, RT5645_ASRC_3, snd_soc_component_update_bits(component, RT5645_ASRC_3,
asrc3_mask, asrc3_value); asrc3_mask, asrc3_value);
return 0; return 0;
@ -1678,56 +1678,56 @@ static const struct snd_kcontrol_new pdm1_r_vol_control =
SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_PDM_OUT_CTRL, SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_PDM_OUT_CTRL,
RT5645_M_PDM1_R, 1, 1); RT5645_M_PDM1_R, 1, 1);
static void hp_amp_power(struct snd_soc_codec *codec, int on) static void hp_amp_power(struct snd_soc_component *component, int on)
{ {
static int hp_amp_power_count; static int hp_amp_power_count;
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
if (on) { if (on) {
if (hp_amp_power_count <= 0) { if (hp_amp_power_count <= 0) {
if (rt5645->codec_type == CODEC_TYPE_RT5650) { if (rt5645->codec_type == CODEC_TYPE_RT5650) {
snd_soc_write(codec, RT5645_DEPOP_M2, 0x3100); snd_soc_component_write(component, RT5645_DEPOP_M2, 0x3100);
snd_soc_write(codec, RT5645_CHARGE_PUMP, snd_soc_component_write(component, RT5645_CHARGE_PUMP,
0x0e06); 0x0e06);
snd_soc_write(codec, RT5645_DEPOP_M1, 0x000d); snd_soc_component_write(component, RT5645_DEPOP_M1, 0x000d);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_HP_DCC_INT1, 0x9f01); RT5645_HP_DCC_INT1, 0x9f01);
msleep(20); msleep(20);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_HP_CO_MASK, RT5645_HP_CO_EN); RT5645_HP_CO_MASK, RT5645_HP_CO_EN);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
0x3e, 0x7400); 0x3e, 0x7400);
snd_soc_write(codec, RT5645_DEPOP_M3, 0x0737); snd_soc_component_write(component, RT5645_DEPOP_M3, 0x0737);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_MAMP_INT_REG2, 0xfc00); RT5645_MAMP_INT_REG2, 0xfc00);
snd_soc_write(codec, RT5645_DEPOP_M2, 0x1140); snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1140);
msleep(90); msleep(90);
rt5645->hp_on = true; rt5645->hp_on = true;
} else { } else {
/* depop parameters */ /* depop parameters */
snd_soc_update_bits(codec, RT5645_DEPOP_M2, snd_soc_component_update_bits(component, RT5645_DEPOP_M2,
RT5645_DEPOP_MASK, RT5645_DEPOP_MAN); RT5645_DEPOP_MASK, RT5645_DEPOP_MAN);
snd_soc_write(codec, RT5645_DEPOP_M1, 0x000d); snd_soc_component_write(component, RT5645_DEPOP_M1, 0x000d);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_HP_DCC_INT1, 0x9f01); RT5645_HP_DCC_INT1, 0x9f01);
mdelay(150); mdelay(150);
/* headphone amp power on */ /* headphone amp power on */
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_FV1 | RT5645_PWR_FV2, 0); RT5645_PWR_FV1 | RT5645_PWR_FV2, 0);
snd_soc_update_bits(codec, RT5645_PWR_VOL, snd_soc_component_update_bits(component, RT5645_PWR_VOL,
RT5645_PWR_HV_L | RT5645_PWR_HV_R, RT5645_PWR_HV_L | RT5645_PWR_HV_R,
RT5645_PWR_HV_L | RT5645_PWR_HV_R); RT5645_PWR_HV_L | RT5645_PWR_HV_R);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_HP_L | RT5645_PWR_HP_R | RT5645_PWR_HP_L | RT5645_PWR_HP_R |
RT5645_PWR_HA, RT5645_PWR_HA,
RT5645_PWR_HP_L | RT5645_PWR_HP_R | RT5645_PWR_HP_L | RT5645_PWR_HP_R |
RT5645_PWR_HA); RT5645_PWR_HA);
mdelay(5); mdelay(5);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_FV1 | RT5645_PWR_FV2, RT5645_PWR_FV1 | RT5645_PWR_FV2,
RT5645_PWR_FV1 | RT5645_PWR_FV2); RT5645_PWR_FV1 | RT5645_PWR_FV2);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_HP_CO_MASK | RT5645_HP_SG_MASK, RT5645_HP_CO_MASK | RT5645_HP_SG_MASK,
RT5645_HP_CO_EN | RT5645_HP_SG_EN); RT5645_HP_CO_EN | RT5645_HP_SG_EN);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
@ -1743,15 +1743,15 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)
if (rt5645->codec_type == CODEC_TYPE_RT5650) { if (rt5645->codec_type == CODEC_TYPE_RT5650) {
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
0x3e, 0x7400); 0x3e, 0x7400);
snd_soc_write(codec, RT5645_DEPOP_M3, 0x0737); snd_soc_component_write(component, RT5645_DEPOP_M3, 0x0737);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_MAMP_INT_REG2, 0xfc00); RT5645_MAMP_INT_REG2, 0xfc00);
snd_soc_write(codec, RT5645_DEPOP_M2, 0x1140); snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1140);
msleep(100); msleep(100);
snd_soc_write(codec, RT5645_DEPOP_M1, 0x0001); snd_soc_component_write(component, RT5645_DEPOP_M1, 0x0001);
} else { } else {
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_HP_SG_MASK | RT5645_HP_SG_MASK |
RT5645_HP_L_SMT_MASK | RT5645_HP_L_SMT_MASK |
RT5645_HP_R_SMT_MASK, RT5645_HP_R_SMT_MASK,
@ -1759,11 +1759,11 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)
RT5645_HP_L_SMT_DIS | RT5645_HP_L_SMT_DIS |
RT5645_HP_R_SMT_DIS); RT5645_HP_R_SMT_DIS);
/* headphone amp power down */ /* headphone amp power down */
snd_soc_write(codec, RT5645_DEPOP_M1, 0x0000); snd_soc_component_write(component, RT5645_DEPOP_M1, 0x0000);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_HP_L | RT5645_PWR_HP_R | RT5645_PWR_HP_L | RT5645_PWR_HP_R |
RT5645_PWR_HA, 0); RT5645_PWR_HA, 0);
snd_soc_update_bits(codec, RT5645_DEPOP_M2, snd_soc_component_update_bits(component, RT5645_DEPOP_M2,
RT5645_DEPOP_MASK, 0); RT5645_DEPOP_MASK, 0);
} }
} }
@ -1773,15 +1773,15 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)
static int rt5645_hp_event(struct snd_soc_dapm_widget *w, static int rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
hp_amp_power(codec, 1); hp_amp_power(component, 1);
/* headphone unmute sequence */ /* headphone unmute sequence */
if (rt5645->codec_type == CODEC_TYPE_RT5645) { if (rt5645->codec_type == CODEC_TYPE_RT5645) {
snd_soc_update_bits(codec, RT5645_DEPOP_M3, snd_soc_component_update_bits(component, RT5645_DEPOP_M3,
RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK | RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
RT5645_CP_FQ3_MASK, RT5645_CP_FQ3_MASK,
(RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) | (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) |
@ -1789,16 +1789,16 @@ static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
(RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT)); (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT));
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_MAMP_INT_REG2, 0xfc00); RT5645_MAMP_INT_REG2, 0xfc00);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_SMT_TRIG_MASK, RT5645_SMT_TRIG_EN); RT5645_SMT_TRIG_MASK, RT5645_SMT_TRIG_EN);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_RSTN_MASK, RT5645_RSTN_EN); RT5645_RSTN_MASK, RT5645_RSTN_EN);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_RSTN_MASK | RT5645_HP_L_SMT_MASK | RT5645_RSTN_MASK | RT5645_HP_L_SMT_MASK |
RT5645_HP_R_SMT_MASK, RT5645_RSTN_DIS | RT5645_HP_R_SMT_MASK, RT5645_RSTN_DIS |
RT5645_HP_L_SMT_EN | RT5645_HP_R_SMT_EN); RT5645_HP_L_SMT_EN | RT5645_HP_R_SMT_EN);
msleep(40); msleep(40);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_HP_SG_MASK | RT5645_HP_L_SMT_MASK | RT5645_HP_SG_MASK | RT5645_HP_L_SMT_MASK |
RT5645_HP_R_SMT_MASK, RT5645_HP_SG_DIS | RT5645_HP_R_SMT_MASK, RT5645_HP_SG_DIS |
RT5645_HP_L_SMT_DIS | RT5645_HP_R_SMT_DIS); RT5645_HP_L_SMT_DIS | RT5645_HP_R_SMT_DIS);
@ -1808,7 +1808,7 @@ static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
/* headphone mute sequence */ /* headphone mute sequence */
if (rt5645->codec_type == CODEC_TYPE_RT5645) { if (rt5645->codec_type == CODEC_TYPE_RT5645) {
snd_soc_update_bits(codec, RT5645_DEPOP_M3, snd_soc_component_update_bits(component, RT5645_DEPOP_M3,
RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK | RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
RT5645_CP_FQ3_MASK, RT5645_CP_FQ3_MASK,
(RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) | (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) |
@ -1816,17 +1816,17 @@ static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
(RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT)); (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT));
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_MAMP_INT_REG2, 0xfc00); RT5645_MAMP_INT_REG2, 0xfc00);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_HP_SG_MASK, RT5645_HP_SG_EN); RT5645_HP_SG_MASK, RT5645_HP_SG_EN);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_RSTP_MASK, RT5645_RSTP_EN); RT5645_RSTP_MASK, RT5645_RSTP_EN);
snd_soc_update_bits(codec, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_RSTP_MASK | RT5645_HP_L_SMT_MASK | RT5645_RSTP_MASK | RT5645_HP_L_SMT_MASK |
RT5645_HP_R_SMT_MASK, RT5645_RSTP_DIS | RT5645_HP_R_SMT_MASK, RT5645_RSTP_DIS |
RT5645_HP_L_SMT_EN | RT5645_HP_R_SMT_EN); RT5645_HP_L_SMT_EN | RT5645_HP_R_SMT_EN);
msleep(30); msleep(30);
} }
hp_amp_power(codec, 0); hp_amp_power(component, 0);
break; break;
default: default:
@ -1839,25 +1839,25 @@ static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
static int rt5645_spk_event(struct snd_soc_dapm_widget *w, static int rt5645_spk_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:
rt5645_enable_hweq(codec); rt5645_enable_hweq(component);
snd_soc_update_bits(codec, RT5645_PWR_DIG1, snd_soc_component_update_bits(component, RT5645_PWR_DIG1,
RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
RT5645_PWR_CLS_D_L, RT5645_PWR_CLS_D_L,
RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
RT5645_PWR_CLS_D_L); RT5645_PWR_CLS_D_L);
snd_soc_update_bits(codec, RT5645_GEN_CTRL3, snd_soc_component_update_bits(component, RT5645_GEN_CTRL3,
RT5645_DET_CLK_MASK, RT5645_DET_CLK_MODE1); RT5645_DET_CLK_MASK, RT5645_DET_CLK_MODE1);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5645_GEN_CTRL3, snd_soc_component_update_bits(component, RT5645_GEN_CTRL3,
RT5645_DET_CLK_MASK, RT5645_DET_CLK_DIS); RT5645_DET_CLK_MASK, RT5645_DET_CLK_DIS);
snd_soc_write(codec, RT5645_EQ_CTRL2, 0); snd_soc_component_write(component, RT5645_EQ_CTRL2, 0);
snd_soc_update_bits(codec, RT5645_PWR_DIG1, snd_soc_component_update_bits(component, RT5645_PWR_DIG1,
RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
RT5645_PWR_CLS_D_L, 0); RT5645_PWR_CLS_D_L, 0);
break; break;
@ -1872,24 +1872,24 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w,
static int rt5645_lout_event(struct snd_soc_dapm_widget *w, static int rt5645_lout_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:
hp_amp_power(codec, 1); hp_amp_power(component, 1);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_LM, RT5645_PWR_LM); RT5645_PWR_LM, RT5645_PWR_LM);
snd_soc_update_bits(codec, RT5645_LOUT1, snd_soc_component_update_bits(component, RT5645_LOUT1,
RT5645_L_MUTE | RT5645_R_MUTE, 0); RT5645_L_MUTE | RT5645_R_MUTE, 0);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5645_LOUT1, snd_soc_component_update_bits(component, RT5645_LOUT1,
RT5645_L_MUTE | RT5645_R_MUTE, RT5645_L_MUTE | RT5645_R_MUTE,
RT5645_L_MUTE | RT5645_R_MUTE); RT5645_L_MUTE | RT5645_R_MUTE);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_LM, 0); RT5645_PWR_LM, 0);
hp_amp_power(codec, 0); hp_amp_power(component, 0);
break; break;
default: default:
@ -1902,16 +1902,16 @@ static int rt5645_lout_event(struct snd_soc_dapm_widget *w,
static int rt5645_bst2_event(struct snd_soc_dapm_widget *w, static int rt5645_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, RT5645_PWR_ANLG2, snd_soc_component_update_bits(component, RT5645_PWR_ANLG2,
RT5645_PWR_BST2_P, RT5645_PWR_BST2_P); RT5645_PWR_BST2_P, RT5645_PWR_BST2_P);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5645_PWR_ANLG2, snd_soc_component_update_bits(component, RT5645_PWR_ANLG2,
RT5645_PWR_BST2_P, 0); RT5645_PWR_BST2_P, 0);
break; break;
@ -1925,8 +1925,8 @@ static int rt5645_bst2_event(struct snd_soc_dapm_widget *w,
static int rt5650_hp_event(struct snd_soc_dapm_widget *w, static int rt5650_hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event) struct snd_kcontrol *k, 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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
@ -1946,17 +1946,17 @@ static int rt5650_hp_event(struct snd_soc_dapm_widget *w,
static int rt5645_set_micbias1_event(struct snd_soc_dapm_widget *w, static int rt5645_set_micbias1_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event) struct snd_kcontrol *k, 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_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
snd_soc_update_bits(codec, RT5645_GEN_CTRL2, snd_soc_component_update_bits(component, RT5645_GEN_CTRL2,
RT5645_MICBIAS1_POW_CTRL_SEL_MASK, RT5645_MICBIAS1_POW_CTRL_SEL_MASK,
RT5645_MICBIAS1_POW_CTRL_SEL_M); RT5645_MICBIAS1_POW_CTRL_SEL_M);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_soc_update_bits(codec, RT5645_GEN_CTRL2, snd_soc_component_update_bits(component, RT5645_GEN_CTRL2,
RT5645_MICBIAS1_POW_CTRL_SEL_MASK, RT5645_MICBIAS1_POW_CTRL_SEL_MASK,
RT5645_MICBIAS1_POW_CTRL_SEL_A); RT5645_MICBIAS1_POW_CTRL_SEL_A);
break; break;
@ -1971,17 +1971,17 @@ static int rt5645_set_micbias1_event(struct snd_soc_dapm_widget *w,
static int rt5645_set_micbias2_event(struct snd_soc_dapm_widget *w, static int rt5645_set_micbias2_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event) struct snd_kcontrol *k, 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_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
snd_soc_update_bits(codec, RT5645_GEN_CTRL2, snd_soc_component_update_bits(component, RT5645_GEN_CTRL2,
RT5645_MICBIAS2_POW_CTRL_SEL_MASK, RT5645_MICBIAS2_POW_CTRL_SEL_MASK,
RT5645_MICBIAS2_POW_CTRL_SEL_M); RT5645_MICBIAS2_POW_CTRL_SEL_M);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_soc_update_bits(codec, RT5645_GEN_CTRL2, snd_soc_component_update_bits(component, RT5645_GEN_CTRL2,
RT5645_MICBIAS2_POW_CTRL_SEL_MASK, RT5645_MICBIAS2_POW_CTRL_SEL_MASK,
RT5645_MICBIAS2_POW_CTRL_SEL_A); RT5645_MICBIAS2_POW_CTRL_SEL_A);
break; break;
@ -2768,20 +2768,20 @@ static const struct snd_soc_dapm_route rt5645_old_dapm_routes[] = {
static int rt5645_hw_params(struct snd_pcm_substream *substream, static int rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
unsigned int val_len = 0, val_clk, mask_clk, dl_sft; unsigned int val_len = 0, val_clk, mask_clk, dl_sft;
int pre_div, bclk_ms, frame_size; int pre_div, bclk_ms, frame_size;
rt5645->lrck[dai->id] = params_rate(params); rt5645->lrck[dai->id] = params_rate(params);
pre_div = rl6231_get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]); pre_div = rl6231_get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]);
if (pre_div < 0) { if (pre_div < 0) {
dev_err(codec->dev, "Unsupported clock setting\n"); dev_err(component->dev, "Unsupported clock setting\n");
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;
} }
@ -2822,20 +2822,20 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
case RT5645_AIF1: case RT5645_AIF1:
mask_clk = RT5645_I2S_PD1_MASK; mask_clk = RT5645_I2S_PD1_MASK;
val_clk = pre_div << RT5645_I2S_PD1_SFT; val_clk = pre_div << RT5645_I2S_PD1_SFT;
snd_soc_update_bits(codec, RT5645_I2S1_SDP, snd_soc_component_update_bits(component, RT5645_I2S1_SDP,
(0x3 << dl_sft), (val_len << dl_sft)); (0x3 << dl_sft), (val_len << dl_sft));
snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk); snd_soc_component_update_bits(component, RT5645_ADDA_CLK1, mask_clk, val_clk);
break; break;
case RT5645_AIF2: case RT5645_AIF2:
mask_clk = RT5645_I2S_BCLK_MS2_MASK | RT5645_I2S_PD2_MASK; mask_clk = RT5645_I2S_BCLK_MS2_MASK | RT5645_I2S_PD2_MASK;
val_clk = bclk_ms << RT5645_I2S_BCLK_MS2_SFT | val_clk = bclk_ms << RT5645_I2S_BCLK_MS2_SFT |
pre_div << RT5645_I2S_PD2_SFT; pre_div << RT5645_I2S_PD2_SFT;
snd_soc_update_bits(codec, RT5645_I2S2_SDP, snd_soc_component_update_bits(component, RT5645_I2S2_SDP,
(0x3 << dl_sft), (val_len << dl_sft)); (0x3 << dl_sft), (val_len << dl_sft));
snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk); snd_soc_component_update_bits(component, RT5645_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;
} }
@ -2844,8 +2844,8 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
static int rt5645_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0, pol_sft; unsigned int reg_val = 0, pol_sft;
switch (rt5645->codec_type) { switch (rt5645->codec_type) {
@ -2896,17 +2896,17 @@ static int rt5645_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
switch (dai->id) { switch (dai->id) {
case RT5645_AIF1: case RT5645_AIF1:
snd_soc_update_bits(codec, RT5645_I2S1_SDP, snd_soc_component_update_bits(component, RT5645_I2S1_SDP,
RT5645_I2S_MS_MASK | (1 << pol_sft) | RT5645_I2S_MS_MASK | (1 << pol_sft) |
RT5645_I2S_DF_MASK, reg_val); RT5645_I2S_DF_MASK, reg_val);
break; break;
case RT5645_AIF2: case RT5645_AIF2:
snd_soc_update_bits(codec, RT5645_I2S2_SDP, snd_soc_component_update_bits(component, RT5645_I2S2_SDP,
RT5645_I2S_MS_MASK | (1 << pol_sft) | RT5645_I2S_MS_MASK | (1 << pol_sft) |
RT5645_I2S_DF_MASK, reg_val); RT5645_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;
@ -2915,8 +2915,8 @@ static int rt5645_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static int rt5645_set_dai_sysclk(struct snd_soc_dai *dai, static int rt5645_set_dai_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0; unsigned int reg_val = 0;
if (freq == rt5645->sysclk && clk_id == rt5645->sysclk_src) if (freq == rt5645->sysclk && clk_id == rt5645->sysclk_src)
@ -2933,10 +2933,10 @@ static int rt5645_set_dai_sysclk(struct snd_soc_dai *dai,
reg_val |= RT5645_SCLK_SRC_RCCLK; reg_val |= RT5645_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, RT5645_GLB_CLK, snd_soc_component_update_bits(component, RT5645_GLB_CLK,
RT5645_SCLK_SRC_MASK, reg_val); RT5645_SCLK_SRC_MASK, reg_val);
rt5645->sysclk = freq; rt5645->sysclk = freq;
rt5645->sysclk_src = clk_id; rt5645->sysclk_src = clk_id;
@ -2949,8 +2949,8 @@ static int rt5645_set_dai_sysclk(struct snd_soc_dai *dai,
static int rt5645_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
struct rl6231_pll_code pll_code; struct rl6231_pll_code pll_code;
int ret; int ret;
@ -2959,54 +2959,54 @@ static int rt5645_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");
rt5645->pll_in = 0; rt5645->pll_in = 0;
rt5645->pll_out = 0; rt5645->pll_out = 0;
snd_soc_update_bits(codec, RT5645_GLB_CLK, snd_soc_component_update_bits(component, RT5645_GLB_CLK,
RT5645_SCLK_SRC_MASK, RT5645_SCLK_SRC_MCLK); RT5645_SCLK_SRC_MASK, RT5645_SCLK_SRC_MCLK);
return 0; return 0;
} }
switch (source) { switch (source) {
case RT5645_PLL1_S_MCLK: case RT5645_PLL1_S_MCLK:
snd_soc_update_bits(codec, RT5645_GLB_CLK, snd_soc_component_update_bits(component, RT5645_GLB_CLK,
RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_MCLK); RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_MCLK);
break; break;
case RT5645_PLL1_S_BCLK1: case RT5645_PLL1_S_BCLK1:
case RT5645_PLL1_S_BCLK2: case RT5645_PLL1_S_BCLK2:
switch (dai->id) { switch (dai->id) {
case RT5645_AIF1: case RT5645_AIF1:
snd_soc_update_bits(codec, RT5645_GLB_CLK, snd_soc_component_update_bits(component, RT5645_GLB_CLK,
RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_BCLK1); RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_BCLK1);
break; break;
case RT5645_AIF2: case RT5645_AIF2:
snd_soc_update_bits(codec, RT5645_GLB_CLK, snd_soc_component_update_bits(component, RT5645_GLB_CLK,
RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_BCLK2); RT5645_PLL1_SRC_MASK, RT5645_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, RT5645_PLL_CTRL1, snd_soc_component_write(component, RT5645_PLL_CTRL1,
pll_code.n_code << RT5645_PLL_N_SFT | pll_code.k_code); pll_code.n_code << RT5645_PLL_N_SFT | pll_code.k_code);
snd_soc_write(codec, RT5645_PLL_CTRL2, snd_soc_component_write(component, RT5645_PLL_CTRL2,
(pll_code.m_bp ? 0 : pll_code.m_code) << RT5645_PLL_M_SFT | (pll_code.m_bp ? 0 : pll_code.m_code) << RT5645_PLL_M_SFT |
pll_code.m_bp << RT5645_PLL_M_BP_SFT); pll_code.m_bp << RT5645_PLL_M_BP_SFT);
@ -3020,8 +3020,8 @@ static int rt5645_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5645_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;
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
unsigned int i_slot_sft, o_slot_sft, i_width_sht, o_width_sht, en_sft; unsigned int i_slot_sft, o_slot_sft, i_width_sht, o_width_sht, en_sft;
unsigned int mask, val = 0; unsigned int mask, val = 0;
@ -3044,7 +3044,7 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
if (rx_mask || tx_mask) { if (rx_mask || tx_mask) {
val |= (1 << en_sft); val |= (1 << en_sft);
if (rt5645->codec_type == CODEC_TYPE_RT5645) if (rt5645->codec_type == CODEC_TYPE_RT5645)
snd_soc_update_bits(codec, RT5645_BASS_BACK, snd_soc_component_update_bits(component, RT5645_BASS_BACK,
RT5645_G_BB_BST_MASK, RT5645_G_BB_BST_25DB); RT5645_G_BB_BST_MASK, RT5645_G_BB_BST_25DB);
} }
@ -3078,45 +3078,45 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
break; break;
} }
snd_soc_update_bits(codec, RT5645_TDM_CTRL_1, mask, val); snd_soc_component_update_bits(component, RT5645_TDM_CTRL_1, mask, val);
return 0; return 0;
} }
static int rt5645_set_bias_level(struct snd_soc_codec *codec, static int rt5645_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = 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, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_VREF1 | RT5645_PWR_MB |
RT5645_PWR_BG | RT5645_PWR_VREF2, RT5645_PWR_BG | RT5645_PWR_VREF2,
RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_VREF1 | RT5645_PWR_MB |
RT5645_PWR_BG | RT5645_PWR_VREF2); RT5645_PWR_BG | RT5645_PWR_VREF2);
mdelay(10); mdelay(10);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_FV1 | RT5645_PWR_FV2, RT5645_PWR_FV1 | RT5645_PWR_FV2,
RT5645_PWR_FV1 | RT5645_PWR_FV2); RT5645_PWR_FV1 | RT5645_PWR_FV2);
snd_soc_update_bits(codec, RT5645_GEN_CTRL1, snd_soc_component_update_bits(component, RT5645_GEN_CTRL1,
RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL); RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL);
} }
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_VREF1 | RT5645_PWR_MB |
RT5645_PWR_BG | RT5645_PWR_VREF2, RT5645_PWR_BG | RT5645_PWR_VREF2,
RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_VREF1 | RT5645_PWR_MB |
RT5645_PWR_BG | RT5645_PWR_VREF2); RT5645_PWR_BG | RT5645_PWR_VREF2);
mdelay(10); mdelay(10);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_FV1 | RT5645_PWR_FV2, RT5645_PWR_FV1 | RT5645_PWR_FV2,
RT5645_PWR_FV1 | RT5645_PWR_FV2); RT5645_PWR_FV1 | RT5645_PWR_FV2);
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
snd_soc_write(codec, RT5645_DEPOP_M2, 0x1140); snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1140);
msleep(40); msleep(40);
if (rt5645->en_button_func) if (rt5645->en_button_func)
queue_delayed_work(system_power_efficient_wq, queue_delayed_work(system_power_efficient_wq,
@ -3126,11 +3126,11 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_write(codec, RT5645_DEPOP_M2, 0x1100); snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1100);
if (!rt5645->en_button_func) if (!rt5645->en_button_func)
snd_soc_update_bits(codec, RT5645_GEN_CTRL1, snd_soc_component_update_bits(component, RT5645_GEN_CTRL1,
RT5645_DIG_GATE_CTRL, 0); RT5645_DIG_GATE_CTRL, 0);
snd_soc_update_bits(codec, RT5645_PWR_ANLG1, snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_VREF1 | RT5645_PWR_MB |
RT5645_PWR_BG | RT5645_PWR_VREF2 | RT5645_PWR_BG | RT5645_PWR_VREF2 |
RT5645_PWR_FV1 | RT5645_PWR_FV2, 0x0); RT5645_PWR_FV1 | RT5645_PWR_FV2, 0x0);
@ -3143,27 +3143,27 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,
return 0; return 0;
} }
static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec, static void rt5645_enable_push_button_irq(struct snd_soc_component *component,
bool enable) bool enable)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
if (enable) { if (enable) {
snd_soc_dapm_force_enable_pin(dapm, "ADC L power"); snd_soc_dapm_force_enable_pin(dapm, "ADC L power");
snd_soc_dapm_force_enable_pin(dapm, "ADC R power"); snd_soc_dapm_force_enable_pin(dapm, "ADC R power");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD1, 0x3, 0x3); snd_soc_component_update_bits(component, RT5650_4BTN_IL_CMD1, 0x3, 0x3);
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
RT5645_INT_IRQ_ST, 0x8, 0x8); RT5645_INT_IRQ_ST, 0x8, 0x8);
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
RT5650_4BTN_IL_CMD2, 0x8000, 0x8000); RT5650_4BTN_IL_CMD2, 0x8000, 0x8000);
snd_soc_read(codec, RT5650_4BTN_IL_CMD1); snd_soc_component_read32(component, RT5650_4BTN_IL_CMD1);
pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1, pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1,
snd_soc_read(codec, RT5650_4BTN_IL_CMD1)); snd_soc_component_read32(component, RT5650_4BTN_IL_CMD1));
} else { } else {
snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD2, 0x8000, 0x0); snd_soc_component_update_bits(component, RT5650_4BTN_IL_CMD2, 0x8000, 0x0);
snd_soc_update_bits(codec, RT5645_INT_IRQ_ST, 0x8, 0x0); snd_soc_component_update_bits(component, RT5645_INT_IRQ_ST, 0x8, 0x0);
snd_soc_dapm_disable_pin(dapm, "ADC L power"); snd_soc_dapm_disable_pin(dapm, "ADC L power");
snd_soc_dapm_disable_pin(dapm, "ADC R power"); snd_soc_dapm_disable_pin(dapm, "ADC R power");
@ -3171,10 +3171,10 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
} }
} }
static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) static int rt5645_jack_detect(struct snd_soc_component *component, int jack_insert)
{ {
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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
unsigned int val; unsigned int val;
if (jack_insert) { if (jack_insert) {
@ -3208,12 +3208,12 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
msleep(600); msleep(600);
regmap_read(rt5645->regmap, RT5645_IN1_CTRL3, &val); regmap_read(rt5645->regmap, RT5645_IN1_CTRL3, &val);
val &= 0x7; val &= 0x7;
dev_dbg(codec->dev, "val = %d\n", val); dev_dbg(component->dev, "val = %d\n", val);
if (val == 1 || val == 2) { if (val == 1 || val == 2) {
rt5645->jack_type = SND_JACK_HEADSET; rt5645->jack_type = SND_JACK_HEADSET;
if (rt5645->en_button_func) { if (rt5645->en_button_func) {
rt5645_enable_push_button_irq(codec, true); rt5645_enable_push_button_irq(component, true);
} }
} else { } else {
snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_disable_pin(dapm, "Mic Det Power");
@ -3235,7 +3235,7 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
RT5645_CBJ_BST1_EN, 0); RT5645_CBJ_BST1_EN, 0);
if (rt5645->en_button_func) if (rt5645->en_button_func)
rt5645_enable_push_button_irq(codec, false); rt5645_enable_push_button_irq(component, false);
if (rt5645->pdata.jd_mode == 0) if (rt5645->pdata.jd_mode == 0)
snd_soc_dapm_disable_pin(dapm, "LDO2"); snd_soc_dapm_disable_pin(dapm, "LDO2");
@ -3249,25 +3249,25 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
return rt5645->jack_type; return rt5645->jack_type;
} }
static int rt5645_button_detect(struct snd_soc_codec *codec) static int rt5645_button_detect(struct snd_soc_component *component)
{ {
int btn_type, val; int btn_type, val;
val = snd_soc_read(codec, RT5650_4BTN_IL_CMD1); val = snd_soc_component_read32(component, RT5650_4BTN_IL_CMD1);
pr_debug("val=0x%x\n", val); pr_debug("val=0x%x\n", val);
btn_type = val & 0xfff0; btn_type = val & 0xfff0;
snd_soc_write(codec, RT5650_4BTN_IL_CMD1, val); snd_soc_component_write(component, RT5650_4BTN_IL_CMD1, val);
return btn_type; return btn_type;
} }
static irqreturn_t rt5645_irq(int irq, void *data); static irqreturn_t rt5645_irq(int irq, void *data);
int rt5645_set_jack_detect(struct snd_soc_codec *codec, int rt5645_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack,
struct snd_soc_jack *btn_jack) struct snd_soc_jack *btn_jack)
{ {
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
rt5645->hp_jack = hp_jack; rt5645->hp_jack = hp_jack;
rt5645->mic_jack = mic_jack; rt5645->mic_jack = mic_jack;
@ -3291,16 +3291,16 @@ static void rt5645_jack_detect_work(struct work_struct *work)
container_of(work, struct rt5645_priv, jack_detect_work.work); container_of(work, struct rt5645_priv, jack_detect_work.work);
int val, btn_type, gpio_state = 0, report = 0; int val, btn_type, gpio_state = 0, report = 0;
if (!rt5645->codec) if (!rt5645->component)
return; return;
switch (rt5645->pdata.jd_mode) { switch (rt5645->pdata.jd_mode) {
case 0: /* Not using rt5645 JD */ case 0: /* Not using rt5645 JD */
if (rt5645->gpiod_hp_det) { if (rt5645->gpiod_hp_det) {
gpio_state = gpiod_get_value(rt5645->gpiod_hp_det); gpio_state = gpiod_get_value(rt5645->gpiod_hp_det);
dev_dbg(rt5645->codec->dev, "gpio_state = %d\n", dev_dbg(rt5645->component->dev, "gpio_state = %d\n",
gpio_state); gpio_state);
report = rt5645_jack_detect(rt5645->codec, gpio_state); report = rt5645_jack_detect(rt5645->component, gpio_state);
} }
snd_soc_jack_report(rt5645->hp_jack, snd_soc_jack_report(rt5645->hp_jack,
report, SND_JACK_HEADPHONE); report, SND_JACK_HEADPHONE);
@ -3308,20 +3308,20 @@ static void rt5645_jack_detect_work(struct work_struct *work)
report, SND_JACK_MICROPHONE); report, SND_JACK_MICROPHONE);
return; return;
default: /* read rt5645 jd1_1 status */ default: /* read rt5645 jd1_1 status */
val = snd_soc_read(rt5645->codec, RT5645_INT_IRQ_ST) & 0x1000; val = snd_soc_component_read32(rt5645->component, RT5645_INT_IRQ_ST) & 0x1000;
break; break;
} }
if (!val && (rt5645->jack_type == 0)) { /* jack in */ if (!val && (rt5645->jack_type == 0)) { /* jack in */
report = rt5645_jack_detect(rt5645->codec, 1); report = rt5645_jack_detect(rt5645->component, 1);
} else if (!val && rt5645->jack_type != 0) { } else if (!val && rt5645->jack_type != 0) {
/* for push button and jack out */ /* for push button and jack out */
btn_type = 0; btn_type = 0;
if (snd_soc_read(rt5645->codec, RT5645_INT_IRQ_ST) & 0x4) { if (snd_soc_component_read32(rt5645->component, RT5645_INT_IRQ_ST) & 0x4) {
/* button pressed */ /* button pressed */
report = SND_JACK_HEADSET; report = SND_JACK_HEADSET;
btn_type = rt5645_button_detect(rt5645->codec); btn_type = rt5645_button_detect(rt5645->component);
/* rt5650 can report three kinds of button behavior, /* rt5650 can report three kinds of button behavior,
one click, double click and hold. However, one click, double click and hold. However,
currently we will report button pressed/released currently we will report button pressed/released
@ -3351,7 +3351,7 @@ static void rt5645_jack_detect_work(struct work_struct *work)
case 0x0000: /* unpressed */ case 0x0000: /* unpressed */
break; break;
default: default:
dev_err(rt5645->codec->dev, dev_err(rt5645->component->dev,
"Unexpected button code 0x%04x\n", "Unexpected button code 0x%04x\n",
btn_type); btn_type);
break; break;
@ -3366,9 +3366,9 @@ static void rt5645_jack_detect_work(struct work_struct *work)
} else { } else {
/* jack out */ /* jack out */
report = 0; report = 0;
snd_soc_update_bits(rt5645->codec, snd_soc_component_update_bits(rt5645->component,
RT5645_INT_IRQ_ST, 0x1, 0x0); RT5645_INT_IRQ_ST, 0x1, 0x0);
rt5645_jack_detect(rt5645->codec, 0); rt5645_jack_detect(rt5645->component, 0);
} }
snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE);
@ -3406,12 +3406,12 @@ static void rt5645_btn_check_callback(struct timer_list *t)
&rt5645->jack_detect_work, msecs_to_jiffies(5)); &rt5645->jack_detect_work, msecs_to_jiffies(5));
} }
static int rt5645_probe(struct snd_soc_codec *codec) static int rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
rt5645->codec = codec; rt5645->component = component;
switch (rt5645->codec_type) { switch (rt5645->codec_type) {
case CODEC_TYPE_RT5645: case CODEC_TYPE_RT5645:
@ -3437,7 +3437,7 @@ static int rt5645_probe(struct snd_soc_codec *codec)
break; break;
} }
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
/* for JD function */ /* for JD function */
if (rt5645->pdata.jd_mode) { if (rt5645->pdata.jd_mode) {
@ -3447,24 +3447,23 @@ static int rt5645_probe(struct snd_soc_codec *codec)
} }
if (rt5645->pdata.long_name) if (rt5645->pdata.long_name)
codec->component.card->long_name = rt5645->pdata.long_name; component->card->long_name = rt5645->pdata.long_name;
rt5645->eq_param = devm_kzalloc(codec->dev, rt5645->eq_param = devm_kzalloc(component->dev,
RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s), GFP_KERNEL); RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s), GFP_KERNEL);
return 0; return 0;
} }
static int rt5645_remove(struct snd_soc_codec *codec) static void rt5645_remove(struct snd_soc_component *component)
{ {
rt5645_reset(codec); rt5645_reset(component);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int rt5645_suspend(struct snd_soc_codec *codec) static int rt5645_suspend(struct snd_soc_component *component)
{ {
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5645->regmap, true); regcache_cache_only(rt5645->regmap, true);
regcache_mark_dirty(rt5645->regmap); regcache_mark_dirty(rt5645->regmap);
@ -3472,9 +3471,9 @@ static int rt5645_suspend(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int rt5645_resume(struct snd_soc_codec *codec) static int rt5645_resume(struct snd_soc_component *component)
{ {
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5645->regmap, false); regcache_cache_only(rt5645->regmap, false);
regcache_sync(rt5645->regmap); regcache_sync(rt5645->regmap);
@ -3539,21 +3538,21 @@ static struct snd_soc_dai_driver rt5645_dai[] = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_rt5645 = { static const struct snd_soc_component_driver soc_component_dev_rt5645 = {
.probe = rt5645_probe, .probe = rt5645_probe,
.remove = rt5645_remove, .remove = rt5645_remove,
.suspend = rt5645_suspend, .suspend = rt5645_suspend,
.resume = rt5645_resume, .resume = rt5645_resume,
.set_bias_level = rt5645_set_bias_level, .set_bias_level = rt5645_set_bias_level,
.idle_bias_off = true, .controls = rt5645_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(rt5645_snd_controls),
.controls = rt5645_snd_controls, .dapm_widgets = rt5645_dapm_widgets,
.num_controls = ARRAY_SIZE(rt5645_snd_controls), .num_dapm_widgets = ARRAY_SIZE(rt5645_dapm_widgets),
.dapm_widgets = rt5645_dapm_widgets, .dapm_routes = rt5645_dapm_routes,
.num_dapm_widgets = ARRAY_SIZE(rt5645_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(rt5645_dapm_routes),
.dapm_routes = rt5645_dapm_routes, .use_pmdown_time = 1,
.num_dapm_routes = ARRAY_SIZE(rt5645_dapm_routes), .endianness = 1,
}, .non_legacy_dai_naming = 1,
}; };
static const struct regmap_config rt5645_regmap = { static const struct regmap_config rt5645_regmap = {
@ -4028,7 +4027,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
} }
} }
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645, ret = devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_rt5645,
rt5645_dai, ARRAY_SIZE(rt5645_dai)); rt5645_dai, ARRAY_SIZE(rt5645_dai));
if (ret) if (ret)
goto err_irq; goto err_irq;
@ -4054,7 +4053,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c)
cancel_delayed_work_sync(&rt5645->rcclock_work); cancel_delayed_work_sync(&rt5645->rcclock_work);
del_timer_sync(&rt5645->btn_check_timer); del_timer_sync(&rt5645->btn_check_timer);
snd_soc_unregister_codec(&i2c->dev);
regulator_bulk_disable(ARRAY_SIZE(rt5645->supplies), rt5645->supplies); regulator_bulk_disable(ARRAY_SIZE(rt5645->supplies), rt5645->supplies);
return 0; return 0;

4
sound/soc/codecs/rt5645.h
Просмотреть файл

@ -2200,10 +2200,10 @@ enum {
RT5645_AD_MONO_R_FILTER = (0x1 << 5), RT5645_AD_MONO_R_FILTER = (0x1 << 5),
}; };
int rt5645_sel_asrc_clk_src(struct snd_soc_codec *codec, int rt5645_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);
int rt5645_set_jack_detect(struct snd_soc_codec *codec, int rt5645_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack,
struct snd_soc_jack *btn_jack); struct snd_soc_jack *btn_jack);
#endif /* __RT5645_H__ */ #endif /* __RT5645_H__ */

4
sound/soc/codecs/rt5651.h
Просмотреть файл

@ -12,7 +12,7 @@
#ifndef __RT5651_H__ #ifndef __RT5651_H__
#define __RT5651_H__ #define __RT5651_H__
#include <sound/rt5651.h> #include <dt-bindings/sound/rt5651.h>
/* Info */ /* Info */
#define RT5651_RESET 0x00 #define RT5651_RESET 0x00
@ -2073,7 +2073,7 @@ struct rt5651_priv {
struct regmap *regmap; struct regmap *regmap;
struct snd_soc_jack *hp_jack; struct snd_soc_jack *hp_jack;
struct work_struct jack_detect_work; struct work_struct jack_detect_work;
enum rt5651_jd_src jd_src; unsigned int jd_src;
unsigned int ovcd_th; unsigned int ovcd_th;
unsigned int ovcd_sf; unsigned int ovcd_sf;

468
sound/soc/codecs/rt5659.c
Просмотреть файл

@ -1238,26 +1238,26 @@ static SOC_VALUE_ENUM_SINGLE_DECL(
static int rt5659_hp_vol_put(struct snd_kcontrol *kcontrol, static int rt5659_hp_vol_put(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 ret = snd_soc_put_volsw(kcontrol, ucontrol); int ret = snd_soc_put_volsw(kcontrol, ucontrol);
if (snd_soc_read(codec, RT5659_STO_NG2_CTRL_1) & RT5659_NG2_EN) { if (snd_soc_component_read32(component, RT5659_STO_NG2_CTRL_1) & RT5659_NG2_EN) {
snd_soc_update_bits(codec, RT5659_STO_NG2_CTRL_1, snd_soc_component_update_bits(component, RT5659_STO_NG2_CTRL_1,
RT5659_NG2_EN_MASK, RT5659_NG2_DIS); RT5659_NG2_EN_MASK, RT5659_NG2_DIS);
snd_soc_update_bits(codec, RT5659_STO_NG2_CTRL_1, snd_soc_component_update_bits(component, RT5659_STO_NG2_CTRL_1,
RT5659_NG2_EN_MASK, RT5659_NG2_EN); RT5659_NG2_EN_MASK, RT5659_NG2_EN);
} }
return ret; return ret;
} }
static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec, static void rt5659_enable_push_button_irq(struct snd_soc_component *component,
bool enable) bool enable)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
if (enable) { if (enable) {
snd_soc_write(codec, RT5659_4BTN_IL_CMD_1, 0x000b); snd_soc_component_write(component, RT5659_4BTN_IL_CMD_1, 0x000b);
/* MICBIAS1 and Mic Det Power for button detect*/ /* MICBIAS1 and Mic Det Power for button detect*/
snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
@ -1265,19 +1265,19 @@ static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec,
"Mic Det Power"); "Mic Det Power");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
snd_soc_update_bits(codec, RT5659_PWR_ANLG_2, snd_soc_component_update_bits(component, RT5659_PWR_ANLG_2,
RT5659_PWR_MB1, RT5659_PWR_MB1); RT5659_PWR_MB1, RT5659_PWR_MB1);
snd_soc_update_bits(codec, RT5659_PWR_VOL, snd_soc_component_update_bits(component, RT5659_PWR_VOL,
RT5659_PWR_MIC_DET, RT5659_PWR_MIC_DET); RT5659_PWR_MIC_DET, RT5659_PWR_MIC_DET);
snd_soc_update_bits(codec, RT5659_IRQ_CTRL_2, snd_soc_component_update_bits(component, RT5659_IRQ_CTRL_2,
RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_EN); RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_EN);
snd_soc_update_bits(codec, RT5659_4BTN_IL_CMD_2, snd_soc_component_update_bits(component, RT5659_4BTN_IL_CMD_2,
RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_EN); RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_EN);
} else { } else {
snd_soc_update_bits(codec, RT5659_4BTN_IL_CMD_2, snd_soc_component_update_bits(component, RT5659_4BTN_IL_CMD_2,
RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_DIS); RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_DIS);
snd_soc_update_bits(codec, RT5659_IRQ_CTRL_2, snd_soc_component_update_bits(component, RT5659_IRQ_CTRL_2,
RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_DIS); RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_DIS);
/* MICBIAS1 and Mic Det Power for button detect*/ /* MICBIAS1 and Mic Det Power for button detect*/
snd_soc_dapm_disable_pin(dapm, "MICBIAS1"); snd_soc_dapm_disable_pin(dapm, "MICBIAS1");
@ -1288,7 +1288,7 @@ static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec,
/** /**
* rt5659_headset_detect - Detect headset. * rt5659_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.
@ -1296,37 +1296,37 @@ static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec,
* Returns detect status. * Returns detect status.
*/ */
static int rt5659_headset_detect(struct snd_soc_codec *codec, int jack_insert) static int rt5659_headset_detect(struct snd_soc_component *component, int jack_insert)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30}; int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30};
int reg_63; int reg_63;
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
if (jack_insert) { if (jack_insert) {
snd_soc_dapm_force_enable_pin(dapm, snd_soc_dapm_force_enable_pin(dapm,
"Mic Det Power"); "Mic Det Power");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
reg_63 = snd_soc_read(codec, RT5659_PWR_ANLG_1); reg_63 = snd_soc_component_read32(component, RT5659_PWR_ANLG_1);
snd_soc_update_bits(codec, RT5659_PWR_ANLG_1, snd_soc_component_update_bits(component, RT5659_PWR_ANLG_1,
RT5659_PWR_VREF2 | RT5659_PWR_MB, RT5659_PWR_VREF2 | RT5659_PWR_MB,
RT5659_PWR_VREF2 | RT5659_PWR_MB); RT5659_PWR_VREF2 | RT5659_PWR_MB);
msleep(20); msleep(20);
snd_soc_update_bits(codec, RT5659_PWR_ANLG_1, snd_soc_component_update_bits(component, RT5659_PWR_ANLG_1,
RT5659_PWR_FV2, RT5659_PWR_FV2); RT5659_PWR_FV2, RT5659_PWR_FV2);
snd_soc_write(codec, RT5659_EJD_CTRL_2, 0x4160); snd_soc_component_write(component, RT5659_EJD_CTRL_2, 0x4160);
snd_soc_update_bits(codec, RT5659_EJD_CTRL_1, snd_soc_component_update_bits(component, RT5659_EJD_CTRL_1,
0x20, 0x0); 0x20, 0x0);
msleep(20); msleep(20);
snd_soc_update_bits(codec, RT5659_EJD_CTRL_1, snd_soc_component_update_bits(component, RT5659_EJD_CTRL_1,
0x20, 0x20); 0x20, 0x20);
while (i < 5) { while (i < 5) {
msleep(sleep_time[i]); msleep(sleep_time[i]);
val = snd_soc_read(codec, RT5659_EJD_CTRL_2) & 0x0003; val = snd_soc_component_read32(component, RT5659_EJD_CTRL_2) & 0x0003;
i++; i++;
if (val == 0x1 || val == 0x2 || val == 0x3) if (val == 0x1 || val == 0x2 || val == 0x3)
break; break;
@ -1335,10 +1335,10 @@ static int rt5659_headset_detect(struct snd_soc_codec *codec, int jack_insert)
switch (val) { switch (val) {
case 1: case 1:
rt5659->jack_type = SND_JACK_HEADSET; rt5659->jack_type = SND_JACK_HEADSET;
rt5659_enable_push_button_irq(codec, true); rt5659_enable_push_button_irq(component, true);
break; break;
default: default:
snd_soc_write(codec, RT5659_PWR_ANLG_1, reg_63); snd_soc_component_write(component, RT5659_PWR_ANLG_1, reg_63);
rt5659->jack_type = SND_JACK_HEADPHONE; rt5659->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);
@ -1348,21 +1348,21 @@ static int rt5659_headset_detect(struct snd_soc_codec *codec, int jack_insert)
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);
if (rt5659->jack_type == SND_JACK_HEADSET) if (rt5659->jack_type == SND_JACK_HEADSET)
rt5659_enable_push_button_irq(codec, false); rt5659_enable_push_button_irq(component, false);
rt5659->jack_type = 0; rt5659->jack_type = 0;
} }
dev_dbg(codec->dev, "jack_type = %d\n", rt5659->jack_type); dev_dbg(component->dev, "jack_type = %d\n", rt5659->jack_type);
return rt5659->jack_type; return rt5659->jack_type;
} }
static int rt5659_button_detect(struct snd_soc_codec *codec) static int rt5659_button_detect(struct snd_soc_component *component)
{ {
int btn_type, val; int btn_type, val;
val = snd_soc_read(codec, RT5659_4BTN_IL_CMD_1); val = snd_soc_component_read32(component, RT5659_4BTN_IL_CMD_1);
btn_type = val & 0xfff0; btn_type = val & 0xfff0;
snd_soc_write(codec, RT5659_4BTN_IL_CMD_1, val); snd_soc_component_write(component, RT5659_4BTN_IL_CMD_1, val);
return btn_type; return btn_type;
} }
@ -1377,10 +1377,10 @@ static irqreturn_t rt5659_irq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
int rt5659_set_jack_detect(struct snd_soc_codec *codec, int rt5659_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *hs_jack) struct snd_soc_jack *hs_jack)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
rt5659->hs_jack = hs_jack; rt5659->hs_jack = hs_jack;
@ -1396,19 +1396,19 @@ static void rt5659_jack_detect_work(struct work_struct *work)
container_of(work, struct rt5659_priv, jack_detect_work.work); container_of(work, struct rt5659_priv, jack_detect_work.work);
int val, btn_type, report = 0; int val, btn_type, report = 0;
if (!rt5659->codec) if (!rt5659->component)
return; return;
val = snd_soc_read(rt5659->codec, RT5659_INT_ST_1) & 0x0080; val = snd_soc_component_read32(rt5659->component, RT5659_INT_ST_1) & 0x0080;
if (!val) { if (!val) {
/* jack in */ /* jack in */
if (rt5659->jack_type == 0) { if (rt5659->jack_type == 0) {
/* jack was out, report jack type */ /* jack was out, report jack type */
report = rt5659_headset_detect(rt5659->codec, 1); report = rt5659_headset_detect(rt5659->component, 1);
} else { } else {
/* jack is already in, report button event */ /* jack is already in, report button event */
report = SND_JACK_HEADSET; report = SND_JACK_HEADSET;
btn_type = rt5659_button_detect(rt5659->codec); btn_type = rt5659_button_detect(rt5659->component);
/** /**
* rt5659 can report three kinds of button behavior, * rt5659 can report three kinds of button behavior,
* one click, double click and hold. However, * one click, double click and hold. However,
@ -1441,7 +1441,7 @@ static void rt5659_jack_detect_work(struct work_struct *work)
break; break;
default: default:
btn_type = 0; btn_type = 0;
dev_err(rt5659->codec->dev, dev_err(rt5659->component->dev,
"Unexpected button code 0x%04x\n", "Unexpected button code 0x%04x\n",
btn_type); btn_type);
break; break;
@ -1453,7 +1453,7 @@ static void rt5659_jack_detect_work(struct work_struct *work)
} }
} else { } else {
/* jack out */ /* jack out */
report = rt5659_headset_detect(rt5659->codec, 0); report = rt5659_headset_detect(rt5659->component, 0);
} }
snd_soc_jack_report(rt5659->hs_jack, report, SND_JACK_HEADSET | snd_soc_jack_report(rt5659->hs_jack, report, SND_JACK_HEADSET |
@ -1461,6 +1461,61 @@ static void rt5659_jack_detect_work(struct work_struct *work)
SND_JACK_BTN_2 | SND_JACK_BTN_3); SND_JACK_BTN_2 | SND_JACK_BTN_3);
} }
static void rt5659_jack_detect_intel_hd_header(struct work_struct *work)
{
struct rt5659_priv *rt5659 =
container_of(work, struct rt5659_priv, jack_detect_work.work);
unsigned int value;
bool hp_flag, mic_flag;
if (!rt5659->hs_jack)
return;
/* headphone jack */
regmap_read(rt5659->regmap, RT5659_GPIO_STA, &value);
hp_flag = (!(value & 0x8)) ? true : false;
if (hp_flag != rt5659->hda_hp_plugged) {
rt5659->hda_hp_plugged = hp_flag;
if (hp_flag) {
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_1,
0x10, 0x0);
rt5659->jack_type |= SND_JACK_HEADPHONE;
} else {
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_1,
0x10, 0x10);
rt5659->jack_type = rt5659->jack_type &
(~SND_JACK_HEADPHONE);
}
snd_soc_jack_report(rt5659->hs_jack, rt5659->jack_type,
SND_JACK_HEADPHONE);
}
/* mic jack */
regmap_read(rt5659->regmap, RT5659_4BTN_IL_CMD_1, &value);
regmap_write(rt5659->regmap, RT5659_4BTN_IL_CMD_1, value);
mic_flag = (value & 0x2000) ? true : false;
if (mic_flag != rt5659->hda_mic_plugged) {
rt5659->hda_mic_plugged = mic_flag;
if (mic_flag) {
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_2,
0x2, 0x2);
rt5659->jack_type |= SND_JACK_MICROPHONE;
} else {
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_2,
0x2, 0x0);
rt5659->jack_type = rt5659->jack_type
& (~SND_JACK_MICROPHONE);
}
snd_soc_jack_report(rt5659->hs_jack, rt5659->jack_type,
SND_JACK_MICROPHONE);
}
}
static const struct snd_kcontrol_new rt5659_snd_controls[] = { static const struct snd_kcontrol_new rt5659_snd_controls[] = {
/* Speaker Output Volume */ /* Speaker Output Volume */
SOC_DOUBLE_TLV("Speaker Playback Volume", RT5659_SPO_VOL, SOC_DOUBLE_TLV("Speaker Playback Volume", RT5659_SPO_VOL,
@ -1550,8 +1605,8 @@ static const struct snd_kcontrol_new rt5659_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 rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
int pd, idx = -EINVAL; int pd, idx = -EINVAL;
pd = rl6231_get_pre_div(rt5659->regmap, pd = rl6231_get_pre_div(rt5659->regmap,
@ -1559,29 +1614,55 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
idx = rl6231_calc_dmic_clk(rt5659->sysclk / pd); idx = rl6231_calc_dmic_clk(rt5659->sysclk / pd);
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, RT5659_DMIC_CTRL_1, snd_soc_component_update_bits(component, RT5659_DMIC_CTRL_1,
RT5659_DMIC_CLK_MASK, idx << RT5659_DMIC_CLK_SFT); RT5659_DMIC_CLK_MASK, idx << RT5659_DMIC_CLK_SFT);
} }
return idx; return idx;
} }
static int set_adc_clk(struct snd_soc_dapm_widget *w, static int set_adc1_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);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_update_bits(codec, RT5659_CHOP_ADC, snd_soc_component_update_bits(component, RT5659_CHOP_ADC,
RT5659_CKXEN_ADCC_MASK | RT5659_CKGEN_ADCC_MASK, RT5659_CKXEN_ADC1_MASK | RT5659_CKGEN_ADC1_MASK,
RT5659_CKXEN_ADCC_MASK | RT5659_CKGEN_ADCC_MASK); RT5659_CKXEN_ADC1_MASK | RT5659_CKGEN_ADC1_MASK);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5659_CHOP_ADC, snd_soc_component_update_bits(component, RT5659_CHOP_ADC,
RT5659_CKXEN_ADCC_MASK | RT5659_CKGEN_ADCC_MASK, 0); RT5659_CKXEN_ADC1_MASK | RT5659_CKGEN_ADC1_MASK, 0);
break;
default:
return 0;
}
return 0;
}
static int set_adc2_clk(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm);
switch (event) {
case SND_SOC_DAPM_POST_PMU:
snd_soc_component_update_bits(component, RT5659_CHOP_ADC,
RT5659_CKXEN_ADC2_MASK | RT5659_CKGEN_ADC2_MASK,
RT5659_CKXEN_ADC2_MASK | RT5659_CKGEN_ADC2_MASK);
break;
case SND_SOC_DAPM_PRE_PMD:
snd_soc_component_update_bits(component, RT5659_CHOP_ADC,
RT5659_CKXEN_ADC2_MASK | RT5659_CKGEN_ADC2_MASK, 0);
break; break;
default: default:
@ -1595,15 +1676,15 @@ static int set_adc_clk(struct snd_soc_dapm_widget *w,
static int rt5659_charge_pump_event(struct snd_soc_dapm_widget *w, static int rt5659_charge_pump_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_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
/* Depop */ /* Depop */
snd_soc_write(codec, RT5659_DEPOP_1, 0x0009); snd_soc_component_write(component, RT5659_DEPOP_1, 0x0009);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_soc_write(codec, RT5659_HP_CHARGE_PUMP_1, 0x0c16); snd_soc_component_write(component, RT5659_HP_CHARGE_PUMP_1, 0x0c16);
break; break;
default: default:
return 0; return 0;
@ -1616,9 +1697,9 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *w,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
unsigned int val; unsigned int val;
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
val = snd_soc_read(codec, RT5659_GLB_CLK); val = snd_soc_component_read32(component, RT5659_GLB_CLK);
val &= RT5659_SCLK_SRC_MASK; val &= RT5659_SCLK_SRC_MASK;
if (val == RT5659_SCLK_SRC_PLL1) if (val == RT5659_SCLK_SRC_PLL1)
return 1; return 1;
@ -1630,7 +1711,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *w,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
unsigned int reg, shift, val; unsigned int reg, shift, val;
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 (w->shift) { switch (w->shift) {
case RT5659_ADC_MONO_R_ASRC_SFT: case RT5659_ADC_MONO_R_ASRC_SFT:
@ -1661,13 +1742,13 @@ static int is_using_asrc(struct snd_soc_dapm_widget *w,
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:
case 3: case 3:
/* I2S_Pre_Div1 should be 1 in asrc mode */ /* I2S_Pre_Div1 should be 1 in asrc mode */
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1,
RT5659_I2S_PD1_MASK, RT5659_I2S_PD1_2); RT5659_I2S_PD1_MASK, RT5659_I2S_PD1_2);
return 1; return 1;
default: default:
@ -2303,24 +2384,24 @@ static const struct snd_kcontrol_new pdm_r_switch =
static int rt5659_spk_event(struct snd_soc_dapm_widget *w, static int rt5659_spk_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_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
snd_soc_update_bits(codec, RT5659_CLASSD_CTRL_1, snd_soc_component_update_bits(component, RT5659_CLASSD_CTRL_1,
RT5659_POW_CLSD_DB_MASK, RT5659_POW_CLSD_DB_EN); RT5659_POW_CLSD_DB_MASK, RT5659_POW_CLSD_DB_EN);
snd_soc_update_bits(codec, RT5659_CLASSD_2, snd_soc_component_update_bits(component, RT5659_CLASSD_2,
RT5659_M_RI_DIG, RT5659_M_RI_DIG); RT5659_M_RI_DIG, RT5659_M_RI_DIG);
snd_soc_write(codec, RT5659_CLASSD_1, 0x0803); snd_soc_component_write(component, RT5659_CLASSD_1, 0x0803);
snd_soc_write(codec, RT5659_SPK_DC_CAILB_CTRL_3, 0x0000); snd_soc_component_write(component, RT5659_SPK_DC_CAILB_CTRL_3, 0x0000);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_soc_write(codec, RT5659_CLASSD_1, 0x0011); snd_soc_component_write(component, RT5659_CLASSD_1, 0x0011);
snd_soc_update_bits(codec, RT5659_CLASSD_2, snd_soc_component_update_bits(component, RT5659_CLASSD_2,
RT5659_M_RI_DIG, 0x0); RT5659_M_RI_DIG, 0x0);
snd_soc_write(codec, RT5659_SPK_DC_CAILB_CTRL_3, 0x0003); snd_soc_component_write(component, RT5659_SPK_DC_CAILB_CTRL_3, 0x0003);
snd_soc_update_bits(codec, RT5659_CLASSD_CTRL_1, snd_soc_component_update_bits(component, RT5659_CLASSD_CTRL_1,
RT5659_POW_CLSD_DB_MASK, RT5659_POW_CLSD_DB_DIS); RT5659_POW_CLSD_DB_MASK, RT5659_POW_CLSD_DB_DIS);
break; break;
@ -2335,15 +2416,15 @@ static int rt5659_spk_event(struct snd_soc_dapm_widget *w,
static int rt5659_mono_event(struct snd_soc_dapm_widget *w, static int rt5659_mono_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_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
snd_soc_write(codec, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e00); snd_soc_component_write(component, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e00);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_soc_write(codec, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e04); snd_soc_component_write(component, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e04);
break; break;
default: default:
@ -2357,16 +2438,16 @@ static int rt5659_mono_event(struct snd_soc_dapm_widget *w,
static int rt5659_hp_event(struct snd_soc_dapm_widget *w, static int rt5659_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);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_write(codec, RT5659_HP_CHARGE_PUMP_1, 0x0e1e); snd_soc_component_write(component, RT5659_HP_CHARGE_PUMP_1, 0x0e1e);
snd_soc_update_bits(codec, RT5659_DEPOP_1, 0x0010, 0x0010); snd_soc_component_update_bits(component, RT5659_DEPOP_1, 0x0010, 0x0010);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_write(codec, RT5659_DEPOP_1, 0x0000); snd_soc_component_write(component, RT5659_DEPOP_1, 0x0000);
break; break;
default: default:
@ -2504,9 +2585,9 @@ static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {
RT5659_PWR_ADC_L2_BIT, 0, NULL, 0), RT5659_PWR_ADC_L2_BIT, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5659_PWR_DIG_1, SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5659_PWR_DIG_1,
RT5659_PWR_ADC_R2_BIT, 0, NULL, 0), RT5659_PWR_ADC_R2_BIT, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY("ADC1 clock", SND_SOC_NOPM, 0, 0, set_adc_clk, SND_SOC_DAPM_SUPPLY("ADC1 clock", SND_SOC_NOPM, 0, 0, set_adc1_clk,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_SUPPLY("ADC2 clock", SND_SOC_NOPM, 0, 0, set_adc_clk, SND_SOC_DAPM_SUPPLY("ADC2 clock", SND_SOC_NOPM, 0, 0, set_adc2_clk,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
/* ADC Mux */ /* ADC Mux */
@ -2818,11 +2899,6 @@ static const struct snd_soc_dapm_route rt5659_dapm_routes[] = {
{ "I2S2", NULL, "I2S2 ASRC" }, { "I2S2", NULL, "I2S2 ASRC" },
{ "I2S3", NULL, "I2S3 ASRC" }, { "I2S3", NULL, "I2S3 ASRC" },
{ "IN1P", NULL, "LDO2" },
{ "IN2P", NULL, "LDO2" },
{ "IN3P", NULL, "LDO2" },
{ "IN4P", NULL, "LDO2" },
{ "DMIC1", NULL, "DMIC L1" }, { "DMIC1", NULL, "DMIC L1" },
{ "DMIC1", NULL, "DMIC R1" }, { "DMIC1", NULL, "DMIC R1" },
{ "DMIC2", NULL, "DMIC L2" }, { "DMIC2", NULL, "DMIC L2" },
@ -3237,21 +3313,21 @@ static const struct snd_soc_dapm_route rt5659_dapm_routes[] = {
static int rt5659_hw_params(struct snd_pcm_substream *substream, static int rt5659_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 rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = 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, frame_size; int pre_div, frame_size;
rt5659->lrck[dai->id] = params_rate(params); rt5659->lrck[dai->id] = params_rate(params);
pre_div = rl6231_get_clk_info(rt5659->sysclk, rt5659->lrck[dai->id]); pre_div = rl6231_get_clk_info(rt5659->sysclk, rt5659->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",
rt5659->lrck[dai->id], dai->id); rt5659->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;
} }
@ -3278,39 +3354,39 @@ static int rt5659_hw_params(struct snd_pcm_substream *substream,
case RT5659_AIF1: case RT5659_AIF1:
mask_clk = RT5659_I2S_PD1_MASK; mask_clk = RT5659_I2S_PD1_MASK;
val_clk = pre_div << RT5659_I2S_PD1_SFT; val_clk = pre_div << RT5659_I2S_PD1_SFT;
snd_soc_update_bits(codec, RT5659_I2S1_SDP, snd_soc_component_update_bits(component, RT5659_I2S1_SDP,
RT5659_I2S_DL_MASK, val_len); RT5659_I2S_DL_MASK, val_len);
break; break;
case RT5659_AIF2: case RT5659_AIF2:
mask_clk = RT5659_I2S_PD2_MASK; mask_clk = RT5659_I2S_PD2_MASK;
val_clk = pre_div << RT5659_I2S_PD2_SFT; val_clk = pre_div << RT5659_I2S_PD2_SFT;
snd_soc_update_bits(codec, RT5659_I2S2_SDP, snd_soc_component_update_bits(component, RT5659_I2S2_SDP,
RT5659_I2S_DL_MASK, val_len); RT5659_I2S_DL_MASK, val_len);
break; break;
case RT5659_AIF3: case RT5659_AIF3:
mask_clk = RT5659_I2S_PD3_MASK; mask_clk = RT5659_I2S_PD3_MASK;
val_clk = pre_div << RT5659_I2S_PD3_SFT; val_clk = pre_div << RT5659_I2S_PD3_SFT;
snd_soc_update_bits(codec, RT5659_I2S3_SDP, snd_soc_component_update_bits(component, RT5659_I2S3_SDP,
RT5659_I2S_DL_MASK, val_len); RT5659_I2S_DL_MASK, val_len);
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;
} }
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, mask_clk, val_clk); snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, mask_clk, val_clk);
switch (rt5659->lrck[dai->id]) { switch (rt5659->lrck[dai->id]) {
case 192000: case 192000:
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1,
RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_32); RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_32);
break; break;
case 96000: case 96000:
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1,
RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_64); RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_64);
break; break;
default: default:
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1,
RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_128); RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_128);
break; break;
} }
@ -3320,8 +3396,8 @@ static int rt5659_hw_params(struct snd_pcm_substream *substream,
static int rt5659_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int rt5659_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 rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = 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) {
@ -3364,31 +3440,31 @@ static int rt5659_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (dai->id) { switch (dai->id) {
case RT5659_AIF1: case RT5659_AIF1:
snd_soc_update_bits(codec, RT5659_I2S1_SDP, snd_soc_component_update_bits(component, RT5659_I2S1_SDP,
RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK | RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK |
RT5659_I2S_DF_MASK, reg_val); RT5659_I2S_DF_MASK, reg_val);
break; break;
case RT5659_AIF2: case RT5659_AIF2:
snd_soc_update_bits(codec, RT5659_I2S2_SDP, snd_soc_component_update_bits(component, RT5659_I2S2_SDP,
RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK | RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK |
RT5659_I2S_DF_MASK, reg_val); RT5659_I2S_DF_MASK, reg_val);
break; break;
case RT5659_AIF3: case RT5659_AIF3:
snd_soc_update_bits(codec, RT5659_I2S3_SDP, snd_soc_component_update_bits(component, RT5659_I2S3_SDP,
RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK | RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK |
RT5659_I2S_DF_MASK, reg_val); RT5659_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 rt5659_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id, static int rt5659_set_component_sysclk(struct snd_soc_component *component, int clk_id,
int source, unsigned int freq, int dir) int source, unsigned int freq, int dir)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0; unsigned int reg_val = 0;
if (freq == rt5659->sysclk && clk_id == rt5659->sysclk_src) if (freq == rt5659->sysclk && clk_id == rt5659->sysclk_src)
@ -3405,25 +3481,25 @@ static int rt5659_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id,
reg_val |= RT5659_SCLK_SRC_RCCLK; reg_val |= RT5659_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, RT5659_GLB_CLK, snd_soc_component_update_bits(component, RT5659_GLB_CLK,
RT5659_SCLK_SRC_MASK, reg_val); RT5659_SCLK_SRC_MASK, reg_val);
rt5659->sysclk = freq; rt5659->sysclk = freq;
rt5659->sysclk_src = clk_id; rt5659->sysclk_src = clk_id;
dev_dbg(codec->dev, "Sysclk is %dHz and clock id is %d\n", dev_dbg(component->dev, "Sysclk is %dHz and clock id is %d\n",
freq, clk_id); freq, clk_id);
return 0; return 0;
} }
static int rt5659_set_codec_pll(struct snd_soc_codec *codec, int pll_id, static int rt5659_set_component_pll(struct snd_soc_component *component, int pll_id,
int source, unsigned int freq_in, int source, unsigned int freq_in,
unsigned int freq_out) unsigned int freq_out)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
struct rl6231_pll_code pll_code; struct rl6231_pll_code pll_code;
int ret; int ret;
@ -3432,50 +3508,50 @@ static int rt5659_set_codec_pll(struct snd_soc_codec *codec, int pll_id,
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");
rt5659->pll_in = 0; rt5659->pll_in = 0;
rt5659->pll_out = 0; rt5659->pll_out = 0;
snd_soc_update_bits(codec, RT5659_GLB_CLK, snd_soc_component_update_bits(component, RT5659_GLB_CLK,
RT5659_SCLK_SRC_MASK, RT5659_SCLK_SRC_MCLK); RT5659_SCLK_SRC_MASK, RT5659_SCLK_SRC_MCLK);
return 0; return 0;
} }
switch (source) { switch (source) {
case RT5659_PLL1_S_MCLK: case RT5659_PLL1_S_MCLK:
snd_soc_update_bits(codec, RT5659_GLB_CLK, snd_soc_component_update_bits(component, RT5659_GLB_CLK,
RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_MCLK); RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_MCLK);
break; break;
case RT5659_PLL1_S_BCLK1: case RT5659_PLL1_S_BCLK1:
snd_soc_update_bits(codec, RT5659_GLB_CLK, snd_soc_component_update_bits(component, RT5659_GLB_CLK,
RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK1); RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK1);
break; break;
case RT5659_PLL1_S_BCLK2: case RT5659_PLL1_S_BCLK2:
snd_soc_update_bits(codec, RT5659_GLB_CLK, snd_soc_component_update_bits(component, RT5659_GLB_CLK,
RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK2); RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK2);
break; break;
case RT5659_PLL1_S_BCLK3: case RT5659_PLL1_S_BCLK3:
snd_soc_update_bits(codec, RT5659_GLB_CLK, snd_soc_component_update_bits(component, RT5659_GLB_CLK,
RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK3); RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK3);
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, RT5659_PLL_CTRL_1, snd_soc_component_write(component, RT5659_PLL_CTRL_1,
pll_code.n_code << RT5659_PLL_N_SFT | pll_code.k_code); pll_code.n_code << RT5659_PLL_N_SFT | pll_code.k_code);
snd_soc_write(codec, RT5659_PLL_CTRL_2, snd_soc_component_write(component, RT5659_PLL_CTRL_2,
(pll_code.m_bp ? 0 : pll_code.m_code) << RT5659_PLL_M_SFT | (pll_code.m_bp ? 0 : pll_code.m_code) << RT5659_PLL_M_SFT |
pll_code.m_bp << RT5659_PLL_M_BP_SFT); pll_code.m_bp << RT5659_PLL_M_BP_SFT);
@ -3489,7 +3565,7 @@ static int rt5659_set_codec_pll(struct snd_soc_codec *codec, int pll_id,
static int rt5659_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5659_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)
@ -3533,29 +3609,29 @@ static int rt5659_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, RT5659_TDM_CTRL_1, 0x8ff0, val); snd_soc_component_update_bits(component, RT5659_TDM_CTRL_1, 0x8ff0, val);
return 0; return 0;
} }
static int rt5659_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) static int rt5659_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;
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
dev_dbg(codec->dev, "%s ratio=%d\n", __func__, ratio); dev_dbg(component->dev, "%s ratio=%d\n", __func__, ratio);
rt5659->bclk[dai->id] = ratio; rt5659->bclk[dai->id] = ratio;
if (ratio == 64) { if (ratio == 64) {
switch (dai->id) { switch (dai->id) {
case RT5659_AIF2: case RT5659_AIF2:
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1,
RT5659_I2S_BCLK_MS2_MASK, RT5659_I2S_BCLK_MS2_MASK,
RT5659_I2S_BCLK_MS2_64); RT5659_I2S_BCLK_MS2_64);
break; break;
case RT5659_AIF3: case RT5659_AIF3:
snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1,
RT5659_I2S_BCLK_MS3_MASK, RT5659_I2S_BCLK_MS3_MASK,
RT5659_I2S_BCLK_MS3_64); RT5659_I2S_BCLK_MS3_64);
break; break;
@ -3565,11 +3641,11 @@ static int rt5659_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
return 0; return 0;
} }
static int rt5659_set_bias_level(struct snd_soc_codec *codec, static int rt5659_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
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 rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
@ -3591,7 +3667,7 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec,
if (dapm->bias_level == SND_SOC_BIAS_OFF) { if (dapm->bias_level == SND_SOC_BIAS_OFF) {
ret = clk_prepare_enable(rt5659->mclk); ret = clk_prepare_enable(rt5659->mclk);
if (ret) { if (ret) {
dev_err(codec->dev, dev_err(component->dev,
"failed to enable MCLK: %d\n", ret); "failed to enable MCLK: %d\n", ret);
return ret; return ret;
} }
@ -3617,37 +3693,35 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec,
return 0; return 0;
} }
static int rt5659_probe(struct snd_soc_codec *codec) static int rt5659_probe(struct snd_soc_component *component)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
rt5659->codec = codec; rt5659->component = component;
return 0; return 0;
} }
static int rt5659_remove(struct snd_soc_codec *codec) static void rt5659_remove(struct snd_soc_component *component)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
regmap_write(rt5659->regmap, RT5659_RESET, 0); regmap_write(rt5659->regmap, RT5659_RESET, 0);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int rt5659_suspend(struct snd_soc_codec *codec) static int rt5659_suspend(struct snd_soc_component *component)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5659->regmap, true); regcache_cache_only(rt5659->regmap, true);
regcache_mark_dirty(rt5659->regmap); regcache_mark_dirty(rt5659->regmap);
return 0; return 0;
} }
static int rt5659_resume(struct snd_soc_codec *codec) static int rt5659_resume(struct snd_soc_component *component)
{ {
struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5659->regmap, false); regcache_cache_only(rt5659->regmap, false);
regcache_sync(rt5659->regmap); regcache_sync(rt5659->regmap);
@ -3730,23 +3804,23 @@ static struct snd_soc_dai_driver rt5659_dai[] = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_rt5659 = { static const struct snd_soc_component_driver soc_component_dev_rt5659 = {
.probe = rt5659_probe, .probe = rt5659_probe,
.remove = rt5659_remove, .remove = rt5659_remove,
.suspend = rt5659_suspend, .suspend = rt5659_suspend,
.resume = rt5659_resume, .resume = rt5659_resume,
.set_bias_level = rt5659_set_bias_level, .set_bias_level = rt5659_set_bias_level,
.idle_bias_off = true, .controls = rt5659_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(rt5659_snd_controls),
.controls = rt5659_snd_controls, .dapm_widgets = rt5659_dapm_widgets,
.num_controls = ARRAY_SIZE(rt5659_snd_controls), .num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets),
.dapm_widgets = rt5659_dapm_widgets, .dapm_routes = rt5659_dapm_routes,
.num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes),
.dapm_routes = rt5659_dapm_routes, .set_sysclk = rt5659_set_component_sysclk,
.num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes), .set_pll = rt5659_set_component_pll,
}, .use_pmdown_time = 1,
.set_sysclk = rt5659_set_codec_sysclk, .endianness = 1,
.set_pll = rt5659_set_codec_pll, .non_legacy_dai_naming = 1,
}; };
@ -3849,7 +3923,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659)
break; break;
if (count > 30) { if (count > 30) {
dev_err(rt5659->codec->dev, dev_err(rt5659->component->dev,
"HP Calibration 1 Failure\n"); "HP Calibration 1 Failure\n");
return; return;
} }
@ -3874,7 +3948,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659)
break; break;
if (count > 85) { if (count > 85) {
dev_err(rt5659->codec->dev, dev_err(rt5659->component->dev,
"HP Calibration 2 Failure\n"); "HP Calibration 2 Failure\n");
return; return;
} }
@ -3922,7 +3996,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659)
break; break;
if (count > 10) { if (count > 10) {
dev_err(rt5659->codec->dev, dev_err(rt5659->component->dev,
"SPK Calibration Failure\n"); "SPK Calibration Failure\n");
return; return;
} }
@ -3955,7 +4029,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659)
break; break;
if (count > 35) { if (count > 35) {
dev_err(rt5659->codec->dev, dev_err(rt5659->component->dev,
"Mono Calibration Failure\n"); "Mono Calibration Failure\n");
return; return;
} }
@ -3990,6 +4064,54 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659)
regmap_write(rt5659->regmap, RT5659_HP_CHARGE_PUMP_1, 0x0c16); regmap_write(rt5659->regmap, RT5659_HP_CHARGE_PUMP_1, 0x0c16);
} }
static void rt5659_intel_hd_header_probe_setup(struct rt5659_priv *rt5659)
{
int value;
regmap_read(rt5659->regmap, RT5659_GPIO_STA, &value);
if (!(value & 0x8)) {
rt5659->hda_hp_plugged = true;
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_1,
0x10, 0x0);
} else {
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_1,
0x10, 0x10);
}
regmap_update_bits(rt5659->regmap, RT5659_PWR_ANLG_1,
RT5659_PWR_VREF2 | RT5659_PWR_MB,
RT5659_PWR_VREF2 | RT5659_PWR_MB);
msleep(20);
regmap_update_bits(rt5659->regmap, RT5659_PWR_ANLG_1,
RT5659_PWR_FV2, RT5659_PWR_FV2);
regmap_update_bits(rt5659->regmap, RT5659_PWR_ANLG_3, RT5659_PWR_LDO2,
RT5659_PWR_LDO2);
regmap_update_bits(rt5659->regmap, RT5659_PWR_ANLG_2, RT5659_PWR_MB1,
RT5659_PWR_MB1);
regmap_update_bits(rt5659->regmap, RT5659_PWR_VOL, RT5659_PWR_MIC_DET,
RT5659_PWR_MIC_DET);
msleep(20);
regmap_update_bits(rt5659->regmap, RT5659_4BTN_IL_CMD_2,
RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_EN);
regmap_read(rt5659->regmap, RT5659_4BTN_IL_CMD_1, &value);
regmap_write(rt5659->regmap, RT5659_4BTN_IL_CMD_1, value);
regmap_read(rt5659->regmap, RT5659_4BTN_IL_CMD_1, &value);
if (value & 0x2000) {
rt5659->hda_mic_plugged = true;
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_2,
0x2, 0x2);
} else {
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_2,
0x2, 0x0);
}
regmap_update_bits(rt5659->regmap, RT5659_IRQ_CTRL_2,
RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_EN);
}
static int rt5659_i2c_probe(struct i2c_client *i2c, static int rt5659_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
@ -4174,16 +4296,23 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
RT5659_PWR_MB, RT5659_PWR_MB); RT5659_PWR_MB, RT5659_PWR_MB);
regmap_write(rt5659->regmap, RT5659_PWR_ANLG_2, 0x0001); regmap_write(rt5659->regmap, RT5659_PWR_ANLG_2, 0x0001);
regmap_write(rt5659->regmap, RT5659_IRQ_CTRL_2, 0x0040); regmap_write(rt5659->regmap, RT5659_IRQ_CTRL_2, 0x0040);
INIT_DELAYED_WORK(&rt5659->jack_detect_work,
rt5659_jack_detect_work);
break; break;
case RT5659_JD_NULL: case RT5659_JD_HDA_HEADER:
regmap_write(rt5659->regmap, RT5659_GPIO_CTRL_3, 0x8000);
regmap_write(rt5659->regmap, RT5659_RC_CLK_CTRL, 0x0900);
regmap_write(rt5659->regmap, RT5659_EJD_CTRL_1, 0x70c0);
regmap_write(rt5659->regmap, RT5659_JD_CTRL_1, 0x2000);
regmap_write(rt5659->regmap, RT5659_IRQ_CTRL_1, 0x0040);
INIT_DELAYED_WORK(&rt5659->jack_detect_work,
rt5659_jack_detect_intel_hd_header);
rt5659_intel_hd_header_probe_setup(rt5659);
break; break;
default: default:
dev_warn(&i2c->dev, "Currently, support JD3 only\n");
break; break;
} }
INIT_DELAYED_WORK(&rt5659->jack_detect_work, rt5659_jack_detect_work);
if (i2c->irq) { if (i2c->irq) {
ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
rt5659_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING rt5659_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
@ -4196,17 +4325,11 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
RT5659_GP1_PIN_MASK, RT5659_GP1_PIN_IRQ); RT5659_GP1_PIN_MASK, RT5659_GP1_PIN_IRQ);
} }
return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659, return devm_snd_soc_register_component(&i2c->dev,
&soc_component_dev_rt5659,
rt5659_dai, ARRAY_SIZE(rt5659_dai)); rt5659_dai, ARRAY_SIZE(rt5659_dai));
} }
static int rt5659_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
}
static void rt5659_i2c_shutdown(struct i2c_client *client) static void rt5659_i2c_shutdown(struct i2c_client *client)
{ {
struct rt5659_priv *rt5659 = i2c_get_clientdata(client); struct rt5659_priv *rt5659 = i2c_get_clientdata(client);
@ -4239,7 +4362,6 @@ static struct i2c_driver rt5659_i2c_driver = {
.acpi_match_table = ACPI_PTR(rt5659_acpi_match), .acpi_match_table = ACPI_PTR(rt5659_acpi_match),
}, },
.probe = rt5659_i2c_probe, .probe = rt5659_i2c_probe,
.remove = rt5659_i2c_remove,
.shutdown = rt5659_i2c_shutdown, .shutdown = rt5659_i2c_shutdown,
.id_table = rt5659_i2c_id, .id_table = rt5659_i2c_id,
}; };

19
sound/soc/codecs/rt5659.h
Просмотреть файл

@ -1743,10 +1743,14 @@
#define RT5659_CKGEN_DAC2_SFT 4 #define RT5659_CKGEN_DAC2_SFT 4
/* Chopper and Clock control for ADC (0x013b)*/ /* Chopper and Clock control for ADC (0x013b)*/
#define RT5659_CKXEN_ADCC_MASK (0x1 << 13) #define RT5659_CKXEN_ADC1_MASK (0x1 << 13)
#define RT5659_CKXEN_ADCC_SFT 13 #define RT5659_CKXEN_ADC1_SFT 13
#define RT5659_CKGEN_ADCC_MASK (0x1 << 12) #define RT5659_CKGEN_ADC1_MASK (0x1 << 12)
#define RT5659_CKGEN_ADCC_SFT 12 #define RT5659_CKGEN_ADC1_SFT 12
#define RT5659_CKXEN_ADC2_MASK (0x1 << 5)
#define RT5659_CKXEN_ADC2_SFT 5
#define RT5659_CKGEN_ADC2_MASK (0x1 << 4)
#define RT5659_CKGEN_ADC2_SFT 4
/* Test Mode Control 1 (0x0145) */ /* Test Mode Control 1 (0x0145) */
#define RT5659_AD2DA_LB_MASK (0x1 << 9) #define RT5659_AD2DA_LB_MASK (0x1 << 9)
@ -1789,7 +1793,7 @@ struct rt5659_pll_code {
}; };
struct rt5659_priv { struct rt5659_priv {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct rt5659_platform_data pdata; struct rt5659_platform_data pdata;
struct regmap *regmap; struct regmap *regmap;
struct gpio_desc *gpiod_ldo1_en; struct gpio_desc *gpiod_ldo1_en;
@ -1810,10 +1814,11 @@ struct rt5659_priv {
int pll_out; int pll_out;
int jack_type; int jack_type;
bool hda_hp_plugged;
bool hda_mic_plugged;
}; };
int rt5659_set_jack_detect(struct snd_soc_codec *codec, int rt5659_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *hs_jack); struct snd_soc_jack *hs_jack);
#endif /* __RT5659_H__ */ #endif /* __RT5659_H__ */

145
sound/soc/codecs/rt5660.c
Просмотреть файл

@ -354,17 +354,17 @@ static const struct snd_kcontrol_new rt5660_snd_controls[] = {
static int rt5660_set_dmic_clk(struct snd_soc_dapm_widget *w, static int rt5660_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 rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
int idx, rate; int idx, rate;
rate = rt5660->sysclk / rl6231_get_pre_div(rt5660->regmap, rate = rt5660->sysclk / rl6231_get_pre_div(rt5660->regmap,
RT5660_ADDA_CLK1, RT5660_I2S_PD1_SFT); RT5660_ADDA_CLK1, RT5660_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, RT5660_DMIC_CTRL1, snd_soc_component_update_bits(component, RT5660_DMIC_CTRL1,
RT5660_DMIC_CLK_MASK, idx << RT5660_DMIC_CLK_SFT); RT5660_DMIC_CLK_MASK, idx << RT5660_DMIC_CLK_SFT);
return idx; return idx;
@ -373,10 +373,10 @@ static int rt5660_set_dmic_clk(struct snd_soc_dapm_widget *w,
static int rt5660_is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, static int rt5660_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);
unsigned int val; unsigned int val;
val = snd_soc_read(codec, RT5660_GLB_CLK); val = snd_soc_component_read32(component, RT5660_GLB_CLK);
val &= RT5660_SCLK_SRC_MASK; val &= RT5660_SCLK_SRC_MASK;
if (val == RT5660_SCLK_SRC_PLL1) if (val == RT5660_SCLK_SRC_PLL1)
return 1; return 1;
@ -541,17 +541,17 @@ static const struct snd_kcontrol_new rt5660_if1_adc_swap_mux =
static int rt5660_lout_event(struct snd_soc_dapm_widget *w, static int rt5660_lout_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, RT5660_LOUT_AMP_CTRL, snd_soc_component_update_bits(component, RT5660_LOUT_AMP_CTRL,
RT5660_LOUT_CO_MASK | RT5660_LOUT_CB_MASK, RT5660_LOUT_CO_MASK | RT5660_LOUT_CB_MASK,
RT5660_LOUT_CO_EN | RT5660_LOUT_CB_PU); RT5660_LOUT_CO_EN | RT5660_LOUT_CB_PU);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, RT5660_LOUT_AMP_CTRL, snd_soc_component_update_bits(component, RT5660_LOUT_AMP_CTRL,
RT5660_LOUT_CO_MASK | RT5660_LOUT_CB_MASK, RT5660_LOUT_CO_MASK | RT5660_LOUT_CB_MASK,
RT5660_LOUT_CO_DIS | RT5660_LOUT_CB_PD); RT5660_LOUT_CO_DIS | RT5660_LOUT_CB_PD);
break; break;
@ -838,22 +838,22 @@ static const struct snd_soc_dapm_route rt5660_dapm_routes[] = {
static int rt5660_hw_params(struct snd_pcm_substream *substream, static int rt5660_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 rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = 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;
rt5660->lrck[dai->id] = params_rate(params); rt5660->lrck[dai->id] = params_rate(params);
pre_div = rl6231_get_clk_info(rt5660->sysclk, rt5660->lrck[dai->id]); pre_div = rl6231_get_clk_info(rt5660->sysclk, rt5660->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",
rt5660->lrck[dai->id], dai->id); rt5660->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 frame_size; return frame_size;
} }
@ -890,13 +890,13 @@ static int rt5660_hw_params(struct snd_pcm_substream *substream,
mask_clk = RT5660_I2S_BCLK_MS1_MASK | RT5660_I2S_PD1_MASK; mask_clk = RT5660_I2S_BCLK_MS1_MASK | RT5660_I2S_PD1_MASK;
val_clk = bclk_ms << RT5660_I2S_BCLK_MS1_SFT | val_clk = bclk_ms << RT5660_I2S_BCLK_MS1_SFT |
pre_div << RT5660_I2S_PD1_SFT; pre_div << RT5660_I2S_PD1_SFT;
snd_soc_update_bits(codec, RT5660_I2S1_SDP, RT5660_I2S_DL_MASK, snd_soc_component_update_bits(component, RT5660_I2S1_SDP, RT5660_I2S_DL_MASK,
val_len); val_len);
snd_soc_update_bits(codec, RT5660_ADDA_CLK1, mask_clk, val_clk); snd_soc_component_update_bits(component, RT5660_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;
} }
@ -905,8 +905,8 @@ static int rt5660_hw_params(struct snd_pcm_substream *substream,
static int rt5660_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int rt5660_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 rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = 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) {
@ -957,13 +957,13 @@ static int rt5660_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (dai->id) { switch (dai->id) {
case RT5660_AIF1: case RT5660_AIF1:
snd_soc_update_bits(codec, RT5660_I2S1_SDP, snd_soc_component_update_bits(component, RT5660_I2S1_SDP,
RT5660_I2S_MS_MASK | RT5660_I2S_BP_MASK | RT5660_I2S_MS_MASK | RT5660_I2S_BP_MASK |
RT5660_I2S_DF_MASK, reg_val); RT5660_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;
} }
@ -973,8 +973,8 @@ static int rt5660_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static int rt5660_set_dai_sysclk(struct snd_soc_dai *dai, static int rt5660_set_dai_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0; unsigned int reg_val = 0;
if (freq == rt5660->sysclk && clk_id == rt5660->sysclk_src) if (freq == rt5660->sysclk && clk_id == rt5660->sysclk_src)
@ -994,11 +994,11 @@ static int rt5660_set_dai_sysclk(struct snd_soc_dai *dai,
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, RT5660_GLB_CLK, RT5660_SCLK_SRC_MASK, snd_soc_component_update_bits(component, RT5660_GLB_CLK, RT5660_SCLK_SRC_MASK,
reg_val); reg_val);
rt5660->sysclk = freq; rt5660->sysclk = freq;
@ -1012,8 +1012,8 @@ static int rt5660_set_dai_sysclk(struct snd_soc_dai *dai,
static int rt5660_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5660_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 rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
struct rl6231_pll_code pll_code; struct rl6231_pll_code pll_code;
int ret; int ret;
@ -1022,44 +1022,44 @@ static int rt5660_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");
rt5660->pll_in = 0; rt5660->pll_in = 0;
rt5660->pll_out = 0; rt5660->pll_out = 0;
snd_soc_update_bits(codec, RT5660_GLB_CLK, snd_soc_component_update_bits(component, RT5660_GLB_CLK,
RT5660_SCLK_SRC_MASK, RT5660_SCLK_SRC_MCLK); RT5660_SCLK_SRC_MASK, RT5660_SCLK_SRC_MCLK);
return 0; return 0;
} }
switch (source) { switch (source) {
case RT5660_PLL1_S_MCLK: case RT5660_PLL1_S_MCLK:
snd_soc_update_bits(codec, RT5660_GLB_CLK, snd_soc_component_update_bits(component, RT5660_GLB_CLK,
RT5660_PLL1_SRC_MASK, RT5660_PLL1_SRC_MCLK); RT5660_PLL1_SRC_MASK, RT5660_PLL1_SRC_MCLK);
break; break;
case RT5660_PLL1_S_BCLK: case RT5660_PLL1_S_BCLK:
snd_soc_update_bits(codec, RT5660_GLB_CLK, snd_soc_component_update_bits(component, RT5660_GLB_CLK,
RT5660_PLL1_SRC_MASK, RT5660_PLL1_SRC_BCLK1); RT5660_PLL1_SRC_MASK, RT5660_PLL1_SRC_BCLK1);
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, RT5660_PLL_CTRL1, snd_soc_component_write(component, RT5660_PLL_CTRL1,
pll_code.n_code << RT5660_PLL_N_SFT | pll_code.k_code); pll_code.n_code << RT5660_PLL_N_SFT | pll_code.k_code);
snd_soc_write(codec, RT5660_PLL_CTRL2, snd_soc_component_write(component, RT5660_PLL_CTRL2,
(pll_code.m_bp ? 0 : pll_code.m_code) << RT5660_PLL_M_SFT | (pll_code.m_bp ? 0 : pll_code.m_code) << RT5660_PLL_M_SFT |
pll_code.m_bp << RT5660_PLL_M_BP_SFT); pll_code.m_bp << RT5660_PLL_M_BP_SFT);
@ -1070,10 +1070,10 @@ static int rt5660_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
return 0; return 0;
} }
static int rt5660_set_bias_level(struct snd_soc_codec *codec, static int rt5660_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
@ -1081,13 +1081,13 @@ static int rt5660_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
snd_soc_update_bits(codec, RT5660_GEN_CTRL1, snd_soc_component_update_bits(component, RT5660_GEN_CTRL1,
RT5660_DIG_GATE_CTRL, RT5660_DIG_GATE_CTRL); RT5660_DIG_GATE_CTRL, RT5660_DIG_GATE_CTRL);
if (IS_ERR(rt5660->mclk)) if (IS_ERR(rt5660->mclk))
break; break;
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
clk_disable_unprepare(rt5660->mclk); clk_disable_unprepare(rt5660->mclk);
} else { } else {
ret = clk_prepare_enable(rt5660->mclk); ret = clk_prepare_enable(rt5660->mclk);
@ -1097,21 +1097,21 @@ static int rt5660_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
snd_soc_update_bits(codec, RT5660_PWR_ANLG1, snd_soc_component_update_bits(component, RT5660_PWR_ANLG1,
RT5660_PWR_VREF1 | RT5660_PWR_MB | RT5660_PWR_VREF1 | RT5660_PWR_MB |
RT5660_PWR_BG | RT5660_PWR_VREF2, RT5660_PWR_BG | RT5660_PWR_VREF2,
RT5660_PWR_VREF1 | RT5660_PWR_MB | RT5660_PWR_VREF1 | RT5660_PWR_MB |
RT5660_PWR_BG | RT5660_PWR_VREF2); RT5660_PWR_BG | RT5660_PWR_VREF2);
usleep_range(10000, 15000); usleep_range(10000, 15000);
snd_soc_update_bits(codec, RT5660_PWR_ANLG1, snd_soc_component_update_bits(component, RT5660_PWR_ANLG1,
RT5660_PWR_FV1 | RT5660_PWR_FV2, RT5660_PWR_FV1 | RT5660_PWR_FV2,
RT5660_PWR_FV1 | RT5660_PWR_FV2); RT5660_PWR_FV1 | RT5660_PWR_FV2);
} }
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_update_bits(codec, RT5660_GEN_CTRL1, snd_soc_component_update_bits(component, RT5660_GEN_CTRL1,
RT5660_DIG_GATE_CTRL, 0); RT5660_DIG_GATE_CTRL, 0);
break; break;
@ -1122,24 +1122,24 @@ static int rt5660_set_bias_level(struct snd_soc_codec *codec,
return 0; return 0;
} }
static int rt5660_probe(struct snd_soc_codec *codec) static int rt5660_probe(struct snd_soc_component *component)
{ {
struct rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
rt5660->codec = codec; rt5660->component = component;
return 0; return 0;
} }
static int rt5660_remove(struct snd_soc_codec *codec) static void rt5660_remove(struct snd_soc_component *component)
{ {
return snd_soc_write(codec, RT5660_RESET, 0); snd_soc_component_write(component, RT5660_RESET, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int rt5660_suspend(struct snd_soc_codec *codec) static int rt5660_suspend(struct snd_soc_component *component)
{ {
struct rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
regcache_cache_only(rt5660->regmap, true); regcache_cache_only(rt5660->regmap, true);
regcache_mark_dirty(rt5660->regmap); regcache_mark_dirty(rt5660->regmap);
@ -1147,9 +1147,9 @@ static int rt5660_suspend(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int rt5660_resume(struct snd_soc_codec *codec) static int rt5660_resume(struct snd_soc_component *component)
{ {
struct rt5660_priv *rt5660 = snd_soc_codec_get_drvdata(codec); struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
if (rt5660->pdata.poweroff_codec_in_suspend) if (rt5660->pdata.poweroff_codec_in_suspend)
msleep(350); msleep(350);
@ -1197,21 +1197,21 @@ static struct snd_soc_dai_driver rt5660_dai[] = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_rt5660 = { static const struct snd_soc_component_driver soc_component_dev_rt5660 = {
.probe = rt5660_probe, .probe = rt5660_probe,
.remove = rt5660_remove, .remove = rt5660_remove,
.suspend = rt5660_suspend, .suspend = rt5660_suspend,
.resume = rt5660_resume, .resume = rt5660_resume,
.set_bias_level = rt5660_set_bias_level, .set_bias_level = rt5660_set_bias_level,
.idle_bias_off = true, .controls = rt5660_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(rt5660_snd_controls),
.controls = rt5660_snd_controls, .dapm_widgets = rt5660_dapm_widgets,
.num_controls = ARRAY_SIZE(rt5660_snd_controls), .num_dapm_widgets = ARRAY_SIZE(rt5660_dapm_widgets),
.dapm_widgets = rt5660_dapm_widgets, .dapm_routes = rt5660_dapm_routes,
.num_dapm_widgets = ARRAY_SIZE(rt5660_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(rt5660_dapm_routes),
.dapm_routes = rt5660_dapm_routes, .use_pmdown_time = 1,
.num_dapm_routes = ARRAY_SIZE(rt5660_dapm_routes), .endianness = 1,
}, .non_legacy_dai_naming = 1,
}; };
static const struct regmap_config rt5660_regmap = { static const struct regmap_config rt5660_regmap = {
@ -1329,17 +1329,11 @@ static int rt5660_i2c_probe(struct i2c_client *i2c,
RT5660_SEL_DMIC_DATA_IN1P); RT5660_SEL_DMIC_DATA_IN1P);
} }
return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5660, return devm_snd_soc_register_component(&i2c->dev,
&soc_component_dev_rt5660,
rt5660_dai, ARRAY_SIZE(rt5660_dai)); rt5660_dai, ARRAY_SIZE(rt5660_dai));
} }
static int rt5660_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
}
static struct i2c_driver rt5660_i2c_driver = { static struct i2c_driver rt5660_i2c_driver = {
.driver = { .driver = {
.name = "rt5660", .name = "rt5660",
@ -1347,7 +1341,6 @@ static struct i2c_driver rt5660_i2c_driver = {
.of_match_table = of_match_ptr(rt5660_of_match), .of_match_table = of_match_ptr(rt5660_of_match),
}, },
.probe = rt5660_i2c_probe, .probe = rt5660_i2c_probe,
.remove = rt5660_i2c_remove,
.id_table = rt5660_i2c_id, .id_table = rt5660_i2c_id,
}; };
module_i2c_driver(rt5660_i2c_driver); module_i2c_driver(rt5660_i2c_driver);

2
sound/soc/codecs/rt5660.h
Просмотреть файл

@ -831,7 +831,7 @@ enum {
}; };
struct rt5660_priv { struct rt5660_priv {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct rt5660_platform_data pdata; struct rt5660_platform_data pdata;
struct regmap *regmap; struct regmap *regmap;
struct clk *mclk; struct clk *mclk;

205
sound/soc/codecs/rt5677.c
Просмотреть файл

@ -554,7 +554,7 @@ static bool rt5677_readable_register(struct device *dev, unsigned int reg)
static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677, static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677,
unsigned int addr, unsigned int value, unsigned int opcode) unsigned int addr, unsigned int value, unsigned int opcode)
{ {
struct snd_soc_codec *codec = rt5677->codec; struct snd_soc_component *component = rt5677->component;
int ret; int ret;
mutex_lock(&rt5677->dsp_cmd_lock); mutex_lock(&rt5677->dsp_cmd_lock);
@ -562,35 +562,35 @@ static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677,
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB,
addr >> 16); addr >> 16);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set addr msb value: %d\n", ret); dev_err(component->dev, "Failed to set addr msb value: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB,
addr & 0xffff); addr & 0xffff);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set addr lsb value: %d\n", ret); dev_err(component->dev, "Failed to set addr lsb value: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_MSB, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_MSB,
value >> 16); value >> 16);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set data msb value: %d\n", ret); dev_err(component->dev, "Failed to set data msb value: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_LSB, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_LSB,
value & 0xffff); value & 0xffff);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set data lsb value: %d\n", ret); dev_err(component->dev, "Failed to set data lsb value: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE,
opcode); opcode);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set op code value: %d\n", ret); dev_err(component->dev, "Failed to set op code value: %d\n", ret);
goto err; goto err;
} }
@ -612,7 +612,7 @@ err:
static int rt5677_dsp_mode_i2c_read_addr( static int rt5677_dsp_mode_i2c_read_addr(
struct rt5677_priv *rt5677, unsigned int addr, unsigned int *value) struct rt5677_priv *rt5677, unsigned int addr, unsigned int *value)
{ {
struct snd_soc_codec *codec = rt5677->codec; struct snd_soc_component *component = rt5677->component;
int ret; int ret;
unsigned int msb, lsb; unsigned int msb, lsb;
@ -621,21 +621,21 @@ static int rt5677_dsp_mode_i2c_read_addr(
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB,
addr >> 16); addr >> 16);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set addr msb value: %d\n", ret); dev_err(component->dev, "Failed to set addr msb value: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB,
addr & 0xffff); addr & 0xffff);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set addr lsb value: %d\n", ret); dev_err(component->dev, "Failed to set addr lsb value: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE, ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE,
0x0002); 0x0002);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to set op code value: %d\n", ret); dev_err(component->dev, "Failed to set op code value: %d\n", ret);
goto err; goto err;
} }
@ -685,9 +685,9 @@ static int rt5677_dsp_mode_i2c_read(
return ret; return ret;
} }
static void rt5677_set_dsp_mode(struct snd_soc_codec *codec, bool on) static void rt5677_set_dsp_mode(struct snd_soc_component *component, bool on)
{ {
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
if (on) { if (on) {
regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x2, 0x2); regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x2, 0x2);
@ -698,9 +698,9 @@ static void rt5677_set_dsp_mode(struct snd_soc_codec *codec, bool on)
} }
} }
static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on) static int rt5677_set_dsp_vad(struct snd_soc_component *component, bool on)
{ {
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
static bool activity; static bool activity;
int ret; int ret;
@ -740,17 +740,17 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
} }
regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x07ff); regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x07ff);
regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x07fd); regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x07fd);
rt5677_set_dsp_mode(codec, true); rt5677_set_dsp_mode(component, true);
ret = request_firmware(&rt5677->fw1, RT5677_FIRMWARE1, ret = request_firmware(&rt5677->fw1, RT5677_FIRMWARE1,
codec->dev); component->dev);
if (ret == 0) { if (ret == 0) {
rt5677_spi_write_firmware(0x50000000, rt5677->fw1); rt5677_spi_write_firmware(0x50000000, rt5677->fw1);
release_firmware(rt5677->fw1); release_firmware(rt5677->fw1);
} }
ret = request_firmware(&rt5677->fw2, RT5677_FIRMWARE2, ret = request_firmware(&rt5677->fw2, RT5677_FIRMWARE2,
codec->dev); component->dev);
if (ret == 0) { if (ret == 0) {
rt5677_spi_write_firmware(0x60000000, rt5677->fw2); rt5677_spi_write_firmware(0x60000000, rt5677->fw2);
release_firmware(rt5677->fw2); release_firmware(rt5677->fw2);
@ -767,7 +767,7 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
regcache_cache_bypass(rt5677->regmap, true); regcache_cache_bypass(rt5677->regmap, true);
regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x1, 0x1); regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x1, 0x1);
rt5677_set_dsp_mode(codec, false); rt5677_set_dsp_mode(component, false);
regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x0001); regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x0001);
regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec); regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
@ -812,12 +812,11 @@ static int rt5677_dsp_vad_put(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
rt5677->dsp_vad_en = !!ucontrol->value.integer.value[0]; rt5677->dsp_vad_en = !!ucontrol->value.integer.value[0];
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
rt5677_set_dsp_vad(codec, rt5677->dsp_vad_en); rt5677_set_dsp_vad(component, rt5677->dsp_vad_en);
return 0; return 0;
} }
@ -911,15 +910,15 @@ static const struct snd_kcontrol_new rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
int idx, rate; int idx, rate;
rate = rt5677->sysclk / rl6231_get_pre_div(rt5677->regmap, rate = rt5677->sysclk / rl6231_get_pre_div(rt5677->regmap,
RT5677_CLK_TREE_CTRL1, RT5677_I2S_PD1_SFT); RT5677_CLK_TREE_CTRL1, RT5677_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
regmap_update_bits(rt5677->regmap, RT5677_DMIC_CTRL1, regmap_update_bits(rt5677->regmap, RT5677_DMIC_CTRL1,
RT5677_DMIC_CLK_MASK, idx << RT5677_DMIC_CLK_SFT); RT5677_DMIC_CLK_MASK, idx << RT5677_DMIC_CLK_SFT);
@ -929,8 +928,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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int val; unsigned int val;
regmap_read(rt5677->regmap, RT5677_GLB_CLK1, &val); regmap_read(rt5677->regmap, RT5677_GLB_CLK1, &val);
@ -944,8 +943,8 @@ 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);
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int reg, shift, val; unsigned int reg, shift, val;
if (source->reg == RT5677_ASRC_1) { if (source->reg == RT5677_ASRC_1) {
@ -1027,8 +1026,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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
if (rt5677->sysclk > rt5677->lrck[RT5677_AIF1] * 384) if (rt5677->sysclk > rt5677->lrck[RT5677_AIF1] * 384)
return 1; return 1;
@ -1038,7 +1037,7 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source,
/** /**
* rt5677_sel_asrc_clk_src - select ASRC clock source for a set of filters * rt5677_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
* *
@ -1050,10 +1049,10 @@ 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 rt5677_sel_asrc_clk_src(struct snd_soc_codec *codec, int rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int asrc3_mask = 0, asrc3_value = 0; unsigned int asrc3_mask = 0, asrc3_value = 0;
unsigned int asrc4_mask = 0, asrc4_value = 0; unsigned int asrc4_mask = 0, asrc4_value = 0;
unsigned int asrc5_mask = 0, asrc5_value = 0; unsigned int asrc5_mask = 0, asrc5_value = 0;
@ -1232,8 +1231,8 @@ EXPORT_SYMBOL_GPL(rt5677_sel_asrc_clk_src);
static int rt5677_dmic_use_asrc(struct snd_soc_dapm_widget *source, static int rt5677_dmic_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int asrc_setting; unsigned int asrc_setting;
switch (source->shift) { switch (source->shift) {
@ -2393,8 +2392,8 @@ static const struct snd_kcontrol_new rt5677_if2_dac7_tdm_sel_mux =
static int rt5677_bst1_event(struct snd_soc_dapm_widget *w, static int rt5677_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);
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
@ -2417,8 +2416,8 @@ static int rt5677_bst1_event(struct snd_soc_dapm_widget *w,
static int rt5677_bst2_event(struct snd_soc_dapm_widget *w, static int rt5677_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);
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
@ -2441,8 +2440,8 @@ static int rt5677_bst2_event(struct snd_soc_dapm_widget *w,
static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w, static int rt5677_set_pll1_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
@ -2463,8 +2462,8 @@ static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w,
static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w, static int rt5677_set_pll2_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
@ -2485,8 +2484,8 @@ static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w,
static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w, static int rt5677_set_micbias1_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
@ -2512,8 +2511,8 @@ static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w,
static int rt5677_if1_adc_tdm_event(struct snd_soc_dapm_widget *w, static int rt5677_if1_adc_tdm_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int value; unsigned int value;
switch (event) { switch (event) {
@ -2535,8 +2534,8 @@ static int rt5677_if1_adc_tdm_event(struct snd_soc_dapm_widget *w,
static int rt5677_if2_adc_tdm_event(struct snd_soc_dapm_widget *w, static int rt5677_if2_adc_tdm_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int value; unsigned int value;
switch (event) { switch (event) {
@ -2558,12 +2557,12 @@ static int rt5677_if2_adc_tdm_event(struct snd_soc_dapm_widget *w,
static int rt5677_vref_event(struct snd_soc_dapm_widget *w, static int rt5677_vref_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_ON && if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON &&
!rt5677->is_vref_slow) { !rt5677->is_vref_slow) {
mdelay(20); mdelay(20);
regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1, regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
@ -4098,21 +4097,21 @@ static const struct snd_soc_dapm_route rt5677_dmic2_clk_2[] = {
static int rt5677_hw_params(struct snd_pcm_substream *substream, static int rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = 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;
rt5677->lrck[dai->id] = params_rate(params); rt5677->lrck[dai->id] = params_rate(params);
pre_div = rl6231_get_clk_info(rt5677->sysclk, rt5677->lrck[dai->id]); pre_div = rl6231_get_clk_info(rt5677->sysclk, rt5677->lrck[dai->id]);
if (pre_div < 0) { if (pre_div < 0) {
dev_err(codec->dev, "Unsupported clock setting: sysclk=%dHz lrck=%dHz\n", dev_err(component->dev, "Unsupported clock setting: sysclk=%dHz lrck=%dHz\n",
rt5677->sysclk, rt5677->lrck[dai->id]); rt5677->sysclk, rt5677->lrck[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;
@ -4183,8 +4182,8 @@ static int rt5677_hw_params(struct snd_pcm_substream *substream,
static int rt5677_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = 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) {
@ -4257,8 +4256,8 @@ static int rt5677_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static int rt5677_set_dai_sysclk(struct snd_soc_dai *dai, static int rt5677_set_dai_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int reg_val = 0; unsigned int reg_val = 0;
if (freq == rt5677->sysclk && clk_id == rt5677->sysclk_src) if (freq == rt5677->sysclk && clk_id == rt5677->sysclk_src)
@ -4275,7 +4274,7 @@ static int rt5677_set_dai_sysclk(struct snd_soc_dai *dai,
reg_val |= RT5677_SCLK_SRC_RCCLK; reg_val |= RT5677_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;
} }
regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1, regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
@ -4310,8 +4309,8 @@ static int rt5677_pll_calc(const unsigned int freq_in,
static int rt5677_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
struct rl6231_pll_code pll_code; struct rl6231_pll_code pll_code;
int ret; int ret;
@ -4320,7 +4319,7 @@ static int rt5677_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");
rt5677->pll_in = 0; rt5677->pll_in = 0;
rt5677->pll_out = 0; rt5677->pll_out = 0;
@ -4360,17 +4359,17 @@ static int rt5677_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
} }
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 = rt5677_pll_calc(freq_in, freq_out, &pll_code); ret = rt5677_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, "m_bypass=%d m=%d n=%d k=%d\n", dev_dbg(component->dev, "m_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);
@ -4390,8 +4389,8 @@ static int rt5677_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
static int rt5677_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5677_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;
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
unsigned int val = 0, slot_width_25 = 0; unsigned int val = 0, slot_width_25 = 0;
if (rx_mask || tx_mask) if (rx_mask || tx_mask)
@ -4449,18 +4448,18 @@ static int rt5677_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
return 0; return 0;
} }
static int rt5677_set_bias_level(struct snd_soc_codec *codec, static int rt5677_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
rt5677_set_dsp_vad(codec, false); rt5677_set_dsp_vad(component, false);
regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1, regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
RT5677_LDO1_SEL_MASK | RT5677_LDO2_SEL_MASK, RT5677_LDO1_SEL_MASK | RT5677_LDO2_SEL_MASK,
@ -4495,7 +4494,7 @@ static int rt5677_set_bias_level(struct snd_soc_codec *codec,
RT5677_PR_BASE + RT5677_BIAS_CUR4, 0x0f00, 0x0000); RT5677_PR_BASE + RT5677_BIAS_CUR4, 0x0f00, 0x0000);
if (rt5677->dsp_vad_en) if (rt5677->dsp_vad_en)
rt5677_set_dsp_vad(codec, true); rt5677_set_dsp_vad(component, true);
break; break;
default: default:
@ -4696,13 +4695,13 @@ static void rt5677_free_gpio(struct i2c_client *i2c)
} }
#endif #endif
static int rt5677_probe(struct snd_soc_codec *codec) static int rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
int i; int i;
rt5677->codec = codec; rt5677->component = component;
if (rt5677->pdata.dmic2_clk_pin == RT5677_DMIC_CLK2) { if (rt5677->pdata.dmic2_clk_pin == RT5677_DMIC_CLK2) {
snd_soc_dapm_add_routes(dapm, snd_soc_dapm_add_routes(dapm,
@ -4714,7 +4713,7 @@ static int rt5677_probe(struct snd_soc_codec *codec)
ARRAY_SIZE(rt5677_dmic2_clk_1)); ARRAY_SIZE(rt5677_dmic2_clk_1));
} }
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
regmap_write(rt5677->regmap, RT5677_DIG_MISC, 0x0020); regmap_write(rt5677->regmap, RT5677_DIG_MISC, 0x0020);
regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x0c00); regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x0c00);
@ -4753,21 +4752,19 @@ static int rt5677_probe(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int rt5677_remove(struct snd_soc_codec *codec) static void rt5677_remove(struct snd_soc_component *component)
{ {
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec); regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
gpiod_set_value_cansleep(rt5677->pow_ldo2, 0); gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
gpiod_set_value_cansleep(rt5677->reset_pin, 1); gpiod_set_value_cansleep(rt5677->reset_pin, 1);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int rt5677_suspend(struct snd_soc_codec *codec) static int rt5677_suspend(struct snd_soc_component *component)
{ {
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
if (!rt5677->dsp_vad_en) { if (!rt5677->dsp_vad_en) {
regcache_cache_only(rt5677->regmap, true); regcache_cache_only(rt5677->regmap, true);
@ -4780,9 +4777,9 @@ static int rt5677_suspend(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int rt5677_resume(struct snd_soc_codec *codec) static int rt5677_resume(struct snd_soc_component *component)
{ {
struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
if (!rt5677->dsp_vad_en) { if (!rt5677->dsp_vad_en) {
rt5677->pll_src = 0; rt5677->pll_src = 0;
@ -4959,21 +4956,21 @@ static struct snd_soc_dai_driver rt5677_dai[] = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_rt5677 = { static const struct snd_soc_component_driver soc_component_dev_rt5677 = {
.probe = rt5677_probe, .probe = rt5677_probe,
.remove = rt5677_remove, .remove = rt5677_remove,
.suspend = rt5677_suspend, .suspend = rt5677_suspend,
.resume = rt5677_resume, .resume = rt5677_resume,
.set_bias_level = rt5677_set_bias_level, .set_bias_level = rt5677_set_bias_level,
.idle_bias_off = true, .controls = rt5677_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(rt5677_snd_controls),
.controls = rt5677_snd_controls, .dapm_widgets = rt5677_dapm_widgets,
.num_controls = ARRAY_SIZE(rt5677_snd_controls), .num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets),
.dapm_widgets = rt5677_dapm_widgets, .dapm_routes = rt5677_dapm_routes,
.num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes),
.dapm_routes = rt5677_dapm_routes, .use_pmdown_time = 1,
.num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes), .endianness = 1,
}, .non_legacy_dai_naming = 1,
}; };
static const struct regmap_config rt5677_regmap_physical = { static const struct regmap_config rt5677_regmap_physical = {
@ -5262,13 +5259,13 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
rt5677_init_gpio(i2c); rt5677_init_gpio(i2c);
rt5677_init_irq(i2c); rt5677_init_irq(i2c);
return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5677, return devm_snd_soc_register_component(&i2c->dev,
&soc_component_dev_rt5677,
rt5677_dai, ARRAY_SIZE(rt5677_dai)); rt5677_dai, ARRAY_SIZE(rt5677_dai));
} }
static int rt5677_i2c_remove(struct i2c_client *i2c) static int rt5677_i2c_remove(struct i2c_client *i2c)
{ {
snd_soc_unregister_codec(&i2c->dev);
rt5677_free_irq(i2c); rt5677_free_irq(i2c);
rt5677_free_gpio(i2c); rt5677_free_gpio(i2c);

4
sound/soc/codecs/rt5677.h
Просмотреть файл

@ -1790,7 +1790,7 @@ struct rt5677_platform_data {
}; };
struct rt5677_priv { struct rt5677_priv {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct rt5677_platform_data pdata; struct rt5677_platform_data pdata;
struct regmap *regmap, *regmap_physical; struct regmap *regmap, *regmap_physical;
const struct firmware *fw1, *fw2; const struct firmware *fw1, *fw2;
@ -1816,7 +1816,7 @@ struct rt5677_priv {
bool is_vref_slow; bool is_vref_slow;
}; };
int rt5677_sel_asrc_clk_src(struct snd_soc_codec *codec, int rt5677_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);
#endif /* __RT5677_H__ */ #endif /* __RT5677_H__ */

38
sound/soc/intel/boards/bdw-rt5677.c
Просмотреть файл

@ -34,7 +34,7 @@
struct bdw_rt5677_priv { struct bdw_rt5677_priv {
struct gpio_desc *gpio_hp_en; struct gpio_desc *gpio_hp_en;
struct snd_soc_codec *codec; struct snd_soc_component *component;
}; };
static int bdw_rt5677_event_hp(struct snd_soc_dapm_widget *w, static int bdw_rt5677_event_hp(struct snd_soc_dapm_widget *w,
@ -204,26 +204,26 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct bdw_rt5677_priv *bdw_rt5677 = struct bdw_rt5677_priv *bdw_rt5677 =
snd_soc_card_get_drvdata(rtd->card); snd_soc_card_get_drvdata(rtd->card);
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_component *component = rtd->codec_dai->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);
int ret; int ret;
ret = devm_acpi_dev_add_driver_gpios(codec->dev, bdw_rt5677_gpios); ret = devm_acpi_dev_add_driver_gpios(component->dev, bdw_rt5677_gpios);
if (ret) if (ret)
dev_warn(codec->dev, "Failed to add driver gpios\n"); dev_warn(component->dev, "Failed to add driver gpios\n");
/* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. /* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1.
* The ASRC clock source is clk_i2s1_asrc. * The ASRC clock source is clk_i2s1_asrc.
*/ */
rt5677_sel_asrc_clk_src(codec, RT5677_DA_STEREO_FILTER | rt5677_sel_asrc_clk_src(component, RT5677_DA_STEREO_FILTER |
RT5677_AD_STEREO1_FILTER | RT5677_I2S1_SOURCE, RT5677_AD_STEREO1_FILTER | RT5677_I2S1_SOURCE,
RT5677_CLK_SEL_I2S1_ASRC); RT5677_CLK_SEL_I2S1_ASRC);
/* Request rt5677 GPIO for headphone amp control */ /* Request rt5677 GPIO for headphone amp control */
bdw_rt5677->gpio_hp_en = devm_gpiod_get(codec->dev, "headphone-enable", bdw_rt5677->gpio_hp_en = devm_gpiod_get(component->dev, "headphone-enable",
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(bdw_rt5677->gpio_hp_en)) { if (IS_ERR(bdw_rt5677->gpio_hp_en)) {
dev_err(codec->dev, "Can't find HP_AMP_SHDN_L gpio\n"); dev_err(component->dev, "Can't find HP_AMP_SHDN_L gpio\n");
return PTR_ERR(bdw_rt5677->gpio_hp_en); return PTR_ERR(bdw_rt5677->gpio_hp_en);
} }
@ -231,25 +231,25 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)
if (!snd_soc_card_jack_new(rtd->card, "Headphone Jack", if (!snd_soc_card_jack_new(rtd->card, "Headphone Jack",
SND_JACK_HEADPHONE, &headphone_jack, SND_JACK_HEADPHONE, &headphone_jack,
&headphone_jack_pin, 1)) { &headphone_jack_pin, 1)) {
headphone_jack_gpio.gpiod_dev = codec->dev; headphone_jack_gpio.gpiod_dev = component->dev;
if (snd_soc_jack_add_gpios(&headphone_jack, 1, if (snd_soc_jack_add_gpios(&headphone_jack, 1,
&headphone_jack_gpio)) &headphone_jack_gpio))
dev_err(codec->dev, "Can't add headphone jack gpio\n"); dev_err(component->dev, "Can't add headphone jack gpio\n");
} else { } else {
dev_err(codec->dev, "Can't create headphone jack\n"); dev_err(component->dev, "Can't create headphone jack\n");
} }
/* Create and initialize mic jack */ /* Create and initialize mic jack */
if (!snd_soc_card_jack_new(rtd->card, "Mic Jack", if (!snd_soc_card_jack_new(rtd->card, "Mic Jack",
SND_JACK_MICROPHONE, &mic_jack, SND_JACK_MICROPHONE, &mic_jack,
&mic_jack_pin, 1)) { &mic_jack_pin, 1)) {
mic_jack_gpio.gpiod_dev = codec->dev; mic_jack_gpio.gpiod_dev = component->dev;
if (snd_soc_jack_add_gpios(&mic_jack, 1, &mic_jack_gpio)) if (snd_soc_jack_add_gpios(&mic_jack, 1, &mic_jack_gpio))
dev_err(codec->dev, "Can't add mic jack gpio\n"); dev_err(component->dev, "Can't add mic jack gpio\n");
} else { } else {
dev_err(codec->dev, "Can't create mic jack\n"); dev_err(component->dev, "Can't create mic jack\n");
} }
bdw_rt5677->codec = codec; bdw_rt5677->component = component;
snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
return 0; return 0;
@ -302,8 +302,8 @@ static int bdw_rt5677_suspend_pre(struct snd_soc_card *card)
struct bdw_rt5677_priv *bdw_rt5677 = snd_soc_card_get_drvdata(card); struct bdw_rt5677_priv *bdw_rt5677 = snd_soc_card_get_drvdata(card);
struct snd_soc_dapm_context *dapm; struct snd_soc_dapm_context *dapm;
if (bdw_rt5677->codec) { if (bdw_rt5677->component) {
dapm = snd_soc_codec_get_dapm(bdw_rt5677->codec); dapm = snd_soc_component_get_dapm(bdw_rt5677->component);
snd_soc_dapm_disable_pin(dapm, "MICBIAS1"); snd_soc_dapm_disable_pin(dapm, "MICBIAS1");
} }
return 0; return 0;
@ -314,8 +314,8 @@ static int bdw_rt5677_resume_post(struct snd_soc_card *card)
struct bdw_rt5677_priv *bdw_rt5677 = snd_soc_card_get_drvdata(card); struct bdw_rt5677_priv *bdw_rt5677 = snd_soc_card_get_drvdata(card);
struct snd_soc_dapm_context *dapm; struct snd_soc_dapm_context *dapm;
if (bdw_rt5677->codec) { if (bdw_rt5677->component) {
dapm = snd_soc_codec_get_dapm(bdw_rt5677->codec); dapm = snd_soc_component_get_dapm(bdw_rt5677->component);
snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
} }
return 0; return 0;

8
sound/soc/intel/boards/cht_bsw_rt5645.c
Просмотреть файл

@ -252,14 +252,14 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
{ {
struct snd_soc_card *card = runtime->card; struct snd_soc_card *card = runtime->card;
struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card);
struct snd_soc_codec *codec = runtime->codec; struct snd_soc_component *component = runtime->codec_dai->component;
int jack_type; int jack_type;
int ret; int ret;
if ((cht_rt5645_quirk & CHT_RT5645_SSP2_AIF2) || if ((cht_rt5645_quirk & CHT_RT5645_SSP2_AIF2) ||
(cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2)) { (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2)) {
/* Select clk_i2s2_asrc as ASRC clock source */ /* Select clk_i2s2_asrc as ASRC clock source */
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_DA_STEREO_FILTER | RT5645_DA_STEREO_FILTER |
RT5645_DA_MONO_L_FILTER | RT5645_DA_MONO_L_FILTER |
RT5645_DA_MONO_R_FILTER | RT5645_DA_MONO_R_FILTER |
@ -267,7 +267,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
RT5645_CLK_SEL_I2S2_ASRC); RT5645_CLK_SEL_I2S2_ASRC);
} else { } else {
/* Select clk_i2s1_asrc as ASRC clock source */ /* Select clk_i2s1_asrc as ASRC clock source */
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_DA_STEREO_FILTER | RT5645_DA_STEREO_FILTER |
RT5645_DA_MONO_L_FILTER | RT5645_DA_MONO_L_FILTER |
RT5645_DA_MONO_R_FILTER | RT5645_DA_MONO_R_FILTER |
@ -310,7 +310,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
return ret; return ret;
} }
rt5645_set_jack_detect(codec, &ctx->jack, &ctx->jack, &ctx->jack); rt5645_set_jack_detect(component, &ctx->jack, &ctx->jack, &ctx->jack);
/* /*

6
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
Просмотреть файл

@ -82,10 +82,10 @@ static struct snd_soc_jack mt8173_rt5650_rt5514_jack;
static int mt8173_rt5650_rt5514_init(struct snd_soc_pcm_runtime *runtime) static int mt8173_rt5650_rt5514_init(struct snd_soc_pcm_runtime *runtime)
{ {
struct snd_soc_card *card = runtime->card; struct snd_soc_card *card = runtime->card;
struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; struct snd_soc_component *component = runtime->codec_dais[0]->component;
int ret; int ret;
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_DA_STEREO_FILTER | RT5645_DA_STEREO_FILTER |
RT5645_AD_STEREO_FILTER, RT5645_AD_STEREO_FILTER,
RT5645_CLK_SEL_I2S1_ASRC); RT5645_CLK_SEL_I2S1_ASRC);
@ -101,7 +101,7 @@ static int mt8173_rt5650_rt5514_init(struct snd_soc_pcm_runtime *runtime)
return ret; return ret;
} }
return rt5645_set_jack_detect(codec, return rt5645_set_jack_detect(component,
&mt8173_rt5650_rt5514_jack, &mt8173_rt5650_rt5514_jack,
&mt8173_rt5650_rt5514_jack, &mt8173_rt5650_rt5514_jack,
&mt8173_rt5650_rt5514_jack); &mt8173_rt5650_rt5514_jack);

12
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
Просмотреть файл

@ -86,19 +86,19 @@ static struct snd_soc_jack mt8173_rt5650_rt5676_jack;
static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime) static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime)
{ {
struct snd_soc_card *card = runtime->card; struct snd_soc_card *card = runtime->card;
struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; struct snd_soc_component *component = runtime->codec_dais[0]->component;
struct snd_soc_codec *codec_sub = runtime->codec_dais[1]->codec; struct snd_soc_component *component_sub = runtime->codec_dais[1]->component;
int ret; int ret;
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_DA_STEREO_FILTER | RT5645_DA_STEREO_FILTER |
RT5645_AD_STEREO_FILTER, RT5645_AD_STEREO_FILTER,
RT5645_CLK_SEL_I2S1_ASRC); RT5645_CLK_SEL_I2S1_ASRC);
rt5677_sel_asrc_clk_src(codec_sub, rt5677_sel_asrc_clk_src(component_sub,
RT5677_DA_STEREO_FILTER | RT5677_DA_STEREO_FILTER |
RT5677_AD_STEREO1_FILTER, RT5677_AD_STEREO1_FILTER,
RT5677_CLK_SEL_I2S1_ASRC); RT5677_CLK_SEL_I2S1_ASRC);
rt5677_sel_asrc_clk_src(codec_sub, rt5677_sel_asrc_clk_src(component_sub,
RT5677_AD_STEREO2_FILTER | RT5677_AD_STEREO2_FILTER |
RT5677_I2S2_SOURCE, RT5677_I2S2_SOURCE,
RT5677_CLK_SEL_I2S2_ASRC); RT5677_CLK_SEL_I2S2_ASRC);
@ -114,7 +114,7 @@ static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime)
return ret; return ret;
} }
return rt5645_set_jack_detect(codec, return rt5645_set_jack_detect(component,
&mt8173_rt5650_rt5676_jack, &mt8173_rt5650_rt5676_jack,
&mt8173_rt5650_rt5676_jack, &mt8173_rt5650_rt5676_jack,
&mt8173_rt5650_rt5676_jack); &mt8173_rt5650_rt5676_jack);

12
sound/soc/mediatek/mt8173/mt8173-rt5650.c
Просмотреть файл

@ -112,26 +112,26 @@ static struct snd_soc_jack mt8173_rt5650_jack;
static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
{ {
struct snd_soc_card *card = runtime->card; struct snd_soc_card *card = runtime->card;
struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; struct snd_soc_component *component = runtime->codec_dais[0]->component;
const char *codec_capture_dai = runtime->codec_dais[1]->name; const char *codec_capture_dai = runtime->codec_dais[1]->name;
int ret; int ret;
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_DA_STEREO_FILTER, RT5645_DA_STEREO_FILTER,
RT5645_CLK_SEL_I2S1_ASRC); RT5645_CLK_SEL_I2S1_ASRC);
if (!strcmp(codec_capture_dai, "rt5645-aif1")) { if (!strcmp(codec_capture_dai, "rt5645-aif1")) {
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_AD_STEREO_FILTER, RT5645_AD_STEREO_FILTER,
RT5645_CLK_SEL_I2S1_ASRC); RT5645_CLK_SEL_I2S1_ASRC);
} else if (!strcmp(codec_capture_dai, "rt5645-aif2")) { } else if (!strcmp(codec_capture_dai, "rt5645-aif2")) {
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_AD_STEREO_FILTER, RT5645_AD_STEREO_FILTER,
RT5645_CLK_SEL_I2S2_ASRC); RT5645_CLK_SEL_I2S2_ASRC);
} else { } else {
dev_warn(card->dev, dev_warn(card->dev,
"Only one dai codec found in DTS, enabled rt5645 AD filter\n"); "Only one dai codec found in DTS, enabled rt5645 AD filter\n");
rt5645_sel_asrc_clk_src(codec, rt5645_sel_asrc_clk_src(component,
RT5645_AD_STEREO_FILTER, RT5645_AD_STEREO_FILTER,
RT5645_CLK_SEL_I2S1_ASRC); RT5645_CLK_SEL_I2S1_ASRC);
} }
@ -147,7 +147,7 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
return ret; return ret;
} }
return rt5645_set_jack_detect(codec, return rt5645_set_jack_detect(component,
&mt8173_rt5650_jack, &mt8173_rt5650_jack,
&mt8173_rt5650_jack, &mt8173_rt5650_jack,
&mt8173_rt5650_jack); &mt8173_rt5650_jack);

8
sound/soc/rockchip/rockchip_rt5645.c
Просмотреть файл

@ -29,16 +29,12 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include "rockchip_i2s.h" #include "rockchip_i2s.h"
#include "../codecs/rt5645.h"
#define DRV_NAME "rockchip-snd-rt5645" #define DRV_NAME "rockchip-snd-rt5645"
static struct snd_soc_jack headset_jack; static struct snd_soc_jack headset_jack;
/* Jack detect via rt5645 driver. */
extern int rt5645_set_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack,
struct snd_soc_jack *btn_jack);
static const struct snd_soc_dapm_widget rk_dapm_widgets[] = { static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphones", NULL), SND_SOC_DAPM_HP("Headphones", NULL),
SND_SOC_DAPM_SPK("Speakers", NULL), SND_SOC_DAPM_SPK("Speakers", NULL),
@ -129,7 +125,7 @@ static int rk_init(struct snd_soc_pcm_runtime *runtime)
return ret; return ret;
} }
return rt5645_set_jack_detect(runtime->codec, return rt5645_set_jack_detect(runtime->codec_dai->component,
&headset_jack, &headset_jack,
&headset_jack, &headset_jack,
&headset_jack); &headset_jack);