diff options
| -rwxr-xr-x | audio/audio_hw.c | 5 | ||||
| -rw-r--r-- | configs/tiny_hw.xml | 18 |
2 files changed, 8 insertions, 15 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 6645647..e6dd08e 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -2750,9 +2750,10 @@ static const struct { { AUDIO_DEVICE_OUT_SPEAKER, "speaker" }, { AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE, "headphone" }, { AUDIO_DEVICE_OUT_EARPIECE, "earpiece" }, - { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "analog-dock" }, - { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "analog-dock" }, + { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "dock" }, + { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "dock" }, { AUDIO_DEVICE_OUT_ALL_SCO, "sco-out" }, + { AUDIO_DEVICE_OUT_AUX_DIGITAL, "aux-digital" }, { AUDIO_DEVICE_IN_BUILTIN_MIC, "builtin-mic" }, { AUDIO_DEVICE_IN_BACK_MIC, "back-mic" }, diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml index 241a289..c9fba6b 100644 --- a/configs/tiny_hw.xml +++ b/configs/tiny_hw.xml @@ -209,7 +209,7 @@ We are able to have most of our routing static so do that <ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="0"/> </path> </device> -<device name="analog-dock"> +<device name="dock"> <path name="on"> <ctl name="LINEOUT2N Switch" val="1"/> <ctl name="LINEOUT2P Switch" val="1"/> @@ -237,24 +237,16 @@ We are able to have most of our routing static so do that <ctl name="LINEOUT2 Volume" val="1"/> </path> </device> -<device name="digital-dock"> +<device name="aux-digital"> <path name="on"> <ctl name="LINEOUT1N Switch" val="1"/> <ctl name="LINEOUT1P Switch" val="1"/> <ctl name="HDMI Switch" val="1"/> - <ctl name="AIF1DAC1 Volume" val="96"/> </path> <path name="off"> - <ctl name="LINEOUT1N Switch" val="1"/> - <ctl name="LINEOUT1P Switch" val="1"/> - <ctl name="HDMI Switch" val="1"/> - <ctl name="AIF1DAC1 Volume" val="96"/> - <ctl name="AIF1 Boost Volume" val="0"/> - <ctl name="DAC1 Volume" val="96"/> - <ctl name="SPKL DAC1 Volume" val="1"/> - <ctl name="SPKR DAC1 Volume" val="1"/> - <ctl name="Speaker Mixer Volume" val="0"/> - <ctl name="Speaker Boost Volume" val="0"/> + <ctl name="LINEOUT1N Switch" val="0"/> + <ctl name="LINEOUT1P Switch" val="0"/> + <ctl name="HDMI Switch" val="0"/> </path> </device> <device name="builtin-mic"> |