Commit 00a6941c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: wm8993/wm8994/wm8958: replace codec to component

Now we can replace Codec to Component. Let's do it.

Becase wm8993/wm8994/wm8958 are using wm_hubs feature,
we need to update these all related drivers in same time.
Otherwise compile error/warning happen

wm8993:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1

wm8994:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -43,18 +43,18 @@ enum wm8994_vmid_mode { ...@@ -43,18 +43,18 @@ enum wm8994_vmid_mode {
typedef void (*wm1811_micdet_cb)(void *data); typedef void (*wm1811_micdet_cb)(void *data);
typedef void (*wm1811_mic_id_cb)(void *data, u16 status); typedef void (*wm1811_mic_id_cb)(void *data, u16 status);
int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, int wm8994_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack,
int micbias); int micbias);
int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, int wm8958_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack,
wm1811_micdet_cb cb, void *det_cb_data, wm1811_micdet_cb cb, void *det_cb_data,
wm1811_mic_id_cb id_cb, void *id_cb_data); wm1811_mic_id_cb id_cb, void *id_cb_data);
int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode); int wm8994_vmid_mode(struct snd_soc_component *component, enum wm8994_vmid_mode mode);
int wm8958_aif_ev(struct snd_soc_dapm_widget *w, int wm8958_aif_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event); struct snd_kcontrol *kcontrol, int event);
void wm8958_dsp2_init(struct snd_soc_codec *codec); void wm8958_dsp2_init(struct snd_soc_component *component);
struct wm8994_micdet { struct wm8994_micdet {
struct snd_soc_jack *jack; struct snd_soc_jack *jack;
......
This diff is collapsed.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <sound/control.h> #include <sound/control.h>
struct snd_soc_codec; struct snd_soc_component;
extern const unsigned int wm_hubs_spkmix_tlv[]; extern const unsigned int wm_hubs_spkmix_tlv[];
...@@ -34,7 +34,7 @@ struct wm_hubs_data { ...@@ -34,7 +34,7 @@ struct wm_hubs_data {
bool no_cache_dac_hp_direct; bool no_cache_dac_hp_direct;
struct list_head dcs_cache; struct list_head dcs_cache;
bool (*check_class_w_digital)(struct snd_soc_codec *); bool (*check_class_w_digital)(struct snd_soc_component *);
int micb1_delay; int micb1_delay;
int micb2_delay; int micb2_delay;
...@@ -50,12 +50,12 @@ struct wm_hubs_data { ...@@ -50,12 +50,12 @@ struct wm_hubs_data {
bool dcs_done_irq; bool dcs_done_irq;
struct completion dcs_done; struct completion dcs_done;
struct snd_soc_codec *codec; struct snd_soc_component *component;
}; };
extern int wm_hubs_add_analogue_controls(struct snd_soc_codec *); extern int wm_hubs_add_analogue_controls(struct snd_soc_component *);
extern int wm_hubs_add_analogue_routes(struct snd_soc_codec *, int, int); extern int wm_hubs_add_analogue_routes(struct snd_soc_component *, int, int);
extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *, extern int wm_hubs_handle_analogue_pdata(struct snd_soc_component *,
int lineout1_diff, int lineout2_diff, int lineout1_diff, int lineout2_diff,
int lineout1fb, int lineout2fb, int lineout1fb, int lineout2fb,
int jd_scthr, int jd_thr, int jd_scthr, int jd_thr,
...@@ -63,10 +63,10 @@ extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *, ...@@ -63,10 +63,10 @@ extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *,
int micbias1_lvl, int micbias2_lvl); int micbias1_lvl, int micbias2_lvl);
extern irqreturn_t wm_hubs_dcs_done(int irq, void *data); extern irqreturn_t wm_hubs_dcs_done(int irq, void *data);
extern void wm_hubs_vmid_ena(struct snd_soc_codec *codec); extern void wm_hubs_vmid_ena(struct snd_soc_component *component);
extern void wm_hubs_set_bias_level(struct snd_soc_codec *codec, extern void wm_hubs_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level); enum snd_soc_bias_level level);
extern void wm_hubs_update_class_w(struct snd_soc_codec *codec); extern void wm_hubs_update_class_w(struct snd_soc_component *component);
extern const struct snd_kcontrol_new wm_hubs_hpl_mux; extern const struct snd_kcontrol_new wm_hubs_hpl_mux;
extern const struct snd_kcontrol_new wm_hubs_hpr_mux; extern const struct snd_kcontrol_new wm_hubs_hpr_mux;
......
...@@ -258,13 +258,13 @@ static struct snd_soc_jack littlemill_headset; ...@@ -258,13 +258,13 @@ static struct snd_soc_jack littlemill_headset;
static int littlemill_late_probe(struct snd_soc_card *card) static int littlemill_late_probe(struct snd_soc_card *card)
{ {
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct snd_soc_dai *aif1_dai; struct snd_soc_dai *aif1_dai;
struct snd_soc_dai *aif2_dai; struct snd_soc_dai *aif2_dai;
int ret; int ret;
rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
codec = rtd->codec; component = rtd->codec_dai->component;
aif1_dai = rtd->codec_dai; aif1_dai = rtd->codec_dai;
rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name); rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name);
...@@ -290,10 +290,10 @@ static int littlemill_late_probe(struct snd_soc_card *card) ...@@ -290,10 +290,10 @@ static int littlemill_late_probe(struct snd_soc_card *card)
return ret; return ret;
/* This will check device compatibility itself */ /* This will check device compatibility itself */
wm8958_mic_detect(codec, &littlemill_headset, NULL, NULL, NULL, NULL); wm8958_mic_detect(component, &littlemill_headset, NULL, NULL, NULL, NULL);
/* As will this */ /* As will this */
wm8994_mic_detect(codec, &littlemill_headset, 1); wm8994_mic_detect(component, &littlemill_headset, 1);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment