From patchwork Thu Jan 24 09:43:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 215283 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 280DC2C0089 for ; Thu, 24 Jan 2013 20:36:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CE5194A090; Thu, 24 Jan 2013 10:36:09 +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 GnAen3qLAR8X; Thu, 24 Jan 2013 10:36:09 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3C0ED4A08E; Thu, 24 Jan 2013 10:36:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CDBFB4A087 for ; Thu, 24 Jan 2013 10:35:57 +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 xBeiTI6s41dY for ; Thu, 24 Jan 2013 10:35:57 +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 597064A08F for ; Thu, 24 Jan 2013 10:35:56 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MH40064MINL7AX0@mailout1.samsung.com> for u-boot@lists.denx.de; Thu, 24 Jan 2013 18:35:54 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id FA.7C.03880.A7001015; Thu, 24 Jan 2013 18:35:54 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-57-5101007a1c77 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F9.7C.03880.A7001015; Thu, 24 Jan 2013 18:35:54 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MH400JQFINGXJ10@mmp2.samsung.com> for u-boot@lists.denx.de; Thu, 24 Jan 2013 18:35:54 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Thu, 24 Jan 2013 15:13:36 +0530 Message-id: <1359020620-11873-4-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1359020620-11873-1-git-send-email-rajeshwari.s@samsung.com> References: <1359020620-11873-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRmVeSWpSXmKPExsWyRsSkRreKgTHQYOJOaYu3ezvZHRg9zt7Z wRjAGMVlk5Kak1mWWqRvl8CVsWzWM8aCN8IVb2YcZmxgfMvfxcjJISFgInH76yIWCFtM4sK9 9WxdjFwcQgJLGSUW9z8HcjjAimbNDQCpERKYzigx5WItRM0qJomF7zqYQBJsAkYSW09OYwSx RQQkJH71X2UE6WUWKJWYMjEPJCws4CzR39fGBmKzCKhKXD16mxnE5hXwkLh8bRkbxA0KEsem fmUFaeUU8JSY2igLsdZD4uWNvWCnSQhcZpPY+vstK8QcAYlvkw+xQJwpK7HpADPEGEmJgytu sExgFF7AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTIzD8Tv97Jr2DcVWDxSFGAQ5GJR7e CnWGQCHWxLLiytxDjBIczEoivLEvgUK8KYmVValF+fFFpTmpxYcYk4GWT2SWEk3OB8ZGXkm8 obGJuamxqaWRkZmpKWnCSuK8jKeeBAgJpCeWpGanphakFsFsYeLglGpgbJhX8pu9t6uqeJJj 7MbPV3LmPtpxu/bptRtHz7D+arufrXDvyA2T8Ismd4VEJKXc9GNFMmQ57sZm/wz88EonkP2I gmJk0z2dw/te5nNOP/0pYlbZ1jPL6k61THqt1rhiovCPTYu2pEZVc0Uu05HyqdgsFMfPcTJV 1//t1e/ngj/u8dZMqsnlV2Ipzkg01GIuKk4EAKimIouDAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsVy+t9jQd0qBsZAg9v9nBZv93ayOzB6nL2z gzGAMaqB0SYjNTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH aKySQlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCGMWPZrGeMBW+EK97MOMzY wPiWv4uRg0NCwERi1tyALkZOIFNM4sK99WwgtpDAdEaJKRdruxi5gOxVTBIL33UwgSTYBIwk tp6cxghiiwhISPzqv8oIModZoFRiysQ8kLCwgLNEf18b2BwWAVWJq0dvM4PYvAIeEpevLWOD 2KUgcWzqV1aQVk4BT4mpjbIQaz0kXt7YyzaBkXcBI8MqRtHUguSC4qT0XCO94sTc4tK8dL3k /NxNjODgfia9g3FVg8UhRgEORiUe3gp1hkAh1sSy4srcQ4wSHMxKIryxL4FCvCmJlVWpRfnx RaU5qcWHGJOBjprILCWanA+MvLySeENjE3NTY1NLEwsTM0vShJXEeRlPPQkQEkhPLEnNTk0t SC2C2cLEwSnVwLhFRP7jE8fABVKe1kYvps+vfm/ZfXppqLQNtx/7VocpW0pf7oibesDs/x4j 8YbPi+zkep4utj5TfoWvbXWtNc+M07LcR90t04NELgu8kevm+x62fk2z5ErRvRPfz7Y6oa+k 5u4q/dKNi1fydjqbqPyEpJyPxecXreYSk2VbfvwT0xUllflM75RYijMSDbWYi4oTAQfuBiWy AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: alim.akhtar@samsung.com, patches@linaro.org Subject: [U-Boot] [PATCH 3/7 V2] 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 --- Changes in V2: - None 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 };