From patchwork Fri Dec 14 11:56:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 206408 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 5141F2C008F for ; Fri, 14 Dec 2012 22:57:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 04C904A1F0; Fri, 14 Dec 2012 12:57:34 +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 VOdaJ+kWjwcW; Fri, 14 Dec 2012 12:57:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 583454A1BE; Fri, 14 Dec 2012 12:57:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D53674A1BE for ; Fri, 14 Dec 2012 12:57:30 +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 4WupAOAR60Cu for ; Fri, 14 Dec 2012 12:57:30 +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 mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTP id 4F1E94A052 for ; Fri, 14 Dec 2012 12:57:29 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MF000ANFRVR8I40@mailout4.samsung.com> for u-boot@lists.denx.de; Fri, 14 Dec 2012 20:57:28 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.124]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 85.E4.01231.7241BC05; Fri, 14 Dec 2012 20:57:28 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-7d-50cb14271224 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 45.E4.01231.7241BC05; Fri, 14 Dec 2012 20:57:27 +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 <0MF000GYFRKI4870@mmp2.samsung.com> for u-boot@lists.denx.de; Fri, 14 Dec 2012 20:57:27 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Fri, 14 Dec 2012 17:26:24 +0530 Message-id: <1355486189-432-11-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1355486189-432-1-git-send-email-rajeshwari.s@samsung.com> References: <1355486189-432-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsWyRsSkRldD5HSAwckyi7d7O9kdGD3O3tnB GMAYxWWTkpqTWZZapG+XwJXxat1NtoIjihXf17xlaWBslu5i5OSQEDCR+NzznRXCFpO4cG89 G4gtJLCUUeLEXiuYms6WrewQ8emMEmumMUHYq5gkls1xBLHZBIwktp6cxghiiwhISPzqvwpm MwvESLze/wNsprCAncTnmauZQWwWAVWJU7sWgc3kFXCXuPN4NzPELgWJY1O/gt3DCRQ/+eYe M8QuN4kVPcvYIHoFJL5NPsTSxcgBVC8rsekAVOsJNoldLxUhbEmJgytusExgFF7AyLCKUTS1 ILmgOCk911CvODG3uDQvXS85P3cTIzD4Tv97JrWDcWWDxSFGAQ5GJR7ej0KnAoRYE8uKK3MP MUpwMCuJ8EoeAQrxpiRWVqUW5ccXleakFh9i9AE6ZCKzlGhyPjAy8kriDY1NzE2NTS2NjMxM TXEIK4nzNnukBAgJpCeWpGanphakFsGMY+LglGpgzLjfXORb92zn41ZpnhSVA7a++ZP89yWz b/Oe0zkpRUYjibdi9X3Zy/kNlTwBU37EcLrOj35m9/OftRBXbwrvq4unb8yOmTOndZHLJt5p 078HVu3c0Kfpqlrd80SHkavkx6Xw+w6z4zYUOfDt6T6ifOLP3zyJrHedFQ9UNmkYP1i5hHvf P00GJZbijERDLeai4kQAcWQiH2sCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoK66yOkAg5VnDC3e7u1kd2D0OHtn B2MAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8ardTfZCo4oVnxf85al gbFZuouRk0NCwESis2UrO4QtJnHh3no2EFtIYDqjxJppTBD2KiaJZXMcQWw2ASOJrSenMYLY IgISEr/6r4LZzAIxEq/3/wDrFRawk/g8czUziM0ioCpxatcisPm8Au4Sdx7vZobYpSBxbOpX VhCbEyh+8s09ZohdbhIrepaxTWDkXcDIsIpRNLUguaA4KT3XUK84Mbe4NC9dLzk/dxMjOMCf Se1gXNlgcYhRgINRiYf3o9CpACHWxLLiytxDjBIczEoivJJHgEK8KYmVValF+fFFpTmpxYcY fYCumsgsJZqcD4y+vJJ4Q2MTc1NjU0sTCxMzSxzCSuK8zR4pAUIC6YklqdmpqQWpRTDjmDg4 pRoYTRa9+l9Z/d15bZjmmw8fOy/WHdSv8jUq8r4vqrbu6ds866/RXYuMHSaVMZ7S3FBjc6Eo 8UvU+qeRv2/xlJfPVZI0n+N9o1F1unjknePKU4rXl+hwzk6YHWdSv9q/NLVN807ilPUuB3+r lyUwtMqFljlW7UzN2RIeoHv1n/3M55yJKnVLu2qVWIozEg21mIuKEwFO5pDXnQIAAA== X-CFilter-Loop: Reflected Cc: patches@linaro.org Subject: [U-Boot] [PATCH 11/16] 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 V1: -Rebased on latest u-boot-samsung 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..a528502 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__ */