Skip to contentSkip to conversation

conf/ucm: Add chtrt5645-mono-speaker-analog-mic configuration

PATCH New Hans de Goede 2 participants 3 messages Jan 6, 2018 – Jan 9, 2018

lore
Share & tools
lore
#0 lore raw

cover conf/ucm: Add chtrt5645-mono-speaker-analog-mic configuration

Hi All,

Now that the kernel patch for the "Int Analog Mic" switch is queued for merging into 4.16, here is a non RFC version of my patch which adds a configuration for Cherry Trail boards which use a rt5645 codec connected to a mono speaker and with an analog mic on IN2N + IN2P.

Compared to the RFC version the line setting the Headphone Volume has been changed to set it to 25 (out of 39) instead of 31 because 31 has been reported to cause a crackling noise on some devices.

The chtrt5645-mono-speaker-analog-mic/HiFi.conf for this is based on the latest version from https://github.com/plbossart/UCM/tree/master/chtrt5645
with all the unused input options removed and some changes made to make the analog mic work.

This has been tested on the following devices:

GPD win
GPD pocket
Teclast X80 Pro

Regards,

Hans

#1 lore raw

PATCH 1/1 conf/ucm: Add chtrt5645-mono-speaker-analog-mic configuration

Add a configuration for Cherry Trail boards which use a rt5645 codec connected to a mono speaker and with an analog mic on IN2N + IN2P.

The chtrt5645-mono-speaker-analog-mic/HiFi.conf for this is based on the latest version from https://github.com/plbossart/UCM/tree/master/chtrt5645
with all the unused input options removed and some changes made to make the analog mic work.

This commit also adds 2 ucm dirs with the longname of 2 boards known to use this setup, which simply contain a symlink to the generic chtrt5645-mono-speaker-analog-mic entry.

---
 configure.ac                                       |   3 +
 src/conf/ucm/Makefile.am                           |   3 +
 .../Makefile.am                                    |   4 +
 ...TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf |   1 +
 .../chtrt5645-mono-speaker-analog-mic/HiFi.conf    | 361 +++++++++++++++++++++
 .../chtrt5645-mono-speaker-analog-mic/Makefile.am  |   4 +
 .../chtrt5645-mono-speaker-analog-mic.conf         |   5 +
 src/conf/ucm/gpd-win-pocket-rt5645/Makefile.am     |   4 +
 .../gpd-win-pocket-rt5645.conf                     |   1 +
 9 files changed, 386 insertions(+)
 create mode 100644 src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile.am
 create mode 120000 src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf
 create mode 100644 src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
 create mode 100644 src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile.am
 create mode 100644 src/conf/ucm/chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
 create mode 100644 src/conf/ucm/gpd-win-pocket-rt5645/Makefile.am
 create mode 120000 src/conf/ucm/gpd-win-pocket-rt5645/gpd-win-pocket-rt5645.conf
configure.ac +3 -0
index 47c50fcf..2c51ce75 100644
@@ -713,9 +713,11 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/ucm/broxton-rt298/Makefile \
 	  src/conf/ucm/bytcr-rt5651/Makefile \
 	  src/conf/ucm/chtrt5645/Makefile \
+	  src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile \
 	  src/conf/ucm/DAISY-I2S/Makefile \
 	  src/conf/ucm/DB410c/Makefile \
 	  src/conf/ucm/GoogleNyan/Makefile \
+	  src/conf/ucm/gpd-win-pocket-rt5645/Makefile \
 	  src/conf/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/Makefile \
 	  src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \
 	  src/conf/ucm/PandaBoard/Makefile \
@@ -723,6 +725,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/ucm/PAZ00/Makefile \
 	  src/conf/ucm/SDP4430/Makefile \
 	  src/conf/ucm/skylake-rt286/Makefile \
+	  src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile \
 	  src/conf/ucm/tegraalc5632/Makefile \
 	  src/conf/ucm/VEYRON-I2S/Makefile \
 	  src/conf/topology/Makefile \
src/conf/ucm/Makefile.am +3 -0
index 954e32b8..3b4f13a8 100644
@@ -3,9 +3,11 @@ broadwell-rt286 \
 broxton-rt298 \
 bytcr-rt5651 \
 chtrt5645 \
+chtrt5645-mono-speaker-analog-mic \
 DAISY-I2S \
 DB410c \
 GoogleNyan \
+gpd-win-pocket-rt5645 \
 HDAudio-Gigabyte-ALC1220DualCodecs \
 HDAudio-Lenovo-DualCodecs \
 PandaBoard \
@@ -13,5 +15,6 @@ PandaBoardES \
 PAZ00 \
 SDP4430 \
 skylake-rt286 \
+TECLAST-X80Pro-Defaultstring-CherryTrailCR \
 tegraalc5632 \
 VEYRON-I2S
src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile.am new file +4 -0
new file mode 100644
index 00000000..f56a817c
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR
+ucm_DATA = TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf
+EXTRA_DIST = $(ucm_DATA)
src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf new file +1 -0
new file mode 120000
index 00000000..1b1d4754
@@ -0,0 +1 @@
+../chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
\ No newline at end of file
src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf new file +361 -0

361 lines not on this page · raw message

src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile.am new file +4 -0
new file mode 100644
index 00000000..4c4d7cf4
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/chtrt5645-mono-speaker-analog-mic
+ucm_DATA = chtrt5645-mono-speaker-analog-mic.conf HiFi.conf
+EXTRA_DIST = $(ucm_DATA)
src/conf/ucm/chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf new file +5 -0
new file mode 100644
index 00000000..b1a5206e
@@ -0,0 +1,5 @@
+Comment "Intel SoC Audio Device"
+SectionUseCase."HiFi" {
+	File "../chtrt5645-mono-speaker-analog-mic/HiFi.conf"
+	Comment "Default"
+}
src/conf/ucm/gpd-win-pocket-rt5645/Makefile.am new file +4 -0
new file mode 100644
index 00000000..62440926
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/gpd-win-pocket-rt5645
+ucm_DATA = gpd-win-pocket-rt5645.conf
+EXTRA_DIST = $(ucm_DATA)
src/conf/ucm/gpd-win-pocket-rt5645/gpd-win-pocket-rt5645.conf new file +1 -0
new file mode 120000
index 00000000..1b1d4754
@@ -0,0 +1 @@
+../chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
\ No newline at end of file
Signature · 1 line
2.14.3
Applied
#2 lore raw
Quoted 9 lines · Hans de Goede

Add a configuration for Cherry Trail boards which use a rt5645 codec connected to a mono speaker and with an analog mic on IN2N + IN2P.

The chtrt5645-mono-speaker-analog-mic/HiFi.conf for this is based on the latest version from https://github.com/plbossart/UCM/tree/master/chtrt5645
with all the unused input options removed and some changes made to make the analog mic work.

Quoted 5 lines

This commit also adds 2 ucm dirs with the longname of 2 boards known to use this setup, which simply contain a symlink to the generic chtrt5645-mono-speaker-analog-mic entry.

Applied, thanks.

Takashi