alsa-state: merge upstream

* reduce PCM volume for gta02 to prevent distortion
  (77baa0a58d42ad16d78eb1888a660e95b9112bda)
* merge state files with openmoko versions
  (20657a67dd3d46190016de2069fb77e48b12f0b9)

diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 7a95b55..3d12b5d 100644 (file)
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = " \
   file://asoundrc \

diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state
index c138749..04e6f60 100644 (file)
--- a/packages/alsa/alsa-state/fic-gta02/asound.state
+++ b/packages/alsa/alsa-state/fic-gta02/asound.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
                comment.range '0 - 255'
                iface MIXER
                name 'PCM Volume'
-               value.0 255
-               value.1 255
+               value.0 235
+               value.1 235
        }
        control.2 {
                comment.access 'read write'
@@ -854,6 +854,22 @@ state.neo1973gta02 {
                comment.count 1
                iface MIXER
                name 'DAPM Handset Spk Switch'
+               value false
+       }
+       control.92 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Amp State Switch'
+               value true
+       }
+       control.93 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Amp Spk Switch'
                value true
        }
 }

diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
index 348b109..cc0d32a 100644 (file)
--- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
                comment.range '0 - 255'
                iface MIXER
                name 'PCM Volume'
-               value.0 255
-               value.1 255
+               value.0 235
+               value.1 235
        }
        control.2 {
                comment.access 'read write'

diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state
index c138749..04e6f60 100644 (file)
--- a/packages/alsa/alsa-state/fic-gta02/stereoout.state
+++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
                comment.range '0 - 255'
                iface MIXER
                name 'PCM Volume'
-               value.0 255
-               value.1 255
+               value.0 235
+               value.1 235
        }
        control.2 {
                comment.access 'read write'
@@ -854,6 +854,22 @@ state.neo1973gta02 {
                comment.count 1
                iface MIXER
                name 'DAPM Handset Spk Switch'
+               value false
+       }
+       control.92 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Amp State Switch'
+               value true
+       }
+       control.93 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Amp Spk Switch'
                value true
        }
 }