From patchwork Wed Mar 15 06:45:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fuweix.tang@intel.com X-Patchwork-Id: 9624937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C60A3604CC for ; Wed, 15 Mar 2017 06:46:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B70D0285DC for ; Wed, 15 Mar 2017 06:46:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB895285F0; Wed, 15 Mar 2017 06:46:30 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3709285DC for ; Wed, 15 Mar 2017 06:46:29 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D05C6266F7E; Wed, 15 Mar 2017 07:45:48 +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 E11C8266F7F; Wed, 15 Mar 2017 07:45:47 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by alsa0.perex.cz (Postfix) with ESMTP id 00225266F30 for ; Wed, 15 Mar 2017 07:45:41 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP; 14 Mar 2017 23:45:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,167,1486454400"; d="scan'208";a="60538850" Received: from tangfw-thinkpad-x230.sh.intel.com ([10.239.47.163]) by orsmga002.jf.intel.com with ESMTP; 14 Mar 2017 23:45:37 -0700 From: fuweix.tang@intel.com To: alsa-devel@alsa-project.org Date: Wed, 15 Mar 2017 14:45:40 +0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com, Fuwei Tang , mengdong.lin@intel.com Subject: [alsa-devel] [PATCH 2/2] conf/ucm: Remove conf files of skylake-rt286 platform 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fuwei Tang Remove conf files of skylake-rt286 platform from alsa-lib. The files will be moved to alsa-ucm-conf repo. Signed-off-by: Fuwei Tang Reviewed-by: Liam Girdwood Reviewed-by: Vinod Koul Reviewed-by: Mengdong Lin diff --git a/configure.ac b/configure.ac index 71bd852..9e916d7 100644 --- a/configure.ac +++ b/configure.ac @@ -673,7 +673,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PAZ00/Makefile \ src/conf/ucm/GoogleNyan/Makefile \ src/conf/ucm/broadwell-rt286/Makefile \ - src/conf/ucm/skylake-rt286/Makefile \ src/conf/ucm/VEYRON-I2S/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/DB410c/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index a11d324..7bf432e 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S chtrt5645 DB410c diff --git a/src/conf/ucm/skylake-rt286/Hdmi1 b/src/conf/ucm/skylake-rt286/Hdmi1 deleted file mode 100644 index 0e00fc8..0000000 --- a/src/conf/ucm/skylake-rt286/Hdmi1 +++ /dev/null @@ -1,20 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."Hdmi1" { - Comment "HDMI/Display Port 1 Stereo" - - EnableSequence [ - ] - - DisableSequence [ - ] - - Value { - PlaybackPCM "hw:skylakert286,4" - PlaybackChannels "2" - PlaybackPriority "3" - JackControl "HDMI/DP, pcm=4 Jack" - } -} - diff --git a/src/conf/ucm/skylake-rt286/Hdmi2 b/src/conf/ucm/skylake-rt286/Hdmi2 deleted file mode 100644 index 89b31aa..0000000 --- a/src/conf/ucm/skylake-rt286/Hdmi2 +++ /dev/null @@ -1,20 +0,0 @@ -# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."Hdmi2" { - Comment "HDMI/Display Port 2 Stereo" - - EnableSequence [ - ] - - DisableSequence [ - ] - - Value { - PlaybackPCM "hw:skylakert286,5" - PlaybackChannels "2" - PlaybackPriority "4" - JackControl "HDMI/DP, pcm=5 Jack" - } -} - diff --git a/src/conf/ucm/skylake-rt286/HiFi b/src/conf/ucm/skylake-rt286/HiFi deleted file mode 100644 index 41638f4..0000000 --- a/src/conf/ucm/skylake-rt286/HiFi +++ /dev/null @@ -1,129 +0,0 @@ -# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. -# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms - -SectionVerb { - - EnableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - ] - - DisableSequence [ - cdev "hw:skylakert286" - ] - - Value { - TQ "HiFi" - CapturePCM "hw:skylakert286,1" - PlaybackPCM "hw:skylakert286,0" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ - "Speaker" - ] - EnableSequence [ - cdev "hw:skylakert286" - cset "name='HPO L Switch' 1" - cset "name='HPO R Switch' 1" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - ] - - DisableSequence [ - ] - Value { - PlaybackChannels "2" - PlaybackPriority "1" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Speaker" { - Comment "Speaker" - - ConflictingDevice [ - "Headphones" - ] - EnableSequence [ - cdev "hw:skylakert286" - cset "name='SPO Switch' 1" - cset "name='Speaker Playback Switch' 1,1" - cset "name='Speaker Switch' 1" - cset "name='HPO L Switch' 0" - cset "name='HPO R Switch' 0" - ] - - DisableSequence [ - ] - Value { - PlaybackChannels "2" - PlaybackPriority "1" - JackHWMute "Headphones" - } -} - -SectionDevice."Headset" { - Comment "Headset Mic" - - ConflictingDevice [ - "dmiccap" - ] - EnableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='ADC 0 Mux' 0" - cset "name='Mic Jack Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - ] - - DisableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - ] - Value { - CaptureChannels "2" - CapturePriority "2" - JackControl "Mic Jack" - } -} - - -SectionDevice."dmiccap" { - Comment "DMIC Stereo" - - ConflictingDevice [ - "Headpset" - ] - - EnableSequence [ - - cdev "hw:skylakert286" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - cset "name='ADC0 Capture Switch' 0,0" - cset "name='Mic Jack Switch' 0" - cset "name='ADC 0 Mux' 0" - - ] - - DisableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - ] - Value { - CaptureChannels "2" - CapturePriority "2" - } -} - diff --git a/src/conf/ucm/skylake-rt286/Makefile.am b/src/conf/ucm/skylake-rt286/Makefile.am deleted file mode 100644 index 9d6a85a..0000000 --- a/src/conf/ucm/skylake-rt286/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/skylake-rt286 -ucm_DATA = skylake-rt286.conf HiFi Hdmi1 Hdmi2 -EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/skylake-rt286/skylake-rt286.conf b/src/conf/ucm/skylake-rt286/skylake-rt286.conf deleted file mode 100644 index 3e43228..0000000 --- a/src/conf/ucm/skylake-rt286/skylake-rt286.conf +++ /dev/null @@ -1,60 +0,0 @@ -# UCM for Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionUseCase."HiFi" { - File "HiFi" - Comment "Play and record HiFi quality Music" -} - -SectionUseCase."Hdmi1" { - File "Hdmi1" - Comment "Play on Hdmi/DP 1" -} - -SectionUseCase."Hdmi2" { - File "Hdmi2" - Comment "Play on Hdmi/DP 2" -} - -ValueDefaults { - PlaybackCTL "hw:skylakert286" - CaptureCTL "hw:skylakert286" - CaptureChannels "2" - CapturePriority "2" -} - -SectionDefaults [ - cdev "hw:skylakert286" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - cset "name='Front DAC Switch' 1" - cset "name='Front RECMIX Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - cset "name='ADC 1 Mux' 0" - cset "name='ADC0 Capture Volume' 105,105" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='AMIC Volume' 3" - cset "name='DAC0 Playback Volume' 100,100" - cset "name='HPO L Switch' 0" - cset "name='HPO Mux' 0" - cset "name='HPO R Switch' 0" - cset "name='Pin 5 Mux' 1" - cset "name='Pin 6 Mux' 2" - cset "name='Pin 7 Mux' 3" - cset "name='RECMIX Beep Switch' 0" - cset "name='RECMIX Line1 Switch' 0" - cset "name='RECMIX Mic1 Switch' 0" - cset "name='SPK Mux' 0" - cset "name='SPO Switch' 1" - cset "name='codec0_out mo codec0_in mi Switch' 0" - cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec0_out mo media0_in mi Switch' 1" - cset "name='codec1_out mo codec0_in mi Switch' 0" - cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec1_out mo media0_in mi Switch' 0" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo media0_in mi Switch' 0" -]