shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: rk817-codec: add route config for L to ClassD and R to HPR

Browse Source 
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Ie3ebf144d622a2219716221bae6db616ea9a7aa2
This commit is contained in:
Shunhua Lan
2020-06-18 16:38:49 +08:00
committed by Tao Huang
parent 4132c41827
commit 7ba9790a40
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/sound/rockchip,rk817-codec.txt
View File

@@ -36,6 +36,8 @@ Required properties:
Boolean. Indicate use external amplifier or not.
- adc-for-loopback:
Boolean. Indicate adc use for loopback or not.
- out-l2spk-r2hp:
Boolean. Use route config for L to ClassD speaker out and R to HPR out
Example for rk817 codec:

29
sound/soc/codecs/rk817_codec.c
View File

@@ -84,6 +84,7 @@ struct rk817_codec_priv {
bool use_ext_amplifier;
bool adc_for_loopback;
bool out_l2spk_r2hp;
long int playback_path;
long int capture_path;
@@ -534,7 +535,31 @@ static int rk817_playback_path_put(struct snd_kcontrol *kcontrol,
case RING_SPK:
if (pre_path == OFF)
rk817_codec_power_up(component, RK817_CODEC_PLAYBACK);
if (!rk817->use_ext_amplifier) {
if (rk817->out_l2spk_r2hp) {
/* for costdown: ldac -> ClassD rdac -> Hp */
/* HP_CP_EN , CP 2.3V */
snd_soc_component_write(component, RK817_CODEC_AHP_CP,
0x11);
/* power on HP two stage opamp ,HP amplitude 0db */
snd_soc_component_write(component, RK817_CODEC_AHP_CFG0,
0x80);
/* power on dac ibias/l/r */
snd_soc_component_write(component, RK817_CODEC_ADAC_CFG1,
PWD_DACBIAS_ON | PWD_DACD_ON |
PWD_DACL_ON | PWD_DACR_ON);
/* CLASS D mode */
snd_soc_component_write(component,
RK817_CODEC_DDAC_MUTE_MIXCTL,
0x18);
/* CLASS D enable */
snd_soc_component_write(component,
RK817_CODEC_ACLASSD_CFG1,
0xa5);
/* restart CLASS D, OCPP/N */
snd_soc_component_write(component,
RK817_CODEC_ACLASSD_CFG2,
0xf7);
} else if (!rk817->use_ext_amplifier) {
/* power on dac ibias/l/r */
snd_soc_component_write(component, RK817_CODEC_ADAC_CFG1,
PWD_DACBIAS_ON | PWD_DACD_ON |
@@ -1099,6 +1124,8 @@ static int rk817_codec_parse_dt_property(struct device *dev,
rk817->use_ext_amplifier =
of_property_read_bool(node, "use-ext-amplifier");
rk817->out_l2spk_r2hp = of_property_read_bool(node, "out-l2spk-r2hp");
rk817->adc_for_loopback =
of_property_read_bool(node, "adc-for-loopback");