All of lore.kernel.org
 help / color / mirror / Atom feed
From: fuweix.tang@intel.com
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com,
	Fuwei Tang <fuweix.tang@intel.com>,
	mengdong.lin@intel.com
Subject: [PATCH 1/2] conf/ucm: Remove conf files of broxton-rt298 platform
Date: Wed, 15 Mar 2017 14:45:39 +0800	[thread overview]
Message-ID: <b86821141a5716f02ea0d80a39f4dddb2e32aa67.1487576432.git.fuweix.tang@intel.com> (raw)
In-Reply-To: <cover.1487576432.git.fuweix.tang@intel.com>
In-Reply-To: <cover.1487576432.git.fuweix.tang@intel.com>

From: Fuwei Tang <fuweix.tang@intel.com>

Remove conf files of broxton-rt298 platform from alsa-lib repo.
The files will be moved to alsa-ucm-conf repo.

Signed-off-by: Fuwei Tang <fuweix.tang@intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Reviewed-by: Vinod Koul <vinod.koul@intel.com>
Reviewed-by: Mengdong Lin <mengdong.lin@linux.intel.com>

diff --git a/configure.ac b/configure.ac
index d645ab6..71bd852 100644
--- a/configure.ac
+++ b/configure.ac
@@ -684,7 +684,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/topology/bxtrt298/Makefile \
 	  alsalisp/Makefile aserver/Makefile \
 	  test/Makefile test/lsb/Makefile \
