alsa-state:apalis-imx6: fix sound device name in asound.conf/asound.state

The sound device name in asound.conf of apalis-imx6 machine does not
match the sound driver of kernel 5.15 and upper, fix that. Also
regenerate asound.state according to the new asound.conf.

Related-to: ELB-4829

Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 5f920cd5b4b202b277eeae945fbda6c206672005)

2 files changed, 597 insertions, 161 deletions

diff --git a/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.conf b/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.conf
new file mode 100644
index 0000000..2be464b
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.conf
@@ -0,0 +1,464 @@
+defaults.pcm.rate_converter "linear"
+
+pcm.default_card{
+type hw
+card "imx6qapalissgtl"
+}
+
+pcm.dmix_48000{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 48000
+}
+}
+
+pcm.dmix_44100{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 44100
+}
+}
+
+pcm.dmix_32000{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 32000
+}
+}
+
+pcm.dmix_24000{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 24000
+}
+}
+
+pcm.dmix_22050{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 22050
+}
+}
+
+pcm.dmix_16000{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 16000
+}
+}
+
+pcm.dmix_12000{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 12000
+}
+}
+
+pcm.dmix_11025{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 11025
+}
+}
+
+pcm.dmix_8000{
+type dmix
+ipc_key 5678293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 8000
+}
+}
+
+pcm.!dsnoop_48000{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 48000
+}
+}
+
+pcm.!dsnoop_44100{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 44100
+}
+}
+
+pcm.!dsnoop_32000{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 32000
+}
+}
+
+pcm.!dsnoop_24000{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 24000
+}
+}
+
+pcm.!dsnoop_22050{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 22050
+}
+}
+
+pcm.!dsnoop_16000{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 16000
+}
+}
+
+pcm.!dsnoop_12000{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 12000
+}
+}
+
+pcm.!dsnoop_11025{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 11025
+}
+}
+
+pcm.!dsnoop_8000{
+type dsnoop
+ipc_key 5778293
+ipc_key_add_uid yes
+slave{
+pcm "default_card"
+period_time 40000
+format S16_LE
+rate 8000
+}
+}
+
+pcm.asymed{
+type asym
+playback.pcm "dmix_44100"
+capture.pcm "dsnoop_44100"
+}
+
+pcm.dsp0{
+type plug
+slave.pcm "asymed"
+}
+
+pcm.!default{
+type plug
+route_policy "average"
+slave.pcm "asymed"
+}
+
+ctl.!default{
+type hw
+card "imx6qapalissgtl"
+}
+
+ctl.mixer0{
+type hw
+card "imx6qapalissgtl"
+}
+
+pcm_slave.esai{
+	pcm "default_card"
+	channels 8
+	rate 48000
+	period_time 40000
+}
+
+pcm.esaich1to6{
+	type dshare
+	ipc_key 5778293
+	slave esai
+	bindings.0 0
+	bindings.1 4
+	bindings.2 1
+	bindings.3 5
+	bindings.4 2
+	bindings.5 6
+}
+
+pcm.esaich78{
+	type dshare
+	ipc_key 5778293
+	slave esai
+	bindings.0 3
+	bindings.1 7
+}
+
+pcm_slave.sai5 {
+	pcm "hw:5,0"
+	channels 8
+}
+
+pcm.sai5_ch1to8 {
+	type dsnoop
+	ipc_key 5185558
+	slave sai5
+	bindings.0 0
+	bindings.1 4
+	bindings.2 1
+	bindings.3 5
+	bindings.4 2
+	bindings.5 6
+	bindings.6 3
+	bindings.7 7
+}
+
+pcm.sai5_ch1to6 {
+	type dsnoop
+	ipc_key 5165558
+	slave sai5
+	bindings.0 0
+	bindings.1 4
+	bindings.2 1
+	bindings.3 5
+	bindings.4 2
+	bindings.5 6
+}
+
+pcm.sai5_ch1to4 {
+	type dsnoop
+	ipc_key 5145558
+	slave sai5
+	bindings.0 0
+	bindings.1 4
+	bindings.2 1
+	bindings.3 5
+}
+
+pcm_slave.sai1{
+	pcm "hw:4,0"
+	channels 16
+}
+
+pcm.sai1to16{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+	bindings.4 2
+	bindings.5 10
+	bindings.6 3
+	bindings.7 11
+	bindings.8 4
+	bindings.9 12
+	bindings.10 5
+	bindings.11 13
+	bindings.12 6
+	bindings.13 14
+	bindings.14 7
+	bindings.15 15
+}
+
+pcm.sai1to14{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+	bindings.4 2
+	bindings.5 10
+	bindings.6 3
+	bindings.7 11
+	bindings.8 4
+	bindings.9 12
+	bindings.10 5
+	bindings.11 13
+	bindings.12 6
+	bindings.13 14
+}
+
+pcm.sai1to12{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+	bindings.4 2
+	bindings.5 10
+	bindings.6 3
+	bindings.7 11
+	bindings.8 4
+	bindings.9 12
+	bindings.10 5
+	bindings.11 13
+}
+
+pcm.sai1to10{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+	bindings.4 2
+	bindings.5 10
+	bindings.6 3
+	bindings.7 11
+	bindings.8 4
+	bindings.9 12
+}
+
+pcm.sai1to8{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+	bindings.4 2
+	bindings.5 10
+	bindings.6 3
+	bindings.7 11
+}
+
+pcm.sai1to6{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+	bindings.4 2
+	bindings.5 10
+}
+
+pcm.sai1to4{
+	type dshare
+	slave sai1
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 8
+	bindings.2 1
+	bindings.3 9
+}
+
+pcm.cdnhdmi4ch {
+	type dshare
+	slave {
+		pcm "hw:3,0"
+		channels 4
+	}
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 2
+	bindings.2 1
+	bindings.3 3
+}
+
+pcm.cdnhdmi8ch {
+	type dshare
+	slave {
+		pcm "hw:3,0"
+		channels 8
+	}
+	ipc_key 5144458
+	bindings.0 0
+	bindings.1 4
+	bindings.2 1
+	bindings.3 5
+	bindings.4 2
+	bindings.5 6
+	bindings.6 3
+	bindings.7 7
+}
diff --git a/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.state b/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.state
index 0cb5534..a9e6ddb 100644
--- a/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.state
+++ b/recipes-bsp/alsa-state/alsa-state/apalis-imx6/asound.state
@@ -1,21 +1,21 @@
-state.sgtl5000audio {
+state.imx6qapalissgtl {
 	control.1 {
 		iface MIXER
 		name 'PCM Playback Volume'
-		value.0 117
-		value.1 117
+		value.0 192
+		value.1 192
 		comment {
 			access 'read write'
 			type INTEGER
 			count 2
-			range '0 - 156'
+			range '0 - 192'
 		}
 	}
 	control.2 {
 		iface MIXER
 		name 'Capture Volume'
-		value.0 12
-		value.1 12
+		value.0 0
+		value.1 0
 		comment {
 			access 'read write'
 			type INTEGER
@@ -26,15 +26,11 @@ state.sgtl5000audio {
 	control.3 {
 		iface MIXER
 		name 'Capture Attenuate Switch (-6dB)'
-		value 0
+		value false
 		comment {
 			access 'read write'
-			type INTEGER
+			type BOOLEAN
 			count 1
-			range '0 - 2'
-			dbmin -600
-			dbmax 600
-			dbvalue.0 -600
 		}
 	}
 	control.4 {
@@ -49,263 +45,261 @@ state.sgtl5000audio {
 	}
 	control.5 {
 		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 127
-		value.1 127
+		name 'Capture Switch'
+		value false
 		comment {
 			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -5150
-			dbmax 1200
-			dbvalue.0 -2000
-			dbvalue.1 -2000
+			type BOOLEAN
+			count 1
 		}
 	}
 	control.6 {
 		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value true
+		name 'Headphone Playback Volume'
+		value.0 103
+		value.1 103
 		comment {
 			access 'read write'
-			type BOOLEAN
-			count 1
+			type INTEGER
+			count 2
+			range '0 - 127'
+			dbmin -5150
+			dbmax 1200
+			dbvalue.0 0
+			dbvalue.1 0
 		}
 	}
 	control.7 {
 		iface MIXER
-		name 'Mic Volume'
-		value 2
+		name 'Headphone Playback Switch'
+		value false
 		comment {
 			access 'read write'
-			type INTEGER
+			type BOOLEAN
 			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 4000
-			dbvalue.0 3000
 		}
 	}
 	control.8 {
 		iface MIXER
-		name 'Mic Bias Volt'
-		value 4
+		name 'Headphone Playback ZC Switch'
+		value true
 		comment {
 			access 'read write'
-			type INTEGER
+			type BOOLEAN
 			count 1
-			range '0 - 7'
 		}
 	}
 	control.9 {
 		iface MIXER
-		name 'Mic Bias Impedance'
-		value 2
+		name 'Mic Volume'
+		value 0
 		comment {
 			access 'read write'
 			type INTEGER
 			count 1
 			range '0 - 3'
+			dbmin 0
+			dbmax 4000
+			dbvalue.0 0
 		}
 	}
 	control.10 {
 		iface MIXER
-		name 'Bass Enable'
-		value false
+		name 'Lineout Playback Volume'
+		value.0 18
+		value.1 18
 		comment {
 			access 'read write'
-			type BOOLEAN
-			count 1
+			type INTEGER
+			count 2
+			range '0 - 31'
+			dbmin -1550
+			dbmax 0
+			dbvalue.0 -650
+			dbvalue.1 -650
 		}
 	}
 	control.11 {
 		iface MIXER
-		name 'Bass Filter Feq'
-		value 1
+		name 'Lineout Playback Switch'
+		value false
 		comment {
 			access 'read write'
-			type INTEGER
+			type BOOLEAN
 			count 1
-			range '0 - 7'
-			dbmin 80
-			dbmax 225
-			dbvalue.0 100
 		}
 	}
 	control.12 {
 		iface MIXER
-		name 'Bass Volume'
-		value 58
+		name 'DAP Main channel'
+		value 32768
 		comment {
 			access 'read write'
 			type INTEGER
 			count 1
-			range '0 - 63'
+			range '0 - 65535'
+			dbmin 0
+			dbmax 65535
+			dbvalue.0 32768
 		}
 	}
 	control.13 {
 		iface MIXER
-		name 'Bass Level'
-		value 96
+		name 'DAP Mix channel'
+		value 0
 		comment {
 			access 'read write'
 			type INTEGER
 			count 1
-			range '0 - 127'
+			range '0 - 65535'
+			dbmin 0
+			dbmax 65535
+			dbvalue.0 0
 		}
 	}
 	control.14 {
 		iface MIXER
-		name 'Surround Width'
-		value 4
+		name 'AVC Switch'
+		value false
 		comment {
 			access 'read write'
-			type INTEGER
+			type BOOLEAN
 			count 1
-			range '0 - 7'
 		}
 	}
 	control.15 {
 		iface MIXER
-		name 'Main Channel Volume'
-		value 100
+		name 'AVC Hard Limiter Switch'
+		value false
 		comment {
 			access 'read write'
-			type INTEGER
+			type BOOLEAN
 			count 1
-			range '0 - 200'
-			dbmin 0
-			dbmax 200
-			dbvalue.0 100
 		}
 	}
 	control.16 {
 		iface MIXER
-		name 'Mixer Channel Volume'
-		value 0
+		name 'AVC Max Gain Volume'
+		value 1
 		comment {
 			access 'read write'
 			type INTEGER
 			count 1
-			range '0 - 200'
+			range '0 - 2'
 			dbmin 0
-			dbmax 200
-			dbvalue.0 0
+			dbmax 1200
+			dbvalue.0 600
 		}
 	}
 	control.17 {
 		iface MIXER
-		name 'AVC Enable'
-		value false
+		name 'AVC Integrator Response'
+		value 1
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type INTEGER
 			count 1
+			range '0 - 3'
 		}
 	}
 	control.18 {
 		iface MIXER
-		name 'AVC Hard Limit'
-		value false
+		name 'AVC Threshold Volume'
+		value 12
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type INTEGER
 			count 1
+			range '0 - 96'
+			dbmin 0
+			dbmax 9600
+			dbvalue.0 1200
 		}
 	}
 	control.19 {
 		iface MIXER
-		name 'AVC Max Gain'
-		value 1
+		name 'BASS 0'
+		value 47
 		comment {
 			access 'read write'
 			type INTEGER
 			count 1
-			range '0 - 2'
-			dbmin 0
+			range '0 - 95'
+			dbmin -1175
 			dbmax 1200
-			dbvalue.0 600
+			dbvalue.0 0
 		}
 	}
 	control.20 {
 		iface MIXER
-		name 'AVC Threshold (-dB)'
-		value 12
+		name 'BASS 1'
+		value 47
 		comment {
 			access 'read write'
 			type INTEGER
 			count 1
-			range '0 - 96'
-			dbmin 0
-			dbmax 96
-			dbvalue.0 12
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
 		}
 	}
 	control.21 {
 		iface MIXER
-		name 'DAP_MIXER Mixer Channel'
-		value false
+		name 'BASS 2'
+		value 47
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type INTEGER
 			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
 		}
 	}
 	control.22 {
 		iface MIXER
-		name I2S_OUT
-		value ADC
+		name 'BASS 3'
+		value 47
 		comment {
 			access 'read write'
-			type ENUMERATED
+			type INTEGER
 			count 1
-			item.0 ADC
-			item.1 I2S_IN
-			item.2 reserved
-			item.3 DAP
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
 		}
 	}
 	control.23 {
 		iface MIXER
-		name DAC_IN
-		value I2S_IN
+		name 'BASS 4'
+		value 47
 		comment {
 			access 'read write'
-			type ENUMERATED
+			type INTEGER
 			count 1
-			item.0 ADC
-			item.1 I2S_IN
-			item.2 reserved
-			item.3 DAP
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
 		}
 	}
 	control.24 {
 		iface MIXER
-		name MIX_MUX
-		value ADC
+		name 'Capture Mux'
+		value MIC_IN
 		comment {
 			access 'read write'
 			type ENUMERATED
 			count 1
-			item.0 ADC
-			item.1 I2S_IN
+			item.0 MIC_IN
+			item.1 LINE_IN
 		}
 	}
 	control.25 {
 		iface MIXER
-		name DAP_IN
-		value ADC
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 ADC
-			item.1 I2S_IN
-		}
-	}
-	control.26 {
-		iface MIXER
 		name 'Headphone Mux'
 		value DAC
 		comment {
@@ -316,64 +310,42 @@ state.sgtl5000audio {
 			item.1 LINE_IN
 		}
 	}
-	control.27 {
-		iface MIXER
-		name 'Capture Mux'
-		value MIC_IN
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
-		}
-	}
-	control.28 {
+	control.26 {
 		iface MIXER
-		name 'Jack Function'
-		value off
+		name 'Digital Input Mux'
+		value I2S
 		comment {
 			access 'read write'
 			type ENUMERATED
 			count 1
-			item.0 off
-			item.1 on
+			item.0 ADC
+			item.1 I2S
+			item.2 Rsvrd
+			item.3 DAP
 		}
 	}
-	control.29 {
+	control.27 {
 		iface MIXER
-		name 'Speaker Function'
-		value off
+		name 'DAP Mux'
+		value ADC
 		comment {
 			access 'read write'
 			type ENUMERATED
 			count 1
-			item.0 off
-			item.1 on
+			item.0 ADC
+			item.1 I2S
 		}
 	}
-	control.30 {
+	control.28 {
 		iface MIXER
-		name 'Line In Function'
-		value off
+		name 'DAP MIX Mux'
+		value ADC
 		comment {
 			access 'read write'
 			type ENUMERATED
 			count 1
-			item.0 off
-			item.1 on
-		}
-	}
-}
-state.imxhdmisoc {
-	control.1 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write'
-			type IEC958
-			count 1
+			item.0 ADC
+			item.1 I2S
 		}
 	}
 }