From patchwork Thu Jan 3 13:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10747433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8777746 for ; Thu, 3 Jan 2019 14:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A818E284B9 for ; Thu, 3 Jan 2019 14:28:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C8DE2094F; Thu, 3 Jan 2019 14:28:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,RDNS_NONE autolearn=no version=3.3.1 Received: from alsa0.perex.cz (unknown [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 355712094F for ; Thu, 3 Jan 2019 14:28:10 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4C783267BF5; Thu, 3 Jan 2019 14:50:27 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4FA83267BD4; Thu, 3 Jan 2019 14:50:24 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by alsa0.perex.cz (Postfix) with ESMTP id 8CEC3267BFB for ; Thu, 3 Jan 2019 14:50:21 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1F1BC050E07; Thu, 3 Jan 2019 13:50:20 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-117-50.ams2.redhat.com [10.36.117.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BE3960C68; Thu, 3 Jan 2019 13:50:19 +0000 (UTC) From: Hans de Goede To: alsa-devel@alsa-project.org Date: Thu, 3 Jan 2019 14:50:15 +0100 Message-Id: <20190103135015.14669-3-hdegoede@redhat.com> In-Reply-To: <20190103135015.14669-1-hdegoede@redhat.com> References: <20190103135015.14669-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 03 Jan 2019 13:50:20 +0000 (UTC) Cc: Takashi Iwai , Hans de Goede , linux@endlessm.com, Pierre-Louis Bossart , Daniel Drake Subject: [alsa-devel] [RFC 2/2] conf/ucm: bytcht-es8316: Add long-name UCM profiles X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP After recent kernel work, the kernel now sets a long-name for bytcht-es8316 boards which indicates if a single (mono) speaker or stereo speakers are used and if in1 or in2 is used for the internal mic (the headset mic will be on the other input). This commit adds UCM profiles for bytcht-es8316 boards using these new long-names, based on the generic bytcht-es8316 profile. Signed-off-by: Hans de Goede --- configure.ac | 4 ++++ src/conf/ucm/Makefile.am | 4 ++++ .../bytcht-es8316-mono-spk-in1-mic/HiFi.conf | 23 +++++++++++++++++++ .../Makefile.am | 4 ++++ .../bytcht-es8316-mono-spk-in1-mic.conf | 8 +++++++ .../bytcht-es8316-mono-spk-in2-mic/HiFi.conf | 23 +++++++++++++++++++ .../Makefile.am | 4 ++++ .../bytcht-es8316-mono-spk-in2-mic.conf | 8 +++++++ .../HiFi.conf | 23 +++++++++++++++++++ .../Makefile.am | 4 ++++ .../bytcht-es8316-stereo-spk-in1-mic.conf | 8 +++++++ .../HiFi.conf | 23 +++++++++++++++++++ .../Makefile.am | 4 ++++ .../bytcht-es8316-stereo-spk-in2-mic.conf | 8 +++++++ 14 files changed, 148 insertions(+) create mode 100644 src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/HiFi.conf create mode 100644 src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/Makefile.am create mode 100644 src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/bytcht-es8316-mono-spk-in1-mic.conf create mode 100644 src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/HiFi.conf create mode 100644 src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/Makefile.am create mode 100644 src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/bytcht-es8316-mono-spk-in2-mic.conf create mode 100644 src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/HiFi.conf create mode 100644 src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/Makefile.am create mode 100644 src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/bytcht-es8316-stereo-spk-in1-mic.conf create mode 100644 src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/HiFi.conf create mode 100644 src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/Makefile.am create mode 100644 src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/bytcht-es8316-stereo-spk-in2-mic.conf diff --git a/configure.ac b/configure.ac index ff2e2799..9b099b7f 100644 --- a/configure.ac +++ b/configure.ac @@ -721,6 +721,10 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/broadwell-rt286/Makefile \ src/conf/ucm/broxton-rt298/Makefile \ src/conf/ucm/bytcht-es8316/Makefile \ + src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/Makefile \ + src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/Makefile \ + src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/Makefile \ + src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/Makefile \ src/conf/ucm/bytcr-rt5640/Makefile \ src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/Makefile \ src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index b252f258..ee850ee6 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -5,6 +5,10 @@ ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN \ broadwell-rt286 \ broxton-rt298 \ bytcht-es8316 \ +bytcht-es8316-mono-spk-in1-mic \ +bytcht-es8316-mono-spk-in2-mic \ +bytcht-es8316-stereo-spk-in1-mic \ +bytcht-es8316-stereo-spk-in2-mic \ bytcr-rt5640 \ bytcr-rt5640-mono-spk-dmic1-mic \ bytcr-rt5640-mono-spk-in1-mic \ diff --git a/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/HiFi.conf b/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/HiFi.conf new file mode 100644 index 00000000..97899495 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/HiFi.conf @@ -0,0 +1,23 @@ +SectionVerb { + EnableSequence [ + cdev "hw:bytchtes8316" + + + ] + + DisableSequence [ + cdev "hw:bytchtes8316" + + ] + + Value { + PlaybackPCM "hw:bytchtes8316" + CapturePCM "hw:bytchtes8316" + } +} + + + + + + diff --git a/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/Makefile.am b/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/Makefile.am new file mode 100644 index 00000000..420592fc --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcht-es8316-mono-spk-in1-mic +ucm_DATA = bytcht-es8316-mono-spk-in1-mic.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/bytcht-es8316-mono-spk-in1-mic.conf b/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/bytcht-es8316-mono-spk-in1-mic.conf new file mode 100644 index 00000000..26d82ead --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-mono-spk-in1-mic/bytcht-es8316-mono-spk-in1-mic.conf @@ -0,0 +1,8 @@ +SectionUseCase."HiFi" { + File "../bytcht-es8316-mono-spk-in1-mic/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cdev "hw:bytchtes8316" +] diff --git a/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/HiFi.conf b/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/HiFi.conf new file mode 100644 index 00000000..2821eb51 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/HiFi.conf @@ -0,0 +1,23 @@ +SectionVerb { + EnableSequence [ + cdev "hw:bytchtes8316" + + + ] + + DisableSequence [ + cdev "hw:bytchtes8316" + + ] + + Value { + PlaybackPCM "hw:bytchtes8316" + CapturePCM "hw:bytchtes8316" + } +} + + + + + + diff --git a/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/Makefile.am b/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/Makefile.am new file mode 100644 index 00000000..939c8b7d --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcht-es8316-mono-spk-in2-mic +ucm_DATA = bytcht-es8316-mono-spk-in2-mic.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/bytcht-es8316-mono-spk-in2-mic.conf b/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/bytcht-es8316-mono-spk-in2-mic.conf new file mode 100644 index 00000000..b9885c2d --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-mono-spk-in2-mic/bytcht-es8316-mono-spk-in2-mic.conf @@ -0,0 +1,8 @@ +SectionUseCase."HiFi" { + File "../bytcht-es8316-mono-spk-in2-mic/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cdev "hw:bytchtes8316" +] diff --git a/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/HiFi.conf b/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/HiFi.conf new file mode 100644 index 00000000..9f1801c9 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/HiFi.conf @@ -0,0 +1,23 @@ +SectionVerb { + EnableSequence [ + cdev "hw:bytchtes8316" + + + ] + + DisableSequence [ + cdev "hw:bytchtes8316" + + ] + + Value { + PlaybackPCM "hw:bytchtes8316" + CapturePCM "hw:bytchtes8316" + } +} + + + + + + diff --git a/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/Makefile.am b/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/Makefile.am new file mode 100644 index 00000000..d3fbb9e9 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcht-es8316-stereo-spk-in1-mic +ucm_DATA = bytcht-es8316-stereo-spk-in1-mic.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/bytcht-es8316-stereo-spk-in1-mic.conf b/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/bytcht-es8316-stereo-spk-in1-mic.conf new file mode 100644 index 00000000..9bd32664 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-stereo-spk-in1-mic/bytcht-es8316-stereo-spk-in1-mic.conf @@ -0,0 +1,8 @@ +SectionUseCase."HiFi" { + File "../bytcht-es8316-stereo-spk-in1-mic/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cdev "hw:bytchtes8316" +] diff --git a/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/HiFi.conf b/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/HiFi.conf new file mode 100644 index 00000000..00d4b7fe --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/HiFi.conf @@ -0,0 +1,23 @@ +SectionVerb { + EnableSequence [ + cdev "hw:bytchtes8316" + + + ] + + DisableSequence [ + cdev "hw:bytchtes8316" + + ] + + Value { + PlaybackPCM "hw:bytchtes8316" + CapturePCM "hw:bytchtes8316" + } +} + + + + + + diff --git a/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/Makefile.am b/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/Makefile.am new file mode 100644 index 00000000..f92fab48 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcht-es8316-stereo-spk-in2-mic +ucm_DATA = bytcht-es8316-stereo-spk-in2-mic.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/bytcht-es8316-stereo-spk-in2-mic.conf b/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/bytcht-es8316-stereo-spk-in2-mic.conf new file mode 100644 index 00000000..a94f0f70 --- /dev/null +++ b/src/conf/ucm/bytcht-es8316-stereo-spk-in2-mic/bytcht-es8316-stereo-spk-in2-mic.conf @@ -0,0 +1,8 @@ +SectionUseCase."HiFi" { + File "../bytcht-es8316-stereo-spk-in2-mic/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cdev "hw:bytchtes8316" +]