[1/2] conf/ucm: Remove conf files of broxton-rt298 platform

Commit Message

[e-mail] March 15, 2017, 6:45 a.m. UTC

From: Fuwei Tang <[e-mail]>

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 <[e-mail]>
Reviewed-by: Liam Girdwood <[e-mail]>
Reviewed-by: Vinod Koul <[e-mail]>
Reviewed-by: Mengdong Lin <[e-mail]>

Patch

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"
-]