From patchwork Wed Nov 28 06:10:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 202372 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 9F7D22C0095 for ; Wed, 28 Nov 2012 17:05:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 444044A0ED; Wed, 28 Nov 2012 07:04:55 +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 T-wY0rOWm+n0; Wed, 28 Nov 2012 07:04:55 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A3BE44A0EE; Wed, 28 Nov 2012 07:04:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8F4E4A0A2 for ; Wed, 28 Nov 2012 07:04:06 +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 hR9Kjc33S7Ld for ; Wed, 28 Nov 2012 07:04:05 +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 mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id 719814A09F for ; Wed, 28 Nov 2012 07:03:59 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0ME6005E5OTY8PN0@mailout3.samsung.com> for u-boot@lists.denx.de; Wed, 28 Nov 2012 15:03:55 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8A.E4.12699.B49A5B05; Wed, 28 Nov 2012 15:03:55 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-5a-50b5a94b0fa2 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3A.E4.12699.B49A5B05; Wed, 28 Nov 2012 15:03:55 +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 <0ME600J1EOU4G930@mmp2.samsung.com> for u-boot@lists.denx.de; Wed, 28 Nov 2012 15:03:55 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Wed, 28 Nov 2012 11:40:12 +0530 Message-id: <1354083013-5213-7-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1354083013-5213-1-git-send-email-rajeshwari.s@samsung.com> References: <1354083013-5213-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRsSkTtd75dYAg6YWbYu3ezvZHRg9zt7Z wRjAGMVlk5Kak1mWWqRvl8CVcezDDdaC34oVN7e+Y2xgXC7dxcjJISFgInH8/iomCFtM4sK9 9WwgtpDAUkaJ5W9Uuxg5wGoW9tZ2MXIBhaczSlzafIURwlnFJPHiQhsjSAObgJHE1pPTwGwR AQmJX/1XwWxmgRiJ1/t/gA0VFrCX6NoxH8xmEVCVmLPwHjuIzSvgLvH0xjdGiCMUJI5N/coK YnMKeEjc613EDnGQu8SK5t1MEL0CEt8mH2KBOE5WYtMBZpB7JAQus0nMm7gPao6kxMEVN1gm MAovYGRYxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iREYgqf/PZPewbiqweIQowAHoxIPr4Pj 1gAh1sSy4srcQ4wSHMxKIrw8bUAh3pTEyqrUovz4otKc1OJDjD5Al0xklhJNzgfGR15JvKGx ibmpsamlkZGZqSkOYSVx3maPlAAhgfTEktTs1NSC1CKYcUwcnFINjDJ9mz2U9O5zbLFYsFf+ +rH9IRqnv18w5TrwJSu4dGvb8aWPcox1mfn3xWhfYC34sVZ0mUXj+fznTHr5hpZpL7MTdP9p e/75Fd7h5pO0X30j39VChzfynBce3A17bDbZIftTnMfL12mnn/fHJZzn9k7sLxMMuOnIeK1B g3H5pcNd8yNZNB1jlViKMxINtZiLihMBrIywWW4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xoK73yq0BBh9fyVq83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoxjH26wFvxWrLi59R1j A+Ny6S5GDg4JAROJhb21XYycQKaYxIV769m6GLk4hASmM0pc2nyFEcJZxSTx4kIbI0gVm4CR xNaT08BsEQEJiV/9V8FsZoEYidf7f7CB2MIC9hJdO+aD2SwCqhJzFt5jB7F5Bdwlnt74xgix TUHi2NSvrCA2p4CHxL3eRWA1QkA1K5p3M01g5F3AyLCKUTS1ILmgOCk910ivODG3uDQvXS85 P3cTIzjEn0nvYFzVYHGIUYCDUYmH18Fxa4AQa2JZcWXuIUYJDmYlEV6eNqAQb0piZVVqUX58 UWlOavEhRh+gqyYyS4km5wPjL68k3tDYxNzU2NTSxMLEzBKHsJI4b7NHSoCQQHpiSWp2ampB ahHMOCYOTqkGxqhbSXm5j4L6kqPm7P+z289iulnB9I0aktmB677/0vn53kDpvP/VqZc92L6E c0/8MOl3EJOR8+spK9u/vTlSLVcgquLwfoktY9SWhBc3qk4tYZ6yvam97PjX+3vPtho5L/C7 mGSpoDb7qGOEiUOVXIeYeM57Y94bV7oMZAKvC0+ySxG4U99jocRSnJFoqMVcVJwIADU5G2Ke AgAA X-CFilter-Loop: Reflected Cc: patches@linaro.org Subject: [U-Boot] [PATCH 6/7 V2] Sound: WM8994: Add FDT support to codec 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 patch adds FDT support to the codec. Signed-off-by: Rajeshwari Shinde --- Changes in V2: - New patch. drivers/sound/wm8994.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- drivers/sound/wm8994.h | 6 +-- 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index 293903a..4352b21 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -31,6 +31,11 @@ #include #include "wm8994.h" #include "wm8994_registers.h" +#ifdef CONFIG_OF_CONTROL +#include +#else +#include +#endif /* defines for wm8994 system clock selection */ #define SEL_MCLK1 0x00 @@ -77,6 +82,7 @@ static int bclk_divs[] = { static struct wm8994_priv g_wm8994_info; static unsigned char g_wm8994_i2c_dev_addr; +static struct sound_codec_info g_codec_info; /* * Initialise I2C for wm 8994 @@ -747,13 +753,86 @@ err: return -1; } +/* + * Gets fdt values for wm8994 config parameters + * + * @param pcodec_info codec information structure + * @param blob FDT blob + * @return int value, 0 for success + */ +static int get_codec_values(struct sound_codec_info *pcodec_info, + const void *blob) +{ + int error = 0; +#ifdef CONFIG_OF_CONTROL + enum fdt_compat_id compat; + int node; + int parent; + + /* Get the node from FDT for codec */ + node = fdtdec_next_compatible(blob, 0, COMPAT_WOLFSON_WM8994_CODEC); + if (node <= 0) { + debug("EXYNOS_SOUND: No node for codec in device tree\n"); + debug("node = %d\n", node); + return -1; + } + + parent = fdt_parent_offset(blob, node); + if (parent < 0) { + debug("%s: Cannot find node parent\n", __func__); + return -1; + } + + compat = fd_dec_lookup(blob, parent); + switch (compat) { + case COMPAT_SAMSUNG_S3C2440_I2C: + pcodec_info->i2c_bus = i2c_get_bus_num_fdt(parent); + error |= pcodec_info->i2c_bus; + debug("i2c bus = %d\n", pcodec_info->i2c_bus); + pcodec_info->i2c_dev_addr = fdtdec_get_int(blob, node, + "reg", 0); + error |= pcodec_info->i2c_dev_addr; + debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr); + break; + default: + debug("%s: Unknown compat id %d\n", __func__, compat); + return -1; + } +#else + pcodec_info->i2c_bus = AUDIO_I2C_BUS; + pcodec_info->i2c_dev_addr = AUDIO_I2C_REG; + debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr); +#endif + + pcodec_info->codec_type = CODEC_WM_8994; + + if (error == -1) { + debug("fail to get wm8994 codec node properties\n"); + return -1; + } + + return 0; + +} + + /*wm8994 Device Initialisation */ -int wm8994_init(struct sound_codec_info *pcodec_info, - enum en_audio_interface aif_id, +int wm8994_init(const void *blob, enum en_audio_interface aif_id, int sampling_rate, int mclk_freq, int bits_per_sample, unsigned int channels) { int ret = 0; + struct sound_codec_info *pcodec_info = &g_codec_info; + + /* Get the codec Values */ +#ifdef CONFIG_OF_CONTROL + if (get_codec_values(pcodec_info, blob) < 0) { +#else + if (get_codec_values(pcodec_info, NULL) < 0) { +#endif + debug("FDT Codec values failed\n"); + return -1; + } /* shift the device address by 1 for 7 bit addressing */ g_wm8994_i2c_dev_addr = pcodec_info->i2c_dev_addr; diff --git a/drivers/sound/wm8994.h b/drivers/sound/wm8994.h index a8f0de1..a1e8335 100644 --- a/drivers/sound/wm8994.h +++ b/drivers/sound/wm8994.h @@ -69,8 +69,7 @@ enum wm8994_type { /* * intialise wm8994 sound codec device for the given configuration * - * @param pcodec_info pointer value of the sound codec info structure - * parsed from device tree + * @param blob FDT node for codec values * @param aif_id enum value of codec interface port in which * soc i2s is connected * @param sampling_rate Sampling rate ranges between from 8khz to 96khz @@ -80,8 +79,7 @@ enum wm8994_type { * * @returns -1 for error and 0 Success. */ -int wm8994_init(struct sound_codec_info *pcodec_info, - enum en_audio_interface aif_id, +int wm8994_init(const void *blob, enum en_audio_interface aif_id, int sampling_rate, int mclk_freq, int bits_per_sample, unsigned int channels); #endif /*__WM8994_H__ */