From d95d559fbe36b99d6edcbde07ede983848ffc9e3 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 17 May 2012 02:59:12 -0300 Subject: [PATCH] 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 --- .../imx-audio/imx6qsabrelite/imx-audio | 44 ------------------- .../imx-audio/{imx51evk => mx5}/imx-audio | 0 .../imx-audio/{imx53qsb => mx6}/imx-audio | 0 .../recipes-bsp/imx-audio/imx-audio_0.1.bb | 2 +- 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio rename meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/{imx51evk => mx5}/imx-audio (100%) rename meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/{imx53qsb => mx6}/imx-audio (100%) 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 dde69305..00000000 --- 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 similarity index 100% rename from meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx51evk/imx-audio rename to 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 similarity index 100% rename from meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx53qsb/imx-audio rename to 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 bafa92b6..2dc0ecb8 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 -- 2.40.1