ALSA: hda/cm9825: Add GENE_TWL7 support for AAEON
PATCH v6 1/1 ALSA: hda/cm9825: Add GENE_TWL7 support for AAEON
The GENE_TWL7 project is an AAEON platform with a fixed audio configuration consisting of line-out, line-in, and mic-in. The audio routing and pin assignments are defined according to the board-level hardware design and are not intended to be dynamically changed.
Signed-off-by Leo Tsai <[email protected]>
--- sound/hda/codecs/cm9825.c | 290 +++++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 7 deletions(-)
sound/hda/codecs/cm9825.c +283 -7
@@ -13,6 +13,11 @@#include "hda_jack.h" #include "generic.h" +enum { +QUIRK_CM_STD =0x0 , +QUIRK_GENE_TWL7_SSID =0x160dc000 +}; +/* CM9825 Offset Definitions */ #define CM9825_VERB_SET_HPF_1 0x781
@@ -25,6 +30,7 @@#define CM9825_VERB_SET_VNEG 0x7a8#define CM9825_VERB_SET_D2S 0x7a9#define CM9825_VERB_SET_DACTRL 0x7aa +#define CM9825_VERB_SET_P3BCP 0x7ab#define CM9825_VERB_SET_PDNEG 0x7ac#define CM9825_VERB_SET_VDO 0x7ad#define CM9825_VERB_SET_CDALR 0x7b0
@@ -42,7 +48,12 @@ struct cmi_spec {const struct hda_verb *chip_hp_present_verbs;const struct hda_verb *chip_hp_remove_verbs;struct hda_codec *codec; +struct delayed_work unsol_inputs_work; +struct delayed_work unsol_lineout_work;struct delayed_work unsol_hp_work; +hda_nid_t jd_cap_hp; +hda_nid_t jd_cap_lineout; +hda_nid_t jd_cap_inputs[AUTO_CFG_MAX_INS ];int quirk; };
@@ -111,6 +122,121 @@ static const struct hda_verb cm9825_hp_remove_verbs[] = { {} }; +/* +* To save power, AD/CLK is turned off. +*/ +static const struct hda_verb cm9825_gene_twl7_d3_verbs[] = { + {0x43 ,CM9825_VERB_SET_D2S ,0x62 }, + {0x43 ,CM9825_VERB_SET_PLL ,0x01 }, + {0x43 ,CM9825_VERB_SET_NEG ,0xc2 }, + {0x43 ,CM9825_VERB_SET_ADCL ,0x00 }, + {0x43 ,CM9825_VERB_SET_DACL ,0x02 }, + {0x43 ,CM9825_VERB_SET_MBIAS ,0x00 }, + {0x43 ,CM9825_VERB_SET_VNEG ,0x50 }, + {0x43 ,CM9825_VERB_SET_PDNEG ,0x04 }, + {0x43 ,CM9825_VERB_SET_CDALR ,0xf6 }, + {0x43 ,CM9825_VERB_SET_OTP ,0xcd }, + {} +}; + +/* +* These settings are required to properly enable the PLL, clock, ADC and +* DAC paths, and to select the correct analog input routing. Without +* these explicit configurations, the ADC does not start correctly and +* recording does not work reliably on this hardware. +* +* D0 configuration: enable PLL/CLK/ADC/DAC and optimize performance +*/ +static const struct hda_verb cm9825_gene_twl7_d0_verbs[] = { + {0x34 ,AC_VERB_SET_EAPD_BTLENABLE ,0x02 }, + {0x43 ,CM9825_VERB_SET_SNR ,0x38 }, + {0x43 ,CM9825_VERB_SET_PLL ,0x00 }, + {0x43 ,CM9825_VERB_SET_ADCL ,0xcf }, + {0x43 ,CM9825_VERB_SET_DACL ,0xaa }, + {0x43 ,CM9825_VERB_SET_MBIAS ,0x1c }, + {0x43 ,CM9825_VERB_SET_VNEG ,0x56 }, + {0x43 ,CM9825_VERB_SET_D2S ,0x62 }, + {0x43 ,CM9825_VERB_SET_DACTRL ,0x00 }, + {0x43 ,CM9825_VERB_SET_PDNEG ,0x0c }, + {0x43 ,CM9825_VERB_SET_CDALR ,0xf4 }, + {0x43 ,CM9825_VERB_SET_OTP ,0xcd }, + {0x43 ,CM9825_VERB_SET_MTCBA ,0x61 }, + {0x43 ,CM9825_VERB_SET_OCP ,0x33 }, + {0x43 ,CM9825_VERB_SET_GAD ,0x07 }, + {0x43 ,CM9825_VERB_SET_TMOD ,0x26 }, + {0x43 ,CM9825_VERB_SET_HPF_1 ,0x40 }, + {0x43 ,CM9825_VERB_SET_HPF_2 ,0x40 }, + {0x40 ,AC_VERB_SET_CONNECT_SEL ,0x00 }, + {0x3d ,AC_VERB_SET_CONNECT_SEL ,0x01 }, + {0x46 ,CM9825_VERB_SET_P3BCP ,0x20 }, + {} +}; + +/* +* Enable DAC to start playback. +*/ +static const struct hda_verb cm9825_gene_twl7_playback_start_verbs[] = { + {0x43 ,CM9825_VERB_SET_D2S ,0xf2 }, + {0x43 ,CM9825_VERB_SET_VDO ,0xd4 }, + {0x43 ,CM9825_VERB_SET_SNR ,0x30 }, + {} +}; + +/* +* Disable DAC and enable de-pop noise mechanism. +*/ +static const struct hda_verb cm9825_gene_twl7_playback_stop_verbs[] = { + {0x43 ,CM9825_VERB_SET_VDO ,0xc0 }, + {0x43 ,CM9825_VERB_SET_D2S ,0x62 }, + {0x43 ,CM9825_VERB_SET_VDO ,0xd0 }, + {0x43 ,CM9825_VERB_SET_SNR ,0x38 }, + {} +}; + +static void cm9825_update_jk_plug_status (struct hda_codec *codec,hda_nid_t nid) +{ +struct cmi_spec *spec = codec->spec; +bool jack_plugin; +struct hda_jack_tbl *jack; + + jack_plugin =snd_hda_jack_detect (spec->codec, nid); + jack =snd_hda_jack_tbl_get (spec->codec, nid); +if (jack) { + jack->block_report =0 ; +snd_hda_jack_report_sync (spec->codec); + } + +codec_dbg (spec->codec, +"%s, jack_plugin %d, nid 0x%X, line%d\n" , + __func__, (int )jack_plugin, nid, __LINE__); +} + +static void cm9825_unsol_inputs_delayed (struct work_struct *work) +{ +struct cmi_spec *spec = + container_of(to_delayed_work(work), struct cmi_spec, + unsol_inputs_work); +int i; + +for (i =0 ; i < spec->gen.autocfg.num_inputs; i++) { +if (!spec->jd_cap_inputs[i]) +continue ; + +cm9825_update_jk_plug_status (spec->codec, + spec->gen.autocfg.inputs[i].pin); + } +} + +static void cm9825_unsol_lineout_delayed (struct work_struct *work) +{ +struct cmi_spec *spec = + container_of(to_delayed_work(work), struct cmi_spec, + unsol_lineout_work); + +cm9825_update_jk_plug_status (spec->codec, + spec->gen.autocfg.line_out_pins[0 ]); +} +static void cm9825_unsol_hp_delayed (struct work_struct *work) { struct cmi_spec *spec =
@@ -159,16 +285,93 @@ static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb) tbl =snd_hda_jack_tbl_get (codec, cb->nid);if (tbl) tbl->block_report =1 ; -schedule_delayed_work (&spec->unsol_hp_work,msecs_to_jiffies (200 )); + +if (cb->nid == spec->jd_cap_hp) +schedule_delayed_work (&spec->unsol_hp_work, +msecs_to_jiffies (200 )); +else if (cb->nid == spec->jd_cap_lineout) +schedule_delayed_work (&spec->unsol_lineout_work, +msecs_to_jiffies (200 )); + +for (int i =0 ; i < spec->gen.autocfg.num_inputs; i++) { +if (cb->nid == spec->jd_cap_inputs[i]) +schedule_delayed_work (&spec->unsol_inputs_work, +msecs_to_jiffies (200 )); + } }static void cm9825_setup_unsol (struct hda_codec *codec) {struct cmi_spec *spec = codec->spec; +int i;hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0 ]; -snd_hda_jack_detect_enable_callback (codec, hp_pin, hp_callback); +hda_nid_t lineout_pin = spec->gen.autocfg.line_out_pins[0 ]; + +if (hp_pin !=0 ) { +if (is_jack_detectable (codec, hp_pin)) { + spec->jd_cap_hp = hp_pin; +snd_hda_jack_detect_enable_callback (codec, hp_pin, + hp_callback); + }else + spec->jd_cap_hp =0 ; + }else + spec->jd_cap_hp =0 ; + +if (lineout_pin !=0 ) { +if (is_jack_detectable (codec, lineout_pin)) { + spec->jd_cap_lineout = lineout_pin; +snd_hda_jack_detect_enable_callback (codec, lineout_pin, + hp_callback); + }else + spec->jd_cap_lineout =0 ; + }else + spec->jd_cap_lineout =0 ; + +codec_dbg (codec, +"%s, jd_cap_hp 0x%02X, jd_cap_lineout 0x%02X, line%d\n" , + __func__, spec->jd_cap_hp, spec->jd_cap_lineout, __LINE__); + +for (i =0 ; i < spec->gen.autocfg.num_inputs; i++) { +if (spec->gen.autocfg.inputs[i].pin !=0 ) { +if (is_jack_detectable + (codec, spec->gen.autocfg.inputs[i].pin)) { + spec->jd_cap_inputs[i] = + spec->gen.autocfg.inputs[i].pin; +snd_hda_jack_detect_enable_callback (codec, + spec->gen.autocfg.inputs[i].pin, + hp_callback); + }else + spec->jd_cap_inputs[i] =0 ; + }else + spec->jd_cap_inputs[i] =0 ; + +codec_dbg (codec, +"%s, input jd_cap_inputs[%d] 0x%02X, line%d\n" , + __func__, i, spec->jd_cap_inputs[i], __LINE__); + } +} + +static void cm9825_playback_pcm_hook (struct hda_pcm_stream *hinfo, +struct hda_codec *codec, +struct snd_pcm_substream *substream, +int action) +{ +struct cmi_spec *spec = codec->spec; + +switch (action) { +case HDA_GEN_PCM_ACT_PREPARE : +snd_hda_sequence_write (spec->codec, + cm9825_gene_twl7_playback_start_verbs); +break ; +case HDA_GEN_PCM_ACT_CLEANUP : +snd_hda_sequence_write (spec->codec, + cm9825_gene_twl7_playback_stop_verbs); +break ; +default : +return ; + } }static int cm9825_init (struct hda_codec *codec)
@@ -182,23 +385,48 @@ static int cm9825_init(struct hda_codec *codec)static void cm9825_remove (struct hda_codec *codec) {struct cmi_spec *spec = codec->spec; +int i; + +if (spec->jd_cap_hp) +cancel_delayed_work_sync (&spec->unsol_hp_work); + +if (spec->jd_cap_lineout) +cancel_delayed_work_sync (&spec->unsol_lineout_work); + +for (i =0 ; i < spec->gen.autocfg.num_inputs; i++) { +if (spec->jd_cap_inputs[i]) { +cancel_delayed_work_sync (&spec->unsol_inputs_work); +break ; + } + } -cancel_delayed_work_sync (&spec->unsol_hp_work);snd_hda_gen_remove (codec); }static int cm9825_suspend (struct hda_codec *codec) {struct cmi_spec *spec = codec->spec; +int i; + +if (spec->jd_cap_hp) +cancel_delayed_work_sync (&spec->unsol_hp_work); -cancel_delayed_work_sync (&spec->unsol_hp_work); +if (spec->jd_cap_lineout) +cancel_delayed_work_sync (&spec->unsol_lineout_work); + +for (i =0 ; i < spec->gen.autocfg.num_inputs; i++) { +if (spec->jd_cap_inputs[i]) { +cancel_delayed_work_sync (&spec->unsol_inputs_work); +break ; + } + }snd_hda_sequence_write (codec, spec->chip_d3_verbs);return 0 ; } -static int cm9825_resume (struct hda_codec *codec) +static int cm9825_cm_std_resume (struct hda_codec *codec) {struct cmi_spec *spec = codec->spec;hda_nid_t hp_pin =0 ;
@@ -215,6 +443,8 @@ static int cm9825_resume(struct hda_codec *codec)snd_hda_codec_init (codec); +snd_hda_sequence_write (codec, spec->chip_d0_verbs); + hp_pin = spec->gen.autocfg.hp_pins[0 ]; hp_jack_plugin =snd_hda_jack_detect (spec->codec, hp_pin);
@@ -232,6 +462,20 @@ static int cm9825_resume(struct hda_codec *codec)snd_hda_sequence_write (codec, cm9825_hp_remove_verbs); } +return 0 ; +} + +static int cm9825_resume (struct hda_codec *codec) +{ +struct cmi_spec *spec = codec->spec; + +if (codec->core.subsystem_id ==QUIRK_CM_STD ) +cm9825_cm_std_resume (codec); +else if (codec->core.subsystem_id ==QUIRK_GENE_TWL7_SSID ) { +snd_hda_codec_init (codec); +snd_hda_sequence_write (codec, spec->chip_d0_verbs); + } +snd_hda_regmap_sync (codec);hda_call_check_power_status (codec,0x01 );
@@ -242,13 +486,15 @@ static int cm9825_probe(struct hda_codec *codec, const struct hda_device_id *id) {struct cmi_spec *spec;struct auto_pin_cfg *cfg; -int err; +int err =0 ; spec =kzalloc (sizeof (*spec),GFP_KERNEL );if (spec ==NULL )return -ENOMEM ; -INIT_DELAYED_WORK (&spec->unsol_hp_work, cm9825_unsol_hp_delayed); +codec_dbg (codec,"chip_name: %s, ssid: 0x%X\n" , + codec->core.chip_name, codec->core.subsystem_id); + codec->spec = spec; spec->codec = codec; cfg = &spec->gen.autocfg;
@@ -258,6 +504,36 @@ static int cm9825_probe(struct hda_codec *codec, const struct hda_device_id *id) spec->chip_hp_present_verbs = cm9825_hp_present_verbs; spec->chip_hp_remove_verbs = cm9825_hp_remove_verbs; +INIT_DELAYED_WORK (&spec->unsol_hp_work, cm9825_unsol_hp_delayed); +INIT_DELAYED_WORK (&spec->unsol_inputs_work, + cm9825_unsol_inputs_delayed); +INIT_DELAYED_WORK (&spec->unsol_lineout_work, + cm9825_unsol_lineout_delayed); + +switch (codec->core.subsystem_id) { +case QUIRK_CM_STD : +snd_hda_codec_set_name (codec,"CM9825 STD" ); + spec->chip_d0_verbs = cm9825_std_d0_verbs; + spec->chip_d3_verbs = cm9825_std_d3_verbs; + spec->chip_hp_present_verbs = cm9825_hp_present_verbs; + spec->chip_hp_remove_verbs = cm9825_hp_remove_verbs; +break ; +case QUIRK_GENE_TWL7_SSID : +snd_hda_codec_set_name (codec,"CM9825 GENE_TWL7" ); + spec->chip_d0_verbs = cm9825_gene_twl7_d0_verbs; + spec->chip_d3_verbs = cm9825_gene_twl7_d3_verbs; + spec->gen.pcm_playback_hook = cm9825_playback_pcm_hook; +/* Internal fixed device, Rear, Mic-in, 3.5mm */ +snd_hda_codec_set_pincfg (codec,0x37 ,0x24A70100 ); +break ; +default : + err = -ENXIO ; +break ; + } + +if (err <0 ) + goto error; +snd_hda_sequence_write (codec, spec->chip_d0_verbs); err =snd_hda_parse_pin_defcfg (codec, cfg,NULL ,0 );
Signature · 1 line
2.43.0
Quoted 8 lines · Leo Tsai
The
GENE_TWL7project is an AAEON platform with a fixed audio configuration consisting of line-out, line-in, and mic-in. The audio routing and pin assignments are defined according to the board-level hardware design and are not intended to be dynamically changed.Signed-off-by Leo Tsai <[email protected]>
Applied now to for-next branch. Thanks.
Takashi