From 229dad5e1b9077ca2dec7ea8c4d0d709f9ef4315 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 26 Apr 2013 13:59:14 +0200
Subject: [PATCH] meta-digi-arm: fix soundcard name for ccimx53js

https://jira.digi.com/browse/DEL-331

While on it, fix whitespace problems (mixed tabs + spaces) in the
bitbake recipe.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../alsa-state/alsa-state.bbappend            | 27 ++++++++++---------
 .../alsa-state/ccimx53js/asound.inline.state  |  2 +-
 .../ccimx53js/asound.inline_play.state        |  2 +-
 .../alsa-state/ccimx53js/asound.micro.state   |  2 +-
 .../ccimx53js/asound.micro_play.state         |  2 +-
 .../alsa-state/ccimx53js/asound.play.state    |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
index 3ef3c505b..194b4693a 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -3,17 +3,20 @@
 PRINC := "${@int(PRINC) + 1}"
 PR_append = "+${DISTRO}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
-SRC_URI_append_ccardimx28js = " file://asound.inline_play.state \
-	    file://asound.inline.state \
-	    file://asound.micro_play.state \
-            file://asound.micro.state \
-            file://asound.play.state"
+SRC_URI_append_ccardimx28js = " \
+	file://asound.inline_play.state \
+	file://asound.inline.state \
+	file://asound.micro_play.state \
+	file://asound.micro.state \
+	file://asound.play.state \
+"
 
-
-SRC_URI_append_mx5 = " file://asound.inline_play.state \
-	    file://asound.inline.state \
-	    file://asound.micro_play.state \
-            file://asound.micro.state \
-            file://asound.play.state"
+SRC_URI_append_mx5 = " \
+	file://asound.inline_play.state \
+	file://asound.inline.state \
+	file://asound.micro_play.state \
+	file://asound.micro.state \
+	file://asound.play.state \
+"
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state
index 43347c129..d1fb676aa 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline.state
@@ -1,4 +1,4 @@
-state.imx-ccimx53 {
+state.imxccimx53 {
 	control.1 {
 		comment.access 'read write'
 		comment.type ENUMERATED
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state
index dcd45c53d..7d84e12e5 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.inline_play.state
@@ -1,4 +1,4 @@
-state.imx-ccimx53 {
+state.imxccimx53 {
 	control.1 {
 		comment.access 'read write'
 		comment.type ENUMERATED
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state
index 65876a380..28742682c 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro.state
@@ -1,4 +1,4 @@
-state.imx-ccimx53 {
+state.imxccimx53 {
 	control.1 {
 		comment.access 'read write'
 		comment.type ENUMERATED
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state
index e085baeed..28742682c 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.micro_play.state
@@ -1,4 +1,4 @@
-state.imx-ccximx53 {
+state.imxccimx53 {
 	control.1 {
 		comment.access 'read write'
 		comment.type ENUMERATED
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state
index b801b8120..f59bfcc0e 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.play.state
@@ -1,4 +1,4 @@
-state.imx-ccimx53 {
+state.imxccimx53 {
 	control.1 {
 		comment.access 'read write'
 		comment.type ENUMERATED