Skip to content

add ucm support for CML and GLK Chrome #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aiChaoSONG wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add ucm support for CML and GLK Chrome #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaac0f5
ucm: add sof ucm for CML Chrome with rt5682 codec
Oct 9, 2019
b6a2ff3
ucm: add sof ucm for GLK Chrome with da7219 codec
Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/ucm/sof-glkda7219max/HiFi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
SectionVerb {
EnableSequence [
cdev "hw:sofglkda7219max"
cset "name='Headphone Switch' off"
cset "name='Mic Volume' 80"
cset "name='Out DACR Mux' 3"
cset "name='Out DAIR Mux' 0"
cset "name='Pin5-Port0 Mux' 1"
cset "name='Pin5-Port1 Mux' 2"
cset "name='Pin5-Port2 Mux' 3"
cset "name='Pin6-Port0 Mux' 1"
cset "name='Pin6-Port1 Mux' 2"
cset "name='Pin6-Port2 Mux' 3"
cset "name='Pin7-Port0 Mux' 1"
cset "name='Pin7-Port1 Mux' 2"
cset "name='Pin7-Port2 Mux' 3"
]
DisableSequence [
]
}

SectionDevice."Speaker" {
Comment "Speaker Playback"
Value {
PlaybackPCM "hw:sofglkda7219max,0"
PlaybackChannels "2"
}
EnableSequence [
cdev "hw:sofglkda7219max"
cset "name='Spk Switch' on"
]
DisableSequence [
cdev "hw:sofglkda7219max"
cset "name='Spk Switch' off"
]
}
SectionDevice."Headphone Playback" {
Comment "Headphone Playback"
Value {
PlaybackPCM "hw:sofglkda7219max,1"
PlaybackChannels "2"
}
EnableSequence [
cdev "hw:sofglkda7219max"
cset "name='Headphone Switch' on"
cset "name='Playback Digital Switch' on"
cset "name='Mixer Out FilterL DACL Switch' on"
cset "name='Mixer Out FilterR DACR Switch' on"
]
DisableSequence [
cdev "hw:sofglkda7219max"
cset "name='Headphone Switch' off"
cset "name='Playback Digital Switch' off"
cset "name='Mixer Out FilterL DACL Switch' off"
cset "name='Mixer Out FilterR DACR Switch' off"
]
}
SectionDevice."DMIC" {
Comment "DMIC Capture"
Value {
CapturePCM "hw:sofglkda7219max,99"
CaptureChannels "4"
}
EnableSequence [
cdev "hw:sofglkda7219max"
]
DisableSequence [
cdev "hw:sofglkda7219max"
]
}
SectionDevice."Mic" {
Comment "Headphone Capture"
Value {
CapturePCM "hw:sofglkda7219max,1"
CaptureChannels "2"
}
EnableSequence [
cdev "hw:sofglkda7219max"
cset "name='Headset Mic Switch' on"
cset "name='Mixer In Mic Switch' on"
cset "name='Capture Digital Switch' on"
cset "name='Mixer In Mic Switch' on"
cset "name='Mixin Switch' on"
cset "name='Mic Switch' on"
]
DisableSequence [
cdev "hw:sofglkda7219max"
cset "name='Headset Mic Switch' off"
cset "name='Mixer In Mic Switch' off"
cset "name='Capture Digital Switch' off"
cset "name='Mixer In Mic Switch' off"
cset "name='Mixin Switch' off"
cset "name='Mic Switch' off"
]
}
SectionDevice."HDMI1" {
Comment "HDMI1 Playback"
Value {
PlaybackPCM "hw:sofglkda7219max,5"
PlaybackChannels "2"
}
EnableSequence [
]
DisableSequence [
]
}
SectionDevice."HDMI2" {
Comment "HDMI2 Playback"
Value {
PlaybackPCM "hw:sofglkda7219max,6"
PlaybackChannels "2"
}
EnableSequence [
]
DisableSequence [
]
}
SectionDevice."HDMI3" {
Comment "HDMI3 Playback"
Value {
PlaybackPCM "hw:sofglkda7219max,7"
PlaybackChannels "2"
}
EnableSequence [
]
DisableSequence [
]
}
4 changes: 4 additions & 0 deletions src/ucm/sof-glkda7219max/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/sof-glkda7219max
ucm_DATA = sof-glkda7219max.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)
5 changes: 5 additions & 0 deletions src/ucm/sof-glkda7219max/sof-glkda7219max.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Comment "sof-glkda7219max internal card"
SectionUseCase."HiFi" {
File "HiFi.conf"
Comment "Default"
}
163 changes: 163 additions & 0 deletions src/ucm/sof-sof_rt5682/HiFi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
SectionVerb {
EnableSequence [
cdev "hw:sofsofrt5682"
cset "name='Headphone Jack Switch' off"
cset "name='HPOL Playback Switch' off"
cset "name='HPOR Playback Switch' off"
cset "name='Stereo1 DAC MIXL DAC L1 Switch' 0"
cset "name='Stereo1 DAC MIXR DAC R1 Switch' 0"
cset "name='RECMIX1L CBJ Switch' 0"
cset "name='Stereo1 ADC L Mux' 0"
cset "name='Stereo1 ADC MIXL ADC1 Switch' 0"
cset "name='Stereo1 ADC MIXR ADC1 Switch' 0"
cset "name='Pin5-Port0 Mux' 1"
cset "name='Pin5-Port1 Mux' 2"
cset "name='Pin5-Port2 Mux' 3"
cset "name='Pin6-Port0 Mux' 1"
cset "name='Pin6-Port1 Mux' 2"
cset "name='Pin6-Port2 Mux' 3"
cset "name='Pin7-Port0 Mux' 1"
cset "name='Pin7-Port1 Mux' 2"
cset "name='Pin7-Port2 Mux' 3"
]
DisableSequence [
]
}
SectionDevice."Speaker" {
Comment "Speaker Playback"
Value {
PlaybackPCM "hw:sofsofrt5682,5"
PlaybackChannels "2"
}
EnableSequence [
cdev "hw:sofsofrt5682"
cset "name='Spk Switch' on"
]
DisableSequence [
cdev "hw:sofsofrt5682"
cset "name='Spk Switch' off"
]
}
SectionDevice."Headphone" {
Comment "Headphone Playback"
Value {
PlaybackPCM "hw:sofsofrt5682,0"
PlaybackChannels "2"
}
EnableSequence [
cdev "hw:sofsofrt5682"
cset "name='Headphone Jack Switch' on"
cset "name='HPOL Playback Switch' 1"
cset "name='HPOR Playback Switch' 1"
cset "name='Stereo1 DAC MIXL DAC L1 Switch' 1"
cset "name='Stereo1 DAC MIXR DAC R1 Switch' 1"
]
DisableSequence [
cdev "hw:sofsofrt5682"
cset "name='Headphone Jack Switch' off"
]
}
SectionDevice."Mic" {
Comment "Headphone Capture"
Value {
CapturePCM "hw:sofsofrt5682,0"
MixerName "Headset Mic"
CaptureChannels "2"
}
EnableSequence [
cdev "hw:sofsofrt5682"
cset "name='Headphone Jack Switch' on"
cset "name='Headset Mic Switch' on"
cset "name='STO1 ADC Capture Switch' on"
cset "name='RECMIX1L CBJ Switch' 1"
cset "name='IF1 01 ADC Swap Mux' 2"
cset "name='CBJ Boost Volume' 3"
cset "name='Stereo1 ADC L Mux' 0"
cset "name='Stereo1 ADC L1 Mux' 1"
cset "name='Stereo1 ADC R1 Mux' 1"
cset "name='Stereo1 ADC MIXL ADC2 Switch' 0"
cset "name='Stereo1 ADC MIXR ADC2 Switch' 0"
cset "name='Stereo1 ADC MIXL ADC1 Switch' 1"
cset "name='Stereo1 ADC MIXR ADC1 Switch' 1"
]
DisableSequence [
cdev "hw:sofsofrt5682"
cset "name='Headset Mic Switch' off"
cset "name='IF1 01 ADC Swap Mux' 0"
cset "name='Stereo1 ADC L1 Switch' 0"
cset "name='Stereo1 ADC L1 Switch' 0"
cset "name='RECMIX1L CBJ Switch' 0"
cset "name='Stereo1 ADC MIXL ADC1 Switch' 0"
cset "name='Stereo1 ADC MIXR ADC1 Switch' 0"
cset "name='Stereo1 ADC L1 Mux' 0"
cset "name='Stereo1 ADC R1 Mux' 0"
cset "name='STO1 ADC Capture Switch' off"
]
}
SectionDevice."HDMI1" {
Comment "HDMI 1"
Value {
PlaybackPCM "hw:sofsofrt5682,2"
JackName "sof-sof_rt5682 HDMI/DP, pcm=3 Jack"
JackType "gpio"
PlaybackChannels "2"
}
EnableSequence [
]
DisableSequence [
]
}
SectionDevice."HDMI2" {
Comment "HDMI 2"
Value {
PlaybackPCM "hw:sofsofrt5682,3"
JackName "sof-sof_rt5682 HDMI/DP, pcm=4 Jack"
JackType "gpio"
PlaybackChannels "2"
}
EnableSequence [
]
DisableSequence [
]
}
SectionDevice."HDMI3" {
Comment "HDMI 3"
Value {
PlaybackPCM "hw:sofsofrt5682,4"
JackName "sof-sof_rt5682 HDMI/DP, pcm=5 Jack"
JackType "gpio"
PlaybackChannels "2"
}
EnableSequence [
]
DisableSequence [
]
}
SectionDevice."DMIC" {
Comment "DMIC"
Value {
CapturePCM "hw:sofsofrt5682,1"
CaptureChannels "4"
}
EnableSequence [
cdev "hw:sofsofrt5682"
]
DisableSequence [
cdev "hw:sofsofrt5682"
]
}

# hw:sofsofrt5682,8 only for wov
#SectionDevice."DMIC16k" {
# Comment "DMIC16k"
# Value {
# CapturePCM "hw:sofsofrt5682,8"
# CaptureChannels "2"
# }
# EnableSequence [
# cdev "hw:sofsofrt5682"
# ]
# DisableSequence [
# cdev "hw:sofsofrt5682"
# ]
#}
4 changes: 4 additions & 0 deletions src/ucm/sof-sof_rt5682/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/sof-sof_rt5682
ucm_DATA = sof-sof_rt5682.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)
5 changes: 5 additions & 0 deletions src/ucm/sof-sof_rt5682/sof-sof_rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Comment "sof-cmlrt5682max internal card"
SectionUseCase."HiFi" {
File "HiFi.conf"
Comment "Default"
}