From patchwork Mon Jan 21 10:52:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 214074 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 637382C008D for ; Mon, 21 Jan 2013 21:48:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 46B424A033; Mon, 21 Jan 2013 11:48:03 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yK5fjmizdPSS; Mon, 21 Jan 2013 11:48:03 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7CC094A036; Mon, 21 Jan 2013 11:48:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7D6DE4A044 for ; Mon, 21 Jan 2013 11:47:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hKAOKPnmT2a5 for ; Mon, 21 Jan 2013 11:47:43 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id 2D7854A036 for ; Mon, 21 Jan 2013 11:47:40 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MGZ00BEX1Z0ZTN0@mailout1.samsung.com> for u-boot@lists.denx.de; Mon, 21 Jan 2013 19:47:35 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.122]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 05.77.03918.7CC1DF05; Mon, 21 Jan 2013 19:47:35 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-c8-50fd1cc7219b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C4.77.03918.7CC1DF05; Mon, 21 Jan 2013 19:47:35 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MGZ009CX1UTT630@mmp1.samsung.com> for u-boot@lists.denx.de; Mon, 21 Jan 2013 19:47:35 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Mon, 21 Jan 2013 16:22:35 +0530 Message-id: <1358765559-32709-4-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1358765559-32709-1-git-send-email-rajeshwari.s@samsung.com> References: <1358765559-32709-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMLMWRmVeSWpSXmKPExsWyRsSkSve4zN8Ag78HlCze7u1kd2D0OHtn B2MAYxSXTUpqTmZZapG+XQJXxswHXxkLLgtX/P64kLWB8Q5/FyMnh4SAicSfL7cZIWwxiQv3 1rN1MXJxCAksZZS48e49M0zRppuXwWwhgUWMEqv+WUEUrWKSuHv5EjtIgk3ASGLryWlgk0QE JCR+9V8Fs5kFYiRe7//BBmILCzhI3D+3C8xmEVCV2LTzKVgNr4CHxOPv21khlilIHJv6Fczm FPCUuHFgEwvEYg+JPxtXMoMslhC4zCZxZ9s7dohBAhLfJh8CKuIASshKbDoAdbSkxMEVN1gm MAovYGRYxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7iREYhKf/PZPawbiyweIQowAHoxIPb8bU PwFCrIllxZW5hxglOJiVRHh/zgAK8aYkVlalFuXHF5XmpBYfYkwGWj6RWUo0OR8YIXkl8YbG JuamxqaWRkZmpqakCSuJ8zKeehIgJJCeWJKanZpakFoEs4WJg1OqgTFZJNKp+cbRA6m6+gYJ F04l8MSbqLuor5vt+iC96GvU5KuWO1a3LOh6pe7wtmG98G7/Da+PFK1KSLHJ+XP+2OSD22OO vH33X0w7d6VC/Hot72XP06dVnpo94dsj1jRLu34lB/viWWfffNLzr0moXKW5rbl0o4NTlo/9 x978lHs5H/mDsj39TZVYijMSDbWYi4oTAcAuHkWGAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jAd3jMn8DDNrXi1u83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoyZD74yFlwWrvj9cSFr A+Md/i5GTg4JAROJTTcvM0PYYhIX7q1nA7GFBBYxSqz6Z9XFyAVkr2KSuHv5EjtIgk3ASGLr yWmMILaIgITEr/6rYDazQIzE6/0/wJqFBRwk7p/bBWazCKhKbNr5FKyGV8BD4vH37awQyxQk jk39CmZzCnhK3DiwiQVisYfEn40rmScw8i5gZFjFKJpakFxQnJSea6hXnJhbXJqXrpecn7uJ ERziz6R2MK5ssDjEKMDBqMTDmzH1T4AQa2JZcWXuIUYJDmYlEd6fM4BCvCmJlVWpRfnxRaU5 qcWHGJOBrprILCWanA+Mv7ySeENjE3NTY1NLEwsTM0vShJXEeRlPPQkQEkhPLEnNTk0tSC2C 2cLEwSnVwBi3b/HHf7xMAXOvmjrskjn1OyztacJCtbID+4RkKsKnyZrPC2F9vvl+KF/jW+UM xr/7rLfHpjVEabLy5ovbVr121H4i9W3O96PrpqXkijzmzxO6NnX5+6JNe9/VHfqWGW1w/B3j /UD2ruy6k6eZklN5t1/4Pb/0zNP1H2yeZvTsNn32wpv3j7YSS3FGoqEWc1FxIgDaLNX+tQIA AA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: patches@linaro.org Subject: [U-Boot] [PATCH 3/7] Sound: Support for MAX98095 codec in driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patchs adds support for MAX98095 codec in sound driver. Signed-off-by: Rajeshwari Shinde --- arch/arm/include/asm/arch-exynos/sound.h | 10 +++++++++- drivers/sound/sound.c | 13 +++++++++++-- include/sound.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/sound.h b/arch/arm/include/asm/arch-exynos/sound.h index d1bd2f6..a216b00 100644 --- a/arch/arm/include/asm/arch-exynos/sound.h +++ b/arch/arm/include/asm/arch-exynos/sound.h @@ -33,6 +33,7 @@ #define I2S_RFS 256 #define I2S_BFS 32 +#ifdef CONFIG_SOUND_WM8994 /* I2C values */ #define AUDIO_I2C_BUS 1 #define AUDIO_I2C_REG 0x1a @@ -40,5 +41,12 @@ /* Audio Codec */ #define AUDIO_CODEC "wm8994" -#define AUDIO_COMPAT 1 +#else /* CONFIG_SOUND_MAX98095 */ +/* I2C values */ +#define AUDIO_I2C_BUS 7 +#define AUDIO_I2C_REG 0x22 + +/* Audio Codec */ +#define AUDIO_CODEC "max98095" +#endif #endif diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c index fa8432d..a74590b 100644 --- a/drivers/sound/sound.c +++ b/drivers/sound/sound.c @@ -31,6 +31,7 @@ #include #include #include "wm8994.h" +#include "max98095.h" /* defines */ #define SOUND_400_HZ 400 @@ -143,17 +144,25 @@ static int codec_init(const void *blob, struct i2stx_info *pi2s_tx) #else codectype = AUDIO_CODEC; #endif +#ifdef CONFIG_SOUND_WM8994 if (!strcmp(codectype, "wm8994")) { /* Check the codec type and initialise the same */ ret = wm8994_init(blob, WM8994_AIF2, pi2s_tx->samplingrate, (pi2s_tx->samplingrate * (pi2s_tx->rfs)), pi2s_tx->bitspersample, pi2s_tx->channels); +#endif +#ifdef CONFIG_SOUND_MAX98095 + if (!strcmp(codectype, "max98095")) { + ret = max98095_init(blob, pi2s_tx->samplingrate, + (pi2s_tx->samplingrate * (pi2s_tx->rfs)), + pi2s_tx->bitspersample); +#endif } 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; diff --git a/include/sound.h b/include/sound.h index d73839d..94922f6 100644 --- a/include/sound.h +++ b/include/sound.h @@ -28,6 +28,7 @@ enum en_sound_codec { CODEC_WM_8994, CODEC_WM_8995, + CODEC_MAX_98095, CODEC_MAX };