* [PATCH v2 1/1] alsa-state: Support all atmel at91 boards
@ 2010-03-15 8:00 Ulf Samuelsson
2010-03-15 9:35 ` Ulf Samuelsson
0 siblings, 1 reply; 3+ messages in thread
From: Ulf Samuelsson @ 2010-03-15 8:00 UTC (permalink / raw)
To: openembedded-devel; +Cc: Ulf Samuelsson
Signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
---
recipes/alsa/alsa-state.bb | 29 ++-
recipes/alsa/alsa-state/at91/asound.conf | 2 +
recipes/alsa/alsa-state/at91/asound.state | 283 ++++++++++++++++++++
recipes/alsa/alsa-state/at91sam9263ek/asound.conf | 2 -
recipes/alsa/alsa-state/at91sam9263ek/asound.state | 283 --------------------
recipes/alsa/alsa-state/at91sam9g45ek/asound.conf | 2 -
recipes/alsa/alsa-state/at91sam9g45ek/asound.state | 283 --------------------
7 files changed, 313 insertions(+), 571 deletions(-)
create mode 100644 recipes/alsa/alsa-state/at91/asound.conf
create mode 100644 recipes/alsa/alsa-state/at91/asound.state
delete mode 100644 recipes/alsa/alsa-state/at91sam9263ek/asound.conf
delete mode 100644 recipes/alsa/alsa-state/at91sam9263ek/asound.state
delete mode 100644 recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
delete mode 100644 recipes/alsa/alsa-state/at91sam9g45ek/asound.state
diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb
index d77db70..c487455 100644
--- a/recipes/alsa/alsa-state.bb
+++ b/recipes/alsa/alsa-state.bb
@@ -5,9 +5,16 @@
# Filename: alsa-state.bb
DESCRIPTION = "Alsa Scenario Files"
+LICENSE = "MIT"# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# for a copy of the license)
+#
+# Filename: alsa-state.bb
+
+DESCRIPTION = "Alsa Scenario Files"
LICENSE = "MIT"
PV = "0.2.0"
-PR = "r11"
+PR = "r12"
SRC_URI = "\
file://asound.conf \
@@ -19,6 +26,25 @@ SRC_URI_append_a780 = "file://gsmhandset.state \
file://gsmheadset.state \
file://stereoout.state"
+ALSA_STATE_AT91 = "\
+ file://at91/asound.conf \
+ file://at91/asound.state \
+ file://alsa-state \
+ "
+
+SRC_URI_at91sam9260ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9261ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9263ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9g10ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9g20ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9g20ek_2mmc = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9g45ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9g45ekes = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9m10ekes = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9m10g45ek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9rlek = " $(ALSA_STATE_AT91} "
+SRC_URI_at91sam9xeek = " $(ALSA_STATE_AT91} "
+
inherit update-rc.d
INITSCRIPT_NAME = "alsa-state"
@@ -59,3 +85,4 @@ pkg_postinst_${PN}() {
update-rc.d ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
fi
}
+
diff --git a/recipes/alsa/alsa-state/at91/asound.conf b/recipes/alsa/alsa-state/at91/asound.conf
new file mode 100644
index 0000000..87bb5ec
--- /dev/null
+++ b/recipes/alsa/alsa-state/at91/asound.conf
@@ -0,0 +1,2 @@
+pcm.!default { type hw card 0 }
+ctl.!default { type hw card 0 }
diff --git a/recipes/alsa/alsa-state/at91/asound.state b/recipes/alsa/alsa-state/at91/asound.state
new file mode 100644
index 0000000..ee646a1
--- /dev/null
+++ b/recipes/alsa/alsa-state/at91/asound.state
@@ -0,0 +1,283 @@
+state.AC97 {
+ control.1 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Master Playback Switch'
+ value.0 true
+ value.1 true
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 31'
+ comment.dbmin -4650
+ comment.dbmax 0
+ iface MIXER
+ name 'Master Playback Volume'
+ value.0 22
+ value.1 22
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback Switch'
+ value.0 true
+ value.1 true
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 31'
+ comment.dbmin -4650
+ comment.dbmax 0
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 22
+ value.1 22
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Master Mono Playback Switch'
+ value false
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ comment.dbmin -4650
+ comment.dbmax 0
+ iface MIXER
+ name 'Master Mono Playback Volume'
+ value 0
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Phone Playback Switch'
+ value false
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ comment.dbmin -3450
+ comment.dbmax 1200
+ iface MIXER
+ name 'Phone Playback Volume'
+ value 0
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mic Playback Switch'
+ value false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ comment.dbmin -3450
+ comment.dbmax 1200
+ iface MIXER
+ name 'Mic Playback Volume'
+ value 0
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mic Boost (+20dB)'
+ value false
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Line Playback Switch'
+ value.0 false
+ value.1 false
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 31'
+ comment.dbmin -3450
+ comment.dbmax 1200
+ iface MIXER
+ name 'Line Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'CD Playback Switch'
+ value.0 false
+ value.1 false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 31'
+ comment.dbmin -3450
+ comment.dbmax 1200
+ iface MIXER
+ name 'CD Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Aux Playback Switch'
+ value.0 false
+ value.1 false
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 31'
+ comment.dbmin -3450
+ comment.dbmax 1200
+ iface MIXER
+ name 'Aux Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'PCM Playback Switch'
+ value.0 true
+ value.1 true
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 31'
+ comment.dbmin -3450
+ comment.dbmax 1200
+ iface MIXER
+ name 'PCM Playback Volume'
+ value.0 22
+ value.1 22
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 2
+ comment.item.0 Mic
+ comment.item.1 CD
+ comment.item.2 Video
+ comment.item.3 Aux
+ comment.item.4 Line
+ comment.item.5 Mix
+ comment.item.6 'Mix Mono'
+ comment.item.7 Phone
+ iface MIXER
+ name 'Capture Source'
+ value.0 Mic
+ value.1 Mic
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 true
+ value.1 true
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 15'
+ comment.dbmin 0
+ comment.dbmax 2250
+ iface MIXER
+ name 'Capture Volume'
+ value.0 11
+ value.1 11
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Mix
+ comment.item.1 Mic
+ iface MIXER
+ name 'Mono Output Select'
+ value Mix
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Mic1
+ comment.item.1 Mic2
+ iface MIXER
+ name 'Mic Select'
+ value Mic1
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Stereo Mic'
+ value false
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Headphone Jack Sense'
+ value false
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Line Jack Sense'
+ value false
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'External Amplifier'
+ value true
+ }
+}
diff --git a/recipes/alsa/alsa-state/at91sam9263ek/asound.conf b/recipes/alsa/alsa-state/at91sam9263ek/asound.conf
deleted file mode 100644
index 87bb5ec..0000000
--- a/recipes/alsa/alsa-state/at91sam9263ek/asound.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-pcm.!default { type hw card 0 }
-ctl.!default { type hw card 0 }
diff --git a/recipes/alsa/alsa-state/at91sam9263ek/asound.state b/recipes/alsa/alsa-state/at91sam9263ek/asound.state
deleted file mode 100644
index ee646a1..0000000
--- a/recipes/alsa/alsa-state/at91sam9263ek/asound.state
+++ /dev/null
@@ -1,283 +0,0 @@
-state.AC97 {
- control.1 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Master Playback Switch'
- value.0 true
- value.1 true
- }
- control.2 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -4650
- comment.dbmax 0
- iface MIXER
- name 'Master Playback Volume'
- value.0 22
- value.1 22
- }
- control.3 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Headphone Playback Switch'
- value.0 true
- value.1 true
- }
- control.4 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -4650
- comment.dbmax 0
- iface MIXER
- name 'Headphone Playback Volume'
- value.0 22
- value.1 22
- }
- control.5 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Master Mono Playback Switch'
- value false
- }
- control.6 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 1
- comment.range '0 - 31'
- comment.dbmin -4650
- comment.dbmax 0
- iface MIXER
- name 'Master Mono Playback Volume'
- value 0
- }
- control.7 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Phone Playback Switch'
- value false
- }
- control.8 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 1
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Phone Playback Volume'
- value 0
- }
- control.9 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Mic Playback Switch'
- value false
- }
- control.10 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 1
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Mic Playback Volume'
- value 0
- }
- control.11 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Mic Boost (+20dB)'
- value false
- }
- control.12 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Line Playback Switch'
- value.0 false
- value.1 false
- }
- control.13 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Line Playback Volume'
- value.0 0
- value.1 0
- }
- control.14 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'CD Playback Switch'
- value.0 false
- value.1 false
- }
- control.15 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'CD Playback Volume'
- value.0 0
- value.1 0
- }
- control.16 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Aux Playback Switch'
- value.0 false
- value.1 false
- }
- control.17 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Aux Playback Volume'
- value.0 0
- value.1 0
- }
- control.18 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'PCM Playback Switch'
- value.0 true
- value.1 true
- }
- control.19 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'PCM Playback Volume'
- value.0 22
- value.1 22
- }
- control.20 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 2
- comment.item.0 Mic
- comment.item.1 CD
- comment.item.2 Video
- comment.item.3 Aux
- comment.item.4 Line
- comment.item.5 Mix
- comment.item.6 'Mix Mono'
- comment.item.7 Phone
- iface MIXER
- name 'Capture Source'
- value.0 Mic
- value.1 Mic
- }
- control.21 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Capture Switch'
- value.0 true
- value.1 true
- }
- control.22 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 15'
- comment.dbmin 0
- comment.dbmax 2250
- iface MIXER
- name 'Capture Volume'
- value.0 11
- value.1 11
- }
- control.23 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 1
- comment.item.0 Mix
- comment.item.1 Mic
- iface MIXER
- name 'Mono Output Select'
- value Mix
- }
- control.24 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 1
- comment.item.0 Mic1
- comment.item.1 Mic2
- iface MIXER
- name 'Mic Select'
- value Mic1
- }
- control.25 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Stereo Mic'
- value false
- }
- control.26 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Headphone Jack Sense'
- value false
- }
- control.27 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Line Jack Sense'
- value false
- }
- control.28 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'External Amplifier'
- value true
- }
-}
diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
deleted file mode 100644
index fa98593..0000000
--- a/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-pcm.!default { type hw card 0 }
-ctl.!default { type hw card 0 }
diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.state b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state
deleted file mode 100644
index ee646a1..0000000
--- a/recipes/alsa/alsa-state/at91sam9g45ek/asound.state
+++ /dev/null
@@ -1,283 +0,0 @@
-state.AC97 {
- control.1 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Master Playback Switch'
- value.0 true
- value.1 true
- }
- control.2 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -4650
- comment.dbmax 0
- iface MIXER
- name 'Master Playback Volume'
- value.0 22
- value.1 22
- }
- control.3 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Headphone Playback Switch'
- value.0 true
- value.1 true
- }
- control.4 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -4650
- comment.dbmax 0
- iface MIXER
- name 'Headphone Playback Volume'
- value.0 22
- value.1 22
- }
- control.5 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Master Mono Playback Switch'
- value false
- }
- control.6 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 1
- comment.range '0 - 31'
- comment.dbmin -4650
- comment.dbmax 0
- iface MIXER
- name 'Master Mono Playback Volume'
- value 0
- }
- control.7 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Phone Playback Switch'
- value false
- }
- control.8 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 1
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Phone Playback Volume'
- value 0
- }
- control.9 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Mic Playback Switch'
- value false
- }
- control.10 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 1
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Mic Playback Volume'
- value 0
- }
- control.11 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Mic Boost (+20dB)'
- value false
- }
- control.12 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Line Playback Switch'
- value.0 false
- value.1 false
- }
- control.13 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Line Playback Volume'
- value.0 0
- value.1 0
- }
- control.14 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'CD Playback Switch'
- value.0 false
- value.1 false
- }
- control.15 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'CD Playback Volume'
- value.0 0
- value.1 0
- }
- control.16 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Aux Playback Switch'
- value.0 false
- value.1 false
- }
- control.17 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'Aux Playback Volume'
- value.0 0
- value.1 0
- }
- control.18 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'PCM Playback Switch'
- value.0 true
- value.1 true
- }
- control.19 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 31'
- comment.dbmin -3450
- comment.dbmax 1200
- iface MIXER
- name 'PCM Playback Volume'
- value.0 22
- value.1 22
- }
- control.20 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 2
- comment.item.0 Mic
- comment.item.1 CD
- comment.item.2 Video
- comment.item.3 Aux
- comment.item.4 Line
- comment.item.5 Mix
- comment.item.6 'Mix Mono'
- comment.item.7 Phone
- iface MIXER
- name 'Capture Source'
- value.0 Mic
- value.1 Mic
- }
- control.21 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 2
- iface MIXER
- name 'Capture Switch'
- value.0 true
- value.1 true
- }
- control.22 {
- comment.access 'read write'
- comment.type INTEGER
- comment.count 2
- comment.range '0 - 15'
- comment.dbmin 0
- comment.dbmax 2250
- iface MIXER
- name 'Capture Volume'
- value.0 11
- value.1 11
- }
- control.23 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 1
- comment.item.0 Mix
- comment.item.1 Mic
- iface MIXER
- name 'Mono Output Select'
- value Mix
- }
- control.24 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 1
- comment.item.0 Mic1
- comment.item.1 Mic2
- iface MIXER
- name 'Mic Select'
- value Mic1
- }
- control.25 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Stereo Mic'
- value false
- }
- control.26 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Headphone Jack Sense'
- value false
- }
- control.27 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Line Jack Sense'
- value false
- }
- control.28 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'External Amplifier'
- value true
- }
-}
--
1.6.0.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] alsa-state: Support all atmel at91 boards
2010-03-15 8:00 [PATCH v2 1/1] alsa-state: Support all atmel at91 boards Ulf Samuelsson
@ 2010-03-15 9:35 ` Ulf Samuelsson
2010-03-15 9:52 ` Nicolas Ferre
0 siblings, 1 reply; 3+ messages in thread
From: Ulf Samuelsson @ 2010-03-15 9:35 UTC (permalink / raw)
To: openembedded-devel
I will resubmit the alsa-state patch using
SOC_CLASS="at91" in conf/machine/at91*
and
SRC_URI_at91 = "\
file://at91/asound.conf \
file://at91/asound.state \
file://alsa-state \
"
in alsa-state.bb
--
Best Regards
Ulf Samuelsson
Ulf Samuelsson skrev:
> Signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
> ---
> recipes/alsa/alsa-state.bb | 29 ++-
> recipes/alsa/alsa-state/at91/asound.conf | 2 +
> recipes/alsa/alsa-state/at91/asound.state | 283 ++++++++++++++++++++
> recipes/alsa/alsa-state/at91sam9263ek/asound.conf | 2 -
> recipes/alsa/alsa-state/at91sam9263ek/asound.state | 283 --------------------
> recipes/alsa/alsa-state/at91sam9g45ek/asound.conf | 2 -
> recipes/alsa/alsa-state/at91sam9g45ek/asound.state | 283 --------------------
> 7 files changed, 313 insertions(+), 571 deletions(-)
> create mode 100644 recipes/alsa/alsa-state/at91/asound.conf
> create mode 100644 recipes/alsa/alsa-state/at91/asound.state
> delete mode 100644 recipes/alsa/alsa-state/at91sam9263ek/asound.conf
> delete mode 100644 recipes/alsa/alsa-state/at91sam9263ek/asound.state
> delete mode 100644 recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
> delete mode 100644 recipes/alsa/alsa-state/at91sam9g45ek/asound.state
>
> diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb
> index d77db70..c487455 100644
> --- a/recipes/alsa/alsa-state.bb
> +++ b/recipes/alsa/alsa-state.bb
> @@ -5,9 +5,16 @@
> # Filename: alsa-state.bb
>
> DESCRIPTION = "Alsa Scenario Files"
> +LICENSE = "MIT"# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
> +# License: MIT (see http://www.opensource.org/licenses/mit-license.php
> +# for a copy of the license)
> +#
> +# Filename: alsa-state.bb
> +
> +DESCRIPTION = "Alsa Scenario Files"
> LICENSE = "MIT"
> PV = "0.2.0"
> -PR = "r11"
> +PR = "r12"
>
> SRC_URI = "\
> file://asound.conf \
> @@ -19,6 +26,25 @@ SRC_URI_append_a780 = "file://gsmhandset.state \
> file://gsmheadset.state \
> file://stereoout.state"
>
> +ALSA_STATE_AT91 = "\
> + file://at91/asound.conf \
> + file://at91/asound.state \
> + file://alsa-state \
> + "
> +
> +SRC_URI_at91sam9260ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9261ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9263ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9g10ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9g20ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9g20ek_2mmc = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9g45ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9g45ekes = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9m10ekes = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9m10g45ek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9rlek = " $(ALSA_STATE_AT91} "
> +SRC_URI_at91sam9xeek = " $(ALSA_STATE_AT91} "
> +
> inherit update-rc.d
>
> INITSCRIPT_NAME = "alsa-state"
> @@ -59,3 +85,4 @@ pkg_postinst_${PN}() {
> update-rc.d ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
> fi
> }
> +
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] alsa-state: Support all atmel at91 boards
2010-03-15 9:35 ` Ulf Samuelsson
@ 2010-03-15 9:52 ` Nicolas Ferre
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2010-03-15 9:52 UTC (permalink / raw)
To: openembedded-devel; +Cc: Ulf Samuelsson
Le 15/03/2010 10:35, Ulf Samuelsson :
> I will resubmit the alsa-state patch using
>
> SOC_CLASS="at91" in conf/machine/at91*
>
> and
>
> SRC_URI_at91 = "\
> file://at91/asound.conf \
> file://at91/asound.state \
> file://alsa-state \
> "
>
> in alsa-state.bb
Ulf,
I do not understand: all at91 machines do *not* have the same alsa
states *at all* !! So why create a common asound.state file?
I understand for asound.conf but not for the other file.
Best regards,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-15 10:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-15 8:00 [PATCH v2 1/1] alsa-state: Support all atmel at91 boards Ulf Samuelsson
2010-03-15 9:35 ` Ulf Samuelsson
2010-03-15 9:52 ` Nicolas Ferre
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.