From patchwork Thu Nov 29 07:55:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 202679 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 D162A2C008E for ; Thu, 29 Nov 2012 18:50:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E6FF4A10E; Thu, 29 Nov 2012 08:50:22 +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 UpS2VIH4eynd; Thu, 29 Nov 2012 08:50:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E83A74A12B; Thu, 29 Nov 2012 08:50:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4D78D4A105 for ; Thu, 29 Nov 2012 08:49:52 +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 MumRk05uUn9c for ; Thu, 29 Nov 2012 08:49:51 +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 4DC5B4A0F4 for ; Thu, 29 Nov 2012 08:49:40 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0ME800HYJOE8XD10@mailout3.samsung.com> for u-boot@lists.denx.de; Thu, 29 Nov 2012 16:49:38 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.125]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 6F.D0.01231.29317B05; Thu, 29 Nov 2012 16:49:38 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-67-50b71392b64e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 1F.D0.01231.19317B05; Thu, 29 Nov 2012 16:49:37 +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 <0ME800LQWOECLB50@mmp2.samsung.com> for u-boot@lists.denx.de; Thu, 29 Nov 2012 16:49:37 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Thu, 29 Nov 2012 13:25:51 +0530 Message-id: <1354175752-17233-6-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1354175752-17233-1-git-send-email-rajeshwari.s@samsung.com> References: <1354175752-17233-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkVneS8PYAg8OfuSze7u1kd2D0OHtn B2MAYxSXTUpqTmZZapG+XQJXxqmP3awFdxQrlnzZzNzA2CXdxcjJISFgIrHn2QUWCFtM4sK9 9WxdjFwcQgJLGSWetU9ggima9uAoE0RiOqPEwo/TWCCcVUwSR9pa2UCq2ASMJLaenMYIYosI SEj86r8KZjMLxEi83v8DqIaDQ1jAXmLaXFaQMIuAqsTHd/fANvMKeEjs3HSbGWKZgsSxqV/B ajgFPCU+beoCs4WAajasXsMI0Ssg8W3yIRaQkRICshKbDjCDnCMhcJlNYteDXewQcyQlDq64 wTKBUXgBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjMAgPP3vmdQOxpUNFocYBTgYlXh4 N1luCxBiTSwrrsw9xCjBwawkwqv5ByjEm5JYWZValB9fVJqTWnyI0QfokonMUqLJ+cAIySuJ NzQ2MTc1NrU0MjIzNcUhrCTO2+yREiAkkJ5YkpqdmlqQWgQzjomDU6qBMdZX94pOyqf7fsZp W1+b7X38jJ1tuZ+pc+DsOlvW3EkrlkZs4zJvnTDvg5PeBR1Rz5nLGG7cMBX3WxK684joRbb8 P2GVUZ+fpYe4pd9yPFeROLWTa5dBPuP/Vbub33zv/fexb99Pf7XNZvwm04v2peSml/Rv1Ty2 xqfr6O0bwZbfF85eGFPUocRSnJFoqMVcVJwIAAiySvlvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xoO5E4e0BBt8O2li83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoxTH7tZC+4oViz5spm5 gbFLuouRk0NCwERi2oOjTBC2mMSFe+vZuhi5OIQEpjNKLPw4jQXCWcUkcaStlQ2kik3ASGLr yWmMILaIgITEr/6rYDazQIzE6/0/gGo4OIQF7CWmzWUFCbMIqEp8fHePBcTmFfCQ2LnpNjPE MgWJY1O/gtVwCnhKfNrUBWYLAdVsWL2GcQIj7wJGhlWMoqkFyQXFSem5hnrFibnFpXnpesn5 uZsYwSH+TGoH48oGi0OMAhyMSjy8myy3BQixJpYVV+YeYpTgYFYS4dX8AxTiTUmsrEotyo8v Ks1JLT7E6AN01URmKdHkfGD85ZXEGxqbmJsam1qaWJiYWeIQVhLnbfZICRASSE8sSc1OTS1I LYIZx8TBKdXAyPb87INjjG/tP/i+LU7UDnf/tvPLJdsvTyck3F8XHKMg/mTO/a1+mSvOP/94 WVDjrvNtfc6dgd/LW3+UxFqHeXq82z3p0WrZOVGifouSlD/3i16fmL/a73T7tzPqE9r/Bi37 HSS8xfLalsRY9u/Wyw9HX/N0zhETKfLflSHb0L/X9dwlQyFRLSWW4oxEQy3mouJEALmhTque AgAA X-CFilter-Loop: Reflected Cc: patches@linaro.org Subject: [U-Boot] [PATCH 5/6 V3] 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 Acked-by: Simon Glass --- Changes in V2: - New patch. Changes in V3: - Removed #ifdef CONFIG_OF_CONTROL where ever not required. drivers/sound/wm8994.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++- drivers/sound/wm8994.h | 6 +-- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index 293903a..ce79472 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -26,9 +26,11 @@ #include #include #include +#include #include #include #include +#include #include "wm8994.h" #include "wm8994_registers.h" @@ -77,6 +79,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 +750,82 @@ 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 = fdtdec_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 */ + if (get_codec_values(pcodec_info, blob) < 0) { + 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__ */