From patchwork Wed Nov 28 06:10:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Shinde X-Patchwork-Id: 13261 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3A03423E08 for ; Wed, 28 Nov 2012 06:04:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id E1E9DA1854A for ; Wed, 28 Nov 2012 06:04:14 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so7678022ieb.11 for ; Tue, 27 Nov 2012 22:04:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :dlp-filter:x-mtr:x-brightmail-tracker:x-brightmail-tracker :x-cfilter-loop:x-gm-message-state; bh=c8jTUNrr7zsZ+cRJ+iHS6wOgvlefOlgB+ds9EwSGmu0=; b=goeyzRqwV98kWTW28KAsfABBnvHE/rcePIWqWkG18T25MiWnrvERge+wDLQPWmUk2g Pcpsf+r2T7RUSZXBRic8BZHtedo40vGxqqlWT3Oma9DJMkH03F5fBWHxAwglHc17T3Q/ BFFo1wmxJgI6w4HMKkplbw6GYcuVP1U/q6oWLIk0WVwPt2hfn97n+XcHobQNUh7Cnu1z B17vL3uYtBYio/6gHn0wfuEZ1I+DWY91nuFAHNAJ7TLJXTlnp1tYzkRfQ4PDO4wgi2T1 z6Ay1xwBBEMmYRvjNURX3sMcBX2Fdv8qj9lHqoJ7tC8c3OY1bXn7J6utAlik8bV62Zoa FTAQ== Received: by 10.50.213.34 with SMTP id np2mr17892952igc.57.1354082654647; Tue, 27 Nov 2012 22:04:14 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp594682igt; Tue, 27 Nov 2012 22:04:14 -0800 (PST) Received: by 10.66.84.132 with SMTP id z4mr49432635pay.63.1354082653907; Tue, 27 Nov 2012 22:04:13 -0800 (PST) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id qu6si27625760pbc.195.2012.11.27.22.04.13; Tue, 27 Nov 2012 22:04:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.33 as permitted sender) client-ip=203.254.224.33; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.33 as permitted sender) smtp.mail=rajeshwari.s@samsung.com 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>; Wed, 28 Nov 2012 15:03:54 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 98.E4.12699.A49A5B05; Wed, 28 Nov 2012 15:03:54 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-4d-50b5a94a4bec Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 08.E4.12699.949A5B05; Wed, 28 Nov 2012 15:03: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 <0ME600J1EOU4G930@mmp2.samsung.com>; Wed, 28 Nov 2012 15:03:53 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Cc: patches@linaro.org, sjg@chromium.org, mk7.kang@samsung.com, chander.kashyap@linaro.org Subject: [PATCH 5/7 V2] Sound: Add FDT support to driver Date: Wed, 28 Nov 2012 11:40:11 +0530 Message-id: <1354083013-5213-6-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+NgFrrHLMWRmVeSWpSXmKPExsWyRsSkTtdr5dYAg7nTRC0err/JYjHl8BcW ByaPO9f2sAUwRnHZpKTmZJalFunbJXBlNLzqYitosat4d92hgfGoYRcjB4eEgInEjk6lLkZO IFNM4sK99WxdjFwcQgJLGSUedf5ihEiYSEy7fJ0FIjGdUaJ7zm4mCGcik8TX16fYQarYBIwk tp6cBtYhIiAh8av/KpjNLBAj8Xr/DzYQW1jAQmLJfZAVHBwsAqoS6+fZg4R5Bdwluhb8YYVY piBxbOpXMJtTwEPiXu8isPFCQDUrmkH2cgK1Ckh8m3yIBeIBWYlNB5ghWq+zSXy45AphS0oc XHGDZQKj8AJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYgYF4+t8z6R2MqxosDjEKcDAq 8fA6OG4NEGJNLCuuzD3EKMHBrCTCy9MGFOJNSaysSi3Kjy8qzUktPsToA3TIRGYp0eR8YJTk lcQbGpuYmxqbWhoZmZma4hBWEudt9kgJEBJITyxJzU5NLUgtghnHxMEp1cDoYab39KrXjOi2 A5fPTOqZ8KoqWSPm9KcasXNLThypjDnXbWGcF7hhWZrAVwsmxyAz7qTS4NAX2RpdYruivjbN Ev67wKgkNqtujfSLiRmPpTbMLNSS2nmu6ciqGFtpo4eq1cvrLxkpfPvZ19/fVB54X7h63hqX l7oHIr7mixy7mta+csbj68VKLMUZiYZazEXFiQAOj2fMcQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42I5/e+xoK7Xyq0BBlsPs1o8XH+TxWLK4S8s Dkwed67tYQtgjGpgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLx CdB1y8wBmq2kUJaYUwoUCkgsLlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxhzGh41cVW0GJX 8e66QwPjUcMuRk4OCQETiWmXr7NA2GISF+6tZ+ti5OIQEpjOKNE9ZzcThDORSeLr61PsIFVs AkYSW09OYwSxRQQkJH71XwWzmQViJF7v/8EGYgsLWEgsuQ8yiYODRUBVYv08e5Awr4C7RNeC P6wQyxQkjk39CmZzCnhI3OtdBDZeCKhmRfNupgmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al 6yXn525iBIf6M+kdjKsaLA4xCnAwKvHwOjhuDRBiTSwrrsw9xCjBwawkwsvTBhTiTUmsrEot yo8vKs1JLT7E6AN01ERmKdHkfGAc5pXEGxqbmJsam1qaWJiYWeIQVhLnbfZICRASSE8sSc1O TS1ILYIZx8TBKdXAGLkpwzWGZ0+e/Z/So+oeMzY98Aucd4J336MDGyOMDIzmO2iqNittK19u fblboHPu+agPJj9/lJiphX6rO37gBPNu99TrSjeCvr6J/MCt7nKCYdKrB5e5uH54z9T4m/F4 b7Ty1cWhPQdaYhpjpwrmNJRybXPbl5Ue2L3D8NJpjbcFglZXjv57psRSnJFoqMVcVJwIAFcg M+eiAgAA X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQl5V98QA8n19uGTJHSSIcMxy896opW/1kX9GNPT83h7y8RY0rUV3Fqkmvp8Imd+V3UCYLPc This patch adds FDT support to the sound driver. Signed-off-by: Rajeshwari Shinde --- Changes in V2: - Made single function to get i2s values,codec init and sount init in both FDT and non FDT support case. drivers/sound/sound.c | 179 +++++++++++++++++++++++++++++------------------- include/sound.h | 4 +- 2 files changed, 110 insertions(+), 73 deletions(-) diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c index 4c74534..bc87a9b 100644 --- a/drivers/sound/sound.c +++ b/drivers/sound/sound.c @@ -28,108 +28,160 @@ #include #include #include "wm8994.h" +#ifdef CONFIG_OF_CONTROL +#include +#include +#else #include +#endif /* defines */ #define SOUND_400_HZ 400 #define SOUND_BITS_IN_BYTE 8 static struct i2stx_info g_i2stx_pri; -static struct sound_codec_info g_codec_info; /* - * get_sound_fdt_values gets fdt values for i2s parameters + * get_sound_i2s_values gets values for i2s parameters * * @param i2stx_info i2s transmitter transfer param structure - * @param blob FDT blob + * @param blob FDT blob if enabled else NULL */ -static void get_sound_i2s_values(struct i2stx_info *i2s) -{ - i2s->base_address = samsung_get_base_i2s(); - i2s->audio_pll_clk = I2S_PLL_CLK; - i2s->samplingrate = I2S_SAMPLING_RATE; - i2s->bitspersample = I2S_BITS_PER_SAMPLE; - i2s->channels = I2S_CHANNELS; - i2s->rfs = I2S_RFS; - i2s->bfs = I2S_BFS; -} - -/* - * 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_sound_wm8994_values(struct sound_codec_info *pcodec_info) +static int get_sound_i2s_values(struct i2stx_info *i2s, const void *blob) { +#ifdef CONFIG_OF_CONTROL + int node; int error = 0; + int base; - switch (AUDIO_COMPAT) { - case AUDIO_COMPAT_SPI: - debug("%s: Support not added for SPI interface\n", __func__); + node = fdtdec_next_compatible(blob, 0, + COMPAT_SAMSUNG_EXYNOS5_SOUND); + if (node <= 0) { + debug("EXYNOS_SOUND: No node for sound in device tree\n"); return -1; - break; - case AUDIO_COMPAT_I2C: - 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); - break; - default: - debug("%s: Unknown compat id %d\n", __func__, AUDIO_COMPAT); + } + + /* + * Get the pre-defined sound specific values from FDT. + * All of these are expected to be correct otherwise + * wrong register values in i2s setup parameters + * may result in no sound play. + */ + base = fdtdec_get_addr(blob, node, "reg"); + if (base == FDT_ADDR_T_NONE) { + debug("%s: Missing i2s base\n", __func__); return -1; } + i2s->base_address = base; + i2s->audio_pll_clk = fdtdec_get_int(blob, + node, "samsung,i2s-epll-clock-frequency", -1); + error |= i2s->audio_pll_clk; + debug("audio_pll_clk = %d\n", i2s->audio_pll_clk); + i2s->samplingrate = fdtdec_get_int(blob, + node, "samsung,i2s-sampling-rate", -1); + error |= i2s->samplingrate; + debug("samplingrate = %d\n", i2s->samplingrate); + i2s->bitspersample = fdtdec_get_int(blob, + node, "samsung,i2s-bits-per-sample", -1); + error |= i2s->bitspersample; + debug("bitspersample = %d\n", i2s->bitspersample); + i2s->channels = fdtdec_get_int(blob, + node, "samsung,i2s-channels", -1); + error |= i2s->channels; + debug("channels = %d\n", i2s->channels); + i2s->rfs = fdtdec_get_int(blob, + node, "samsung,i2s-lr-clk-framesize", -1); + error |= i2s->rfs; + debug("rfs = %d\n", i2s->rfs); + i2s->bfs = fdtdec_get_int(blob, + node, "samsung,i2s-bit-clk-framesize", -1); + error |= i2s->bfs; + debug("bfs = %d\n", i2s->bfs); if (error == -1) { - debug("fail to get wm8994 codec node properties\n"); + debug("fail to get sound i2s node properties\n"); return -1; } - +#else + i2s->base_address = samsung_get_base_i2s(); + i2s->audio_pll_clk = I2S_PLL_CLK; + i2s->samplingrate = I2S_SAMPLING_RATE; + i2s->bitspersample = I2S_BITS_PER_SAMPLE; + i2s->channels = I2S_CHANNELS; + i2s->rfs = I2S_RFS; + i2s->bfs = I2S_BFS; +#endif return 0; } /* - * Gets fdt values for codec config parameters + * Init codec * - * @param pcodec_info codec information structure - * @param blob FDT blob - * @return int value, 0 for success + * @param blob FDT blob + * @param pi2s_tx i2s parameters required by codec + * @return int value, 0 for success */ -static int get_sound_codec_values(struct sound_codec_info *pcodec_info) +static int codec_init(const void *blob, struct i2stx_info *pi2s_tx) { - int error = 0; + int ret; const char *codectype; +#ifdef CONFIG_OF_CONTROL + int node; - codectype = AUDIO_CODEC; + /* Get the node from FDT for sound */ + node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS5_SOUND); + if (node <= 0) { + debug("EXYNOS_SOUND: No node for sound in device tree\n"); + debug("node = %d\n", node); + return -1; + } + /* + * Get the pre-defined sound codec specific values from FDT. + * All of these are expected to be correct otherwise sound + * can not be played + */ + codectype = fdt_getprop(blob, node, "samsung,codec-type", NULL); + debug("device = %s\n", codectype); +#else + codectype = AUDIO_CODEC; +#endif if (!strcmp(codectype, "wm8994")) { - pcodec_info->codec_type = CODEC_WM_8994; - error = get_sound_wm8994_values(pcodec_info); + /* 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); } else { - error = -1; + debug("%s: Unknown code type %s\n", __func__, + codectype); + return -1; } - - if (error == -1) { - debug("fail to get sound codec node properties\n"); + if (ret) { + debug("%s: Codec init failed\n", __func__); return -1; } return 0; } -int sound_init(void) +int sound_init(const void *blob) { int ret; struct i2stx_info *pi2s_tx = &g_i2stx_pri; - struct sound_codec_info *pcodec_info = &g_codec_info; +#ifdef CONFIG_OF_CONTROL /* Get the I2S Values */ - get_sound_i2s_values(pi2s_tx); - - /* Get the codec Values */ - if (get_sound_codec_values(pcodec_info) < 0) + if (get_sound_i2s_values(pi2s_tx, blob) < 0) { + debug(" FDT I2S values failed\n"); return -1; - + } + codec_init(blob, pi2s_tx); +#else + /* Get the I2S Values */ + get_sound_i2s_values(pi2s_tx, NULL); + codec_init(NULL, pi2s_tx); +#endif ret = i2s_tx_init(pi2s_tx); if (ret) { debug("%s: Failed to init i2c transmit: ret=%d\n", __func__, @@ -137,21 +189,6 @@ int sound_init(void) return ret; } - /* Check the codec type and initialise the same */ - if (pcodec_info->codec_type == CODEC_WM_8994) { - ret = wm8994_init(pcodec_info, WM8994_AIF2, - pi2s_tx->samplingrate, - (pi2s_tx->samplingrate * (pi2s_tx->rfs)), - pi2s_tx->bitspersample, pi2s_tx->channels); - } else { - debug("%s: Unknown code type %d\n", __func__, - pcodec_info->codec_type); - return -1; - } - if (ret) { - debug("%s: Codec init failed\n", __func__); - return -1; - } return ret; } diff --git a/include/sound.h b/include/sound.h index ea0b115..a9cbeed 100644 --- a/include/sound.h +++ b/include/sound.h @@ -46,10 +46,10 @@ struct sound_codec_info { /* * Initialises audio sub system - * + * @param blob Pointer of device tree node. * @return int value 0 for success, -1 for error */ -int sound_init(void); +int sound_init(const void *blob); /* * plays the pcm data buffer in pcm_data.h through i2s1 to make the