From 6069a9d23d51d0d0cea3e9b7f5800110cd0b652b Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Wed, 4 May 2022 14:49:21 +0200
Subject: alsa-state: colibri-imx7/-emmc: update asound.state

As the upstream sound card name differs from ancient downstream update
it to match later downstream as well as upstream.

While at it also use latest mixer configuration from current master
upstream.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit b542a61d76a9d82812652a39e95463f0b800974e)
---
 .../alsa-state/colibri-imx7-emmc/asound.state      | 259 ++++++++++++++++++++-
 .../alsa-state/colibri-imx7/asound.state           | 259 ++++++++++++++++++++-
 2 files changed, 500 insertions(+), 18 deletions(-)

diff --git a/recipes-bsp/alsa-state/alsa-state/colibri-imx7-emmc/asound.state b/recipes-bsp/alsa-state/alsa-state/colibri-imx7-emmc/asound.state
index a578e3d..8497618 100644
--- a/recipes-bsp/alsa-state/alsa-state/colibri-imx7-emmc/asound.state
+++ b/recipes-bsp/alsa-state/alsa-state/colibri-imx7-emmc/asound.state
@@ -1,4 +1,4 @@
-state.imx7colibrisgtl {
+state.imx7sgtl5000 {
 	control.1 {
 		iface MIXER
 		name 'PCM Playback Volume'
@@ -44,6 +44,16 @@ state.imx7colibrisgtl {
 		}
 	}
 	control.5 {
+		iface MIXER
+		name 'Capture Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.6 {
 		iface MIXER
 		name 'Headphone Playback Volume'
 		value.0 103
@@ -59,7 +69,17 @@ state.imx7colibrisgtl {
 			dbvalue.1 0
 		}
 	}
-	control.6 {
+	control.7 {
+		iface MIXER
+		name 'Headphone Playback Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.8 {
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
 		value true
@@ -69,7 +89,7 @@ state.imx7colibrisgtl {
 			count 1
 		}
 	}
-	control.7 {
+	control.9 {
 		iface MIXER
 		name 'Mic Volume'
 		value 0
@@ -83,7 +103,202 @@ state.imx7colibrisgtl {
 			dbvalue.0 0
 		}
 	}
-	control.8 {
+	control.10 {
+		iface MIXER
+		name 'Lineout Playback Volume'
+		value.0 18
+		value.1 18
+		comment {
+			access 'read write'
+			type INTEGER
+			count 2
+			range '0 - 31'
+			dbmin -1550
+			dbmax 0
+			dbvalue.0 -650
+			dbvalue.1 -650
+		}
+	}
+	control.11 {
+		iface MIXER
+		name 'Lineout Playback Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.12 {
+		iface MIXER
+		name 'DAP Main channel'
+		value 32768
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 65535'
+			dbmin 0
+			dbmax 65535
+			dbvalue.0 32768
+		}
+	}
+	control.13 {
+		iface MIXER
+		name 'DAP Mix channel'
+		value 0
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 65535'
+			dbmin 0
+			dbmax 65535
+			dbvalue.0 0
+		}
+	}
+	control.14 {
+		iface MIXER
+		name 'AVC Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.15 {
+		iface MIXER
+		name 'AVC Hard Limiter Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.16 {
+		iface MIXER
+		name 'AVC Max Gain Volume'
+		value 1
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 2'
+			dbmin 0
+			dbmax 1200
+			dbvalue.0 600
+		}
+	}
+	control.17 {
+		iface MIXER
+		name 'AVC Integrator Response'
+		value 1
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 3'
+		}
+	}
+	control.18 {
+		iface MIXER
+		name 'AVC Threshold Volume'
+		value 12
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 96'
+			dbmin 0
+			dbmax 9600
+			dbvalue.0 1200
+		}
+	}
+	control.19 {
+		iface MIXER
+		name 'BASS 0'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.20 {
+		iface MIXER
+		name 'BASS 1'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.21 {
+		iface MIXER
+		name 'BASS 2'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.22 {
+		iface MIXER
+		name 'BASS 3'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.23 {
+		iface MIXER
+		name 'BASS 4'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.24 {
+		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.25 {
 		iface MIXER
 		name 'Headphone Mux'
 		value DAC
@@ -95,16 +310,42 @@ state.imx7colibrisgtl {
 			item.1 LINE_IN
 		}
 	}
-	control.9 {
+	control.26 {
 		iface MIXER
-		name 'Capture Mux'
-		value MIC_IN
+		name 'Digital Input Mux'
+		value I2S
 		comment {
 			access 'read write'
 			type ENUMERATED
 			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
+			item.0 ADC
+			item.1 I2S
+			item.2 Rsvrd
+			item.3 DAP
+		}
+	}
+	control.27 {
+		iface MIXER
+		name 'DAP Mux'
+		value ADC
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 ADC
+			item.1 I2S
+		}
+	}
+	control.28 {
+		iface MIXER
+		name 'DAP MIX Mux'
+		value ADC
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 ADC
+			item.1 I2S
 		}
 	}
 }
diff --git a/recipes-bsp/alsa-state/alsa-state/colibri-imx7/asound.state b/recipes-bsp/alsa-state/alsa-state/colibri-imx7/asound.state
index a578e3d..8497618 100644
--- a/recipes-bsp/alsa-state/alsa-state/colibri-imx7/asound.state
+++ b/recipes-bsp/alsa-state/alsa-state/colibri-imx7/asound.state
@@ -1,4 +1,4 @@
-state.imx7colibrisgtl {
+state.imx7sgtl5000 {
 	control.1 {
 		iface MIXER
 		name 'PCM Playback Volume'
@@ -44,6 +44,16 @@ state.imx7colibrisgtl {
 		}
 	}
 	control.5 {
+		iface MIXER
+		name 'Capture Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.6 {
 		iface MIXER
 		name 'Headphone Playback Volume'
 		value.0 103
@@ -59,7 +69,17 @@ state.imx7colibrisgtl {
 			dbvalue.1 0
 		}
 	}
-	control.6 {
+	control.7 {
+		iface MIXER
+		name 'Headphone Playback Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.8 {
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
 		value true
@@ -69,7 +89,7 @@ state.imx7colibrisgtl {
 			count 1
 		}
 	}
-	control.7 {
+	control.9 {
 		iface MIXER
 		name 'Mic Volume'
 		value 0
@@ -83,7 +103,202 @@ state.imx7colibrisgtl {
 			dbvalue.0 0
 		}
 	}
-	control.8 {
+	control.10 {
+		iface MIXER
+		name 'Lineout Playback Volume'
+		value.0 18
+		value.1 18
+		comment {
+			access 'read write'
+			type INTEGER
+			count 2
+			range '0 - 31'
+			dbmin -1550
+			dbmax 0
+			dbvalue.0 -650
+			dbvalue.1 -650
+		}
+	}
+	control.11 {
+		iface MIXER
+		name 'Lineout Playback Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.12 {
+		iface MIXER
+		name 'DAP Main channel'
+		value 32768
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 65535'
+			dbmin 0
+			dbmax 65535
+			dbvalue.0 32768
+		}
+	}
+	control.13 {
+		iface MIXER
+		name 'DAP Mix channel'
+		value 0
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 65535'
+			dbmin 0
+			dbmax 65535
+			dbvalue.0 0
+		}
+	}
+	control.14 {
+		iface MIXER
+		name 'AVC Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.15 {
+		iface MIXER
+		name 'AVC Hard Limiter Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.16 {
+		iface MIXER
+		name 'AVC Max Gain Volume'
+		value 1
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 2'
+			dbmin 0
+			dbmax 1200
+			dbvalue.0 600
+		}
+	}
+	control.17 {
+		iface MIXER
+		name 'AVC Integrator Response'
+		value 1
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 3'
+		}
+	}
+	control.18 {
+		iface MIXER
+		name 'AVC Threshold Volume'
+		value 12
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 96'
+			dbmin 0
+			dbmax 9600
+			dbvalue.0 1200
+		}
+	}
+	control.19 {
+		iface MIXER
+		name 'BASS 0'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.20 {
+		iface MIXER
+		name 'BASS 1'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.21 {
+		iface MIXER
+		name 'BASS 2'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.22 {
+		iface MIXER
+		name 'BASS 3'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.23 {
+		iface MIXER
+		name 'BASS 4'
+		value 47
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 95'
+			dbmin -1175
+			dbmax 1200
+			dbvalue.0 0
+		}
+	}
+	control.24 {
+		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.25 {
 		iface MIXER
 		name 'Headphone Mux'
 		value DAC
@@ -95,16 +310,42 @@ state.imx7colibrisgtl {
 			item.1 LINE_IN
 		}
 	}
-	control.9 {
+	control.26 {
 		iface MIXER
-		name 'Capture Mux'
-		value MIC_IN
+		name 'Digital Input Mux'
+		value I2S
 		comment {
 			access 'read write'
 			type ENUMERATED
 			count 1
-			item.0 MIC_IN
-			item.1 LINE_IN
+			item.0 ADC
+			item.1 I2S
+			item.2 Rsvrd
+			item.3 DAP
+		}
+	}
+	control.27 {
+		iface MIXER
+		name 'DAP Mux'
+		value ADC
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 ADC
+			item.1 I2S
+		}
+	}
+	control.28 {
+		iface MIXER
+		name 'DAP MIX Mux'
+		value ADC
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 ADC
+			item.1 I2S
 		}
 	}
 }
-- 
cgit v1.2.3