[oe-commits] org.oe.dev alsa-state: merge upstream

[john_lee commit]

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

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 1da725dcfe388015fb015d5856219998e0879ed1
ViewMTN: http://monotone.openembedded.org/revision/info/1da725dcfe388015fb015d5856219998e0879ed1
Files:
1
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/alsa/alsa-state.bb
Diffs:

#
# mt diff -r5c73ea03cf696ea03d768c708d7495d87be1b52c -r1da725dcfe388015fb015d5856219998e0879ed1
#
#
#
# patch "packages/alsa/alsa-state/fic-gta02/asound.state"
#  from [e0b5bc4b6c754195ec2bbcbfc62eb8d96dfde042]
#    to [9354a119e8ef00e14a2d0585a0477e3cd87717e3]
# 
# patch "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
#  from [160bb5fdcf8656f03ec120c677c29512983ef721]
#    to [22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117]
# 
# patch "packages/alsa/alsa-state/fic-gta02/stereoout.state"
#  from [e0b5bc4b6c754195ec2bbcbfc62eb8d96dfde042]
#    to [9354a119e8ef00e14a2d0585a0477e3cd87717e3]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [b78fa244fb9c836713118514b9b2a32dd5f3bd88]
#    to [e5436e264cee1a75607428ab2567cb9a4227c219]
#
============================================================
--- packages/alsa/alsa-state/fic-gta02/asound.state	e0b5bc4b6c754195ec2bbcbfc62eb8d96dfde042
+++ packages/alsa/alsa-state/fic-gta02/asound.state	9354a119e8ef00e14a2d0585a0477e3cd87717e3
@@ -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
+	}
 }
============================================================
--- packages/alsa/alsa-state/fic-gta02/gsmhandset.state	160bb5fdcf8656f03ec120c677c29512983ef721
+++ packages/alsa/alsa-state/fic-gta02/gsmhandset.state	22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117
@@ -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'
============================================================
--- packages/alsa/alsa-state/fic-gta02/stereoout.state	e0b5bc4b6c754195ec2bbcbfc62eb8d96dfde042
+++ packages/alsa/alsa-state/fic-gta02/stereoout.state	9354a119e8ef00e14a2d0585a0477e3cd87717e3
@@ -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
+	}
 }
============================================================
--- packages/alsa/alsa-state.bb	b78fa244fb9c836713118514b9b2a32dd5f3bd88
+++ packages/alsa/alsa-state.bb	e5436e264cee1a75607428ab2567cb9a4227c219
@@ -8,7 +8,7 @@ PV = "0.1.0"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = " \
   file://asoundrc \