Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zenxfi3: drop audio routing driver in favor of the generic one

Browse source 
Change-Id: Ia104c148f9139434d2c70190d2834b06de20de23
This commit is contained in:
Amaury Pouly 2013-06-18 16:19:28 +02:00
parent 11c907a83c
commit ea8b22a9b6
3 changed files with 30 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
firmware/SOURCES
View file

@ -1169,9 +1169,6 @@ target/arm/imx233/creative-zenxfi3/debug-zenxfi3.c
target/arm/imx233/creative-zenxfi3/power-zenxfi3.c
target/arm/imx233/creative-zenxfi3/adc-zenxfi3.c
target/arm/imx233/creative-zenxfi3/powermgmt-zenxfi3.c
#ifndef BOOTLOADER
target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
#endif
#endif
#ifdef SANSA_CONNECT

30
firmware/target/arm/imx233/creative-zenxfi3/audio-target.h Normal file
View file

@ -0,0 +1,30 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2013 by Amaury Pouly
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef __audio_target__
#define __audio_target__
#define IMX233_AUDIO_HP_GATE_BANK 1
#define IMX233_AUDIO_HP_GATE_PIN 30
#define IMX233_AUDIO_SPKR_GATE_BANK 1
#define IMX233_AUDIO_SPKR_GATE_PIN 22
#endif /* __audio_target__ */

78
firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
View file

@ -1,78 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2012 by Amaury Pouly
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "config.h"
#include "system.h"
#include "audiohw.h"
#include "audio.h"
#include "audioout-imx233.h"
#include "audioin-imx233.h"
#include "pinctrl-imx233.h"
static int input_source = AUDIO_SRC_PLAYBACK;
static unsigned input_flags = 0;
static int output_source = AUDIO_SRC_PLAYBACK;
static bool initialized = false;
static void init(void)
{
/* HP gate */
imx233_pinctrl_acquire(1, 30, "hp gate");
imx233_pinctrl_set_function(1, 30, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(1, 30, true);
imx233_pinctrl_set_gpio(1, 30, false);
/* SPKR gate */
imx233_pinctrl_acquire(1, 22, "spkr gate");
imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(1, 22, true);
imx233_pinctrl_set_gpio(1, 22, false);
initialized = true;
}
static void select_audio_path(void)
{
if(!initialized)
init();
/* route audio to HP */
imx233_pinctrl_set_gpio(1, 30, true);
if(input_source == AUDIO_SRC_PLAYBACK)
imx233_audioout_select_hp_input(false);
else
imx233_audioout_select_hp_input(true);
}
void audio_input_mux(int source, unsigned flags)
{
(void) source;
(void) flags;
input_source = source;
input_flags = flags;
select_audio_path();
}
void audio_set_output_source(int source)
{
(void) source;
output_source = source;
select_audio_path();
}