From patchwork Thu Dec 19 15:55:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 22643 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2332423FCA for ; Thu, 19 Dec 2013 15:55:39 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id l109sf1425051yhq.9 for ; Thu, 19 Dec 2013 07:55:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=lPJab+bYEkTeDibsPRDTaFB010BhANEXK+WTFVI9GfE=; b=nCPqQYeCmhXX/zJWbrhUgI+RNrrKLn///LoeoWMWZwNn+K+nsJ4U5UTXn2FY8oYuGU emkAiqVPM93kEOlWZEXFmScqEVuqJ4ji8T6Si3rHUUcumgTZuVIANnC6JxNAMPC6zWkG mURjhu7iWwoUmu7XlAzAfg2uxsLJAMrlIQShZTkeWtqOaQ9N7KrFdklnDMa8bXNBNGk9 WxV4x4d60Tyl+7Vyt80qbGrRzQNkn1ympfbUQkfKCYYzWHkmUYP4m/sRjI6u6kUN1n4j qZy8T+n1L8E/WibDw4Zu5saG1z5iI35UNLz0O4m5k5KAl7048+fTiI8+buxLK/b3AwDJ k4HA== X-Gm-Message-State: ALoCoQlP8nXlAYUmfBDPEmktK+7M7NAzQgKYvawfgbDjKkDOYOKmK7ygZPBjtvPYGxcEQi1Tf2Mb X-Received: by 10.58.37.3 with SMTP id u3mr1127370vej.6.1387468538306; Thu, 19 Dec 2013 07:55:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.106.102 with SMTP id gt6ls394348qeb.78.gmail; Thu, 19 Dec 2013 07:55:38 -0800 (PST) X-Received: by 10.52.88.80 with SMTP id be16mr724975vdb.4.1387468538163; Thu, 19 Dec 2013 07:55:38 -0800 (PST) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id a6si774075vdp.117.2013.12.19.07.55.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 07:55:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id o19so769162vbm.12 for ; Thu, 19 Dec 2013 07:55:38 -0800 (PST) X-Received: by 10.58.235.129 with SMTP id um1mr1391541vec.17.1387468538078; Thu, 19 Dec 2013 07:55:38 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp331346ved; Thu, 19 Dec 2013 07:55:37 -0800 (PST) X-Received: by 10.180.188.169 with SMTP id gb9mr3042446wic.41.1387468536935; Thu, 19 Dec 2013 07:55:36 -0800 (PST) Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by mx.google.com with ESMTPS id li4si1889080wic.41.2013.12.19.07.55.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 07:55:36 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.170; Received: by mail-we0-f170.google.com with SMTP id w61so1282252wes.1 for ; Thu, 19 Dec 2013 07:55:35 -0800 (PST) X-Received: by 10.180.126.9 with SMTP id mu9mr3520531wib.14.1387468535764; Thu, 19 Dec 2013 07:55:35 -0800 (PST) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginm.net. [92.233.57.238]) by mx.google.com with ESMTPSA id ko3sm279236wjb.23.2013.12.19.07.55.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 07:55:34 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, broonie@kernel.org, alsa-devel@alsa-project.org, Lee Jones Subject: [PATCH 05/11] ASoC: ux500_pcm: Stop pretending that we support varying address widths Date: Thu, 19 Dec 2013 15:55:02 +0000 Message-Id: <1387468508-12286-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1387468508-12286-1-git-send-email-lee.jones@linaro.org> References: <1387468508-12286-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The Slave Config's addr_width attribute is populated by data_width of dma_cfg, which in turn is derived from dma_params' data_size attribute and that comes from the slot_width which is always 16 bits (2 Bytes). We're cutting out the middle man here and just setting the DMA Slave Config directly. Signed-off-by: Lee Jones --- sound/soc/ux500/ux500_pcm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index ce554de..32d4572 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -109,20 +109,19 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct ux500_msp_dma_params *dma_params; - struct stedma40_chan_cfg *dma_cfg; int ret; dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); - dma_cfg = dma_params->dma_cfg; ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config); if (ret) return ret; slave_config->dst_maxburst = 4; - slave_config->dst_addr_width = dma_cfg->dst_info.data_width; slave_config->src_maxburst = 4; - slave_config->src_addr_width = dma_cfg->src_info.data_width; + + slave_config->src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; + slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) slave_config->dst_addr = dma_params->tx_rx_addr;