diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 09:51:09 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 09:51:09 +0100 |
| commit | 412665b46134f93464c09405e02f08ac9c62526d (patch) | |
| tree | 7d45bfd311e81d2d750c0c67edef17ceba17df3f /drivers/sound/sound.c | |
| parent | b6379e15a70cc2e22486e5962927d9de374d877b (diff) | |
| parent | ce0c1bc13556fbf1bdfa2a4a27ca6744e7beb32a (diff) | |
| download | u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.zip u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.tar.gz u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/sound/sound.c')
| -rw-r--r-- | drivers/sound/sound.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c index fa8432d..a4bf4ad 100644 --- a/drivers/sound/sound.c +++ b/drivers/sound/sound.c @@ -31,6 +31,7 @@ #include <sound.h> #include <asm/arch/sound.h> #include "wm8994.h" +#include "max98095.h" /* defines */ #define SOUND_400_HZ 400 @@ -149,11 +150,15 @@ static int codec_init(const void *blob, struct i2stx_info *pi2s_tx) pi2s_tx->samplingrate, (pi2s_tx->samplingrate * (pi2s_tx->rfs)), pi2s_tx->bitspersample, pi2s_tx->channels); + } else if (!strcmp(codectype, "max98095")) { + ret = max98095_init(blob, pi2s_tx->samplingrate, + (pi2s_tx->samplingrate * (pi2s_tx->rfs)), + pi2s_tx->bitspersample); } else { - debug("%s: Unknown code type %s\n", __func__, - codectype); + debug("%s: Unknown codec type %s\n", __func__, codectype); return -1; } + if (ret) { debug("%s: Codec init failed\n", __func__); return -1; |