imx-audio: merge common files in SoC family ones

We provide mx5 and mx6 configurations leaving imx53ard as the only
exception.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

4 files changed, 1 insertions, 45 deletions

diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio
deleted file mode 100644
index dde693053..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          imx mixer setup
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Initialize the imx audio mixer
-# Description:       Unmute FRONT and set volume to ~70%.
-### END INIT INFO
-# Based on /etc/init.d/skeleton
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Audio mixer settings"
-NAME=imx-audio
-AMIXER=`which amixer`
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if amixer is not installed
-[ -x "$AMIXER" ] || exit 0
-
-do_start() {
-        # Enable the Headset (Audio Out)
-        $AMIXER sset "Headphone" 120 > /dev/null
-        $AMIXER sset "Speaker Function" on > /dev/null
-        $AMIXER sset "Playback" 140 > /dev/null
-        $AMIXER sset "Capture" 15 > /dev/null
-        $AMIXER sset "Jack Function" on > /dev/null
-}
-
-case "$1" in
-start)
-        echo "$NAME: setting default mixer settings."
-        do_start
-        ;;
-stop)
-        ;;
-*)
-        echo "Usage: $SCRIPTNAME {start|stop}" >&2
-        exit 3
-        ;;
-esac
-
-exit 0
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx51evk/imx-audio b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio
index dde693053..dde693053 100644
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx51evk/imx-audio
+++ b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx53qsb/imx-audio b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio
index dde693053..dde693053 100644
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx53qsb/imx-audio
+++ b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb
index bafa92b6d..2dc0ecb89 100644
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb
+++ b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r3"
+PR = "r4"
 
 inherit update-rc.d