-	  src/conf/ucm/broxton-rt298/Makefile \
 	  utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
 
 dnl Create asoundlib.h dynamically according to configure options
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index ea9b385..a11d324 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 broxton-rt298
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c
diff --git a/src/conf/ucm/broxton-rt298/Hdmi1 b/src/conf/ucm/broxton-rt298/Hdmi1
deleted file mode 100644
index 48514f4..0000000
--- a/src/conf/ucm/broxton-rt298/Hdmi1
+++ /dev/null
@@ -1,22 +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 [
-                exec "echo Hdmi1 EnableSequnece"
-        ]
-
-        DisableSequence [
-                exec "echo Hdmi1 DisableSequnece"
-        ]
-
-        Value {
-                PlaybackPCM "hw:broxtonrt298,4"
-                PlaybackChannels "2"
-                PlaybackPriority "3"
-                JackControl "HDMI/DP, pcm=4 Jack"
-        }
-}
-
diff --git a/src/conf/ucm/broxton-rt298/Hdmi2 b/src/conf/ucm/broxton-rt298/Hdmi2
deleted file mode 100644
index 764f8b9..0000000
--- a/src/conf/ucm/broxton-rt298/Hdmi2
+++ /dev/null
@@ -1,14 +0,0 @@
-# Usecase for device HDMI2/Display Port stereo playback on Intel Broxton platforms
-# For Audio in I2S mode
-
-SectionDevice."Hdmi2" {
-        Comment "HDMI/Display Port 2 Stereo"
-
-        Value {
-                PlaybackPCM "hw:broxtonrt298,5"
-                PlaybackChannels "2"
-                PlaybackPriority "4"
-                JackControl "HDMI/DP, pcm=5 Jack"
-        }
-}
-
diff --git a/src/conf/ucm/broxton-rt298/HiFi b/src/conf/ucm/broxton-rt298/HiFi
deleted file mode 100644
index 2e2d6fe..0000000
--- a/src/conf/ucm/broxton-rt298/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 Broxton platforms
-
-SectionVerb {
-
-	EnableSequence [
-		cdev "hw:broxtonrt298"
-		cset "name='media0_out mo dmic01_hifi_in mi Switch' 1"
-	]
-
-	DisableSequence [
-		cdev "hw:broxtonrt298"
-	]
-
-	Value {
-		TQ "HiFi"
-		CapturePCM "hw:broxtonrt298,1"
-		PlaybackPCM "hw:broxtonrt298,0"
-	}
-}
-
-SectionDevice."dmiccap" {
-	Comment "DMIC Stereo"
-
-	ConflictingDevice [
-		"Headset"
-	]
-
-	EnableSequence [
-
-		cdev "hw:broxtonrt298"
-		exec "echo broxtonrt298 dmiccap called"
-		cset "name='media0_out mo dmic01_hifi_in mi Switch' 1"
-		cset "name='media0_out mo codec0_in mi Switch' 0"
-		cset "name='Mic Jack Switch' 0"
-
-	]
-
-	DisableSequence [
-		cdev "hw:broxtonrt298"
-		cset "name='media0_out mo codec0_in mi Switch' 1"
-		cset "name='media0_out mo dmic01_hifi_in mi Switch' 0"
-		cset "name='Mic Jack Switch' 1"
-		cset "name='ADC 0 Mux' 0"
-	]
-	Value {
-		CaptureChannels "2"
-		CapturePriority "2"
-	}
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones"
-
-	ConflictingDevice [
-		"Speaker"
-	]
-	EnableSequence [
-		cdev "hw:broxtonrt298"
-		exec "echo broxtonrt298 Headphone called"
-		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 [
-		cdev "hw:broxtonrt298"
-	]
-	Value {
-		PlaybackChannels "2"
-		PlaybackPriority "1"
-		JackControl "Headphone Jack"
-		JackHWMute "Speaker"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker"
-
-	ConflictingDevice [
-		"Headphones"
-	]
-	EnableSequence [
-		cdev "hw:broxtonrt298"
-		exec "echo broxtonrt298 speaker called"
-		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:broxtonrt298"
-		exec "echo broxtonrt298 Headset called"
-		cset "name='media0_out mo codec0_in mi Switch' 1"
-		cset "name='ADC0 Capture Volume' 105,105"
-		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:broxtonrt298"
-		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"
-	}
-}
diff --git a/src/conf/ucm/broxton-rt298/Makefile.am b/src/conf/ucm/broxton-rt298/Makefile.am
deleted file mode 100644
index 80f480e..0000000
--- a/src/conf/ucm/broxton-rt298/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-alsaconfigdir = @ALSA_CONFIG_DIR@
-ucmdir = $(alsaconfigdir)/ucm/broxton-rt298
-ucm_DATA = broxton-rt298.conf HiFi Hdmi1 Hdmi2
-EXTRA_DIST = $(ucm_DATA)
diff --git a/src/conf/ucm/broxton-rt298/broxton-rt298.conf b/src/conf/ucm/broxton-rt298/broxton-rt298.conf
deleted file mode 100644
index 3f3d0be..0000000
--- a/src/conf/ucm/broxton-rt298/broxton-rt298.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-# UCM for Intel Broxton 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:broxtonrt298"
-	CaptureCTL "hw:broxtonrt298"
-	CaptureChannels "2"
-	CapturePriority "2"
-}
-
-SectionDefaults [
-	cdev "hw:broxtonrt298"
-	exec "echo broxtonrt298 CONF Defaults"
-	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='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"
-]
-- 
2.7.4

  reply	other threads:[~2017-03-15  6:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-15  6:45 [PATCH 0/2] conf/ucm: Remove intel UCM conf files from alsa-lib repo fuweix.tang
2017-03-15  6:45 ` fuweix.tang [this message]
2017-03-15  6:45 ` [PATCH 2/2] conf/ucm: Remove conf files of skylake-rt286 platform fuweix.tang
2017-03-20 11:34 ` [PATCH 0/2] conf/ucm: Remove intel UCM conf files from alsa-lib repo Takashi Iwai
2017-03-20 13:50   ` Liam Girdwood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b86821141a5716f02ea0d80a39f4dddb2e32aa67.1487576432.git.fuweix.tang@intel.com \
    --to=fuweix.tang@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=mengdong.lin@intel.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.