From 58480d6dff0cd66525425ae70775e711d32e19f6 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 29 Jun 2017 11:16:20 +0200
Subject: [PATCH] ccardimx28js removal: simplify alsa-state recipe

https://jira.digi.com/browse/DEL-4771

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../alsa-state/alsa-state.bbappend            |  12 --
 .../alsa-state/ccardimx28/asound.inline.state | 114 -----------
 .../ccardimx28/asound.inline_play.state       | 114 -----------
 .../alsa-state/ccardimx28/asound.micro.state  | 188 ------------------
 .../ccardimx28/asound.micro_play.state        | 114 -----------
 .../alsa-state/ccardimx28/asound.play.state   | 114 -----------
 6 files changed, 656 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state
 delete mode 100644 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state
 delete mode 100644 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state
 delete mode 100644 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state
 delete mode 100644 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state

diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
index e21da25b4..5cc823267 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -10,20 +10,8 @@ SRC_URI_append_ccimx6 = " \
     file://asound.play.state \
 "
 
-SRC_URI_append_ccardimx28 = " \
-    file://asound.inline_play.state \
-    file://asound.inline.state \
-    file://asound.micro_play.state \
-    file://asound.micro.state \
-    file://asound.play.state \
-"
-
 SRC_URI_append_ccimx6ul = " file://asound.state"
 
 do_install_append_ccimx6() {
 	ln -sf asound.micro_play.state ${D}${localstatedir}/lib/alsa/asound.state
 }
-
-do_install_append_ccardimx28() {
-	ln -sf asound.micro_play.state ${D}${localstatedir}/lib/alsa/asound.state
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state
deleted file mode 100644
index 5a3fa2a42..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state
+++ /dev/null
@@ -1,114 +0,0 @@
-state.mxssgtl5000 {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 154
-		value.1 154
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 11
-		value.1 11
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 -600
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Capture ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 115
-		value.1 115
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 600
-			dbvalue.1 600
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Mic Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 4000
-			dbvalue.0 3000
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Headphone Mux'
-		value LINE_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 DAC
-			item.1 LINE_IN
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Capture Mux'
-		value LINE_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state
deleted file mode 100644
index 434eda5b0..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state
+++ /dev/null
@@ -1,114 +0,0 @@
-state.mxssgtl5000 {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 154
-		value.1 154
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 11
-		value.1 11
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 -600
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Capture ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 115
-		value.1 115
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 600
-			dbvalue.1 600
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Mic Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 4000
-			dbvalue.0 3000
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Headphone Mux'
-		value DAC
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 DAC
-			item.1 LINE_IN
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Capture Mux'
-		value LINE_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state
deleted file mode 100644
index 113b99bea..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state
+++ /dev/null
@@ -1,188 +0,0 @@
-state.ccardxmx28 {
-	control.1 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '0dB'
-		comment.item.1 '20dB'
-		comment.item.2 '30dB'
-		comment.item.3 '40dB'
-		iface MIXER
-		name 'MIC GAIN'
-		value '0dB'
-	}
-	control.2 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 15'
-		iface MIXER
-		name 'Capture Volume'
-		value.0 15
-		value.1 15
-	}
-	control.3 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'No Change'
-		comment.item.1 'Reduced by 6dB'
-		iface MIXER
-		name 'Capture Vol Reduction'
-		value 'No Change'
-	}
-	control.4 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 192'
-		iface MIXER
-		name 'Playback Volume'
-		value.0 132
-		value.1 132
-	}
-	control.5 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Headphone Volume'
-		value.0 103
-		value.1 103
-	}
-	control.6 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 DAC
-		comment.item.1 LINE_IN
-		iface MIXER
-		name 'DAC Mux'
-		value DAC
-	}
-	control.7 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 MIC_IN
-		comment.item.1 LINE_IN
-		iface MIXER
-		name 'ADC Mux'
-		value MIC_IN
-	}
-}
-state.mxssgtl5000 {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 138
-		value.1 138
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 600
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Capture ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 103
-		value.1 103
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Mic Volume'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 4000
-			dbvalue.0 2000
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Headphone Mux'
-		value LINE_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 DAC
-			item.1 LINE_IN
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Capture Mux'
-		value MIC_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state
deleted file mode 100644
index 992cc8945..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state
+++ /dev/null
@@ -1,114 +0,0 @@
-state.mxssgtl5000 {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 138
-		value.1 138
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 600
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Capture ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 103
-		value.1 103
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Mic Volume'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 4000
-			dbvalue.0 2000
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Headphone Mux'
-		value DAC
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 DAC
-			item.1 LINE_IN
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Capture Mux'
-		value MIC_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state
deleted file mode 100644
index 8a1bdb44e..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state
+++ /dev/null
@@ -1,114 +0,0 @@
-state.mxssgtl5000 {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 142
-		value.1 142
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 11
-		value.1 11
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 -600
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Capture ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 115
-		value.1 115
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 600
-			dbvalue.1 600
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Mic Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 4000
-			dbvalue.0 3000
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Headphone Mux'
-		value DAC
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 DAC
-			item.1 LINE_IN
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Capture Mux'
-		value LINE_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}