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 0b9f548b4..42048d154 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/${PREFERRED_VERSION_linux-dey}:${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${PREFERRED_VERSION_linux-dey}:"
 
 SRC_URI += " \
     file://asound.inline_play.state \
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccardimx28/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro_play.state
old mode 100755
new mode 100644
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6adpt/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.inline.state
deleted file mode 100644
index 0d9c9db6b..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.inline.state
+++ /dev/null
@@ -1,127 +0,0 @@
-state.sgtl5000audio {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 144
-		value.1 144
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 12
-		value.1 12
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 0
-		}
-	}
-	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 105
-		value.1 105
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 100
-			dbvalue.1 100
-		}
-	}
-	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
-		}
-	}
-}
-
-state.imxhdmisoc {
-	control.1 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400220300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write volatile'
-			type IEC958
-			count 1
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.inline_play.state
deleted file mode 100644
index 05a69279e..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.inline_play.state
+++ /dev/null
@@ -1,127 +0,0 @@
-state.sgtl5000audio {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 144
-		value.1 144
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 12
-		value.1 12
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 0
-		}
-	}
-	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 105
-		value.1 105
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 100
-			dbvalue.1 100
-		}
-	}
-	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
-		}
-	}
-}
-
-state.imxhdmisoc {
-	control.1 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400220300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write volatile'
-			type IEC958
-			count 1
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.micro.state
deleted file mode 100644
index 4d55bc608..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.micro.state
+++ /dev/null
@@ -1,127 +0,0 @@
-state.sgtl5000audio {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 144
-		value.1 144
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 12
-		value.1 12
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 0
-		}
-	}
-	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 105
-		value.1 105
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 100
-			dbvalue.1 100
-		}
-	}
-	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 MIC_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
-
-state.imxhdmisoc {
-	control.1 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400220300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write volatile'
-			type IEC958
-			count 1
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.micro_play.state
deleted file mode 100755
index 4d55bc608..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.micro_play.state
+++ /dev/null
@@ -1,127 +0,0 @@
-state.sgtl5000audio {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 144
-		value.1 144
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 12
-		value.1 12
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 0
-		}
-	}
-	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 105
-		value.1 105
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 100
-			dbvalue.1 100
-		}
-	}
-	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 MIC_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
-
-state.imxhdmisoc {
-	control.1 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400220300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write volatile'
-			type IEC958
-			count 1
-		}
-	}
-}
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.play.state
deleted file mode 100644
index 4d55bc608..000000000
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6sbc/asound.play.state
+++ /dev/null
@@ -1,127 +0,0 @@
-state.sgtl5000audio {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 144
-		value.1 144
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 12
-		value.1 12
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Attenuate Switch (-6dB)'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 0
-		}
-	}
-	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 105
-		value.1 105
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 100
-			dbvalue.1 100
-		}
-	}
-	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 MIC_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-}
-
-state.imxhdmisoc {
-	control.1 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400220300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write volatile'
-			type IEC958
-			count 1
-		}
-	}
-}