From patchwork Mon Dec 2 18:00:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 21938 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f70.google.com (mail-pb0-f70.google.com [209.85.160.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BF66320299 for ; Mon, 2 Dec 2013 18:00:31 +0000 (UTC) Received: by mail-pb0-f70.google.com with SMTP id rq2sf35787566pbb.1 for ; Mon, 02 Dec 2013 10:00:30 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=eOltvOFVtJJzc3xQ6yPLNKgE2nv+cmZ1LB8VwvhvhyQ=; b=C5arlUzKe6JIJgDyC1QtFGrYF6v/rMvvZkJBIJSi5Z3Z/ZKMCsAyUYCC1J1Qz/xuCo t7fJ9nKncCLXqx4vtMdhbd6aQaXX6p03fz7/xKk1PsjwpNJFEB7x7J552AjVq1Oyycqd 0B+H8UFey5VQFg2oO3NX2rgbLKKLBREKhc4sZgUt5x5XxXf1vixKLD0zEkxEW3z+U2R4 lIx3SG9vUz5hcPqdMm3fhQFCpoPl3QkibBNW1w2D1FMuHZL3zr4E6QjsEFLwD2zmY3/6 WEVi9FrlF9SgzJDlof+l2KSICw+4hyR+Jlz5Q7BImVKXT96llYTRTI5N+JQhlLB8Gaw9 0FzQ== X-Gm-Message-State: ALoCoQkqe45Y5BgTTLIUSmJRznBQhQbWkcT5X+9iftubBQavE2cICpuEvIjeTeo5TRuE3qgndTjJ X-Received: by 10.68.91.226 with SMTP id ch2mr10804309pbb.1.1386007230359; Mon, 02 Dec 2013 10:00:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.81.193 with SMTP id c1ls910096qey.43.gmail; Mon, 02 Dec 2013 10:00:30 -0800 (PST) X-Received: by 10.52.230.102 with SMTP id sx6mr44712424vdc.15.1386007230162; Mon, 02 Dec 2013 10:00:30 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id v5si29976648ves.80.2013.12.02.10.00.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 10:00:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 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.51; Received: by mail-vb0-f51.google.com with SMTP id m10so8909066vbh.10 for ; Mon, 02 Dec 2013 10:00:30 -0800 (PST) X-Received: by 10.220.183.199 with SMTP id ch7mr2264149vcb.27.1386007230017; Mon, 02 Dec 2013 10:00:30 -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.220.174.196 with SMTP id u4csp143006vcz; Mon, 2 Dec 2013 10:00:29 -0800 (PST) X-Received: by 10.43.129.130 with SMTP id hi2mr43389741icc.14.1386007229451; Mon, 02 Dec 2013 10:00:29 -0800 (PST) Received: from mail-ie0-f169.google.com (mail-ie0-f169.google.com [209.85.223.169]) by mx.google.com with ESMTPS id ku5si50103460igb.3.2013.12.02.10.00.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 10:00:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.169 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.223.169; Received: by mail-ie0-f169.google.com with SMTP id e14so22096459iej.28 for ; Mon, 02 Dec 2013 10:00:29 -0800 (PST) X-Received: by 10.43.16.2 with SMTP id pw2mr2812928icb.56.1386007229006; Mon, 02 Dec 2013 10:00:29 -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 p5sm67718324igj.10.2013.12.02.10.00.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 10:00:28 -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, Lee Jones , alsa-devel@alsa-project.org Subject: [PATCH 1/3] ASoC: ux500_pcm: Stop pretending that we support varying address widths Date: Mon, 2 Dec 2013 18:00:20 +0000 Message-Id: <1386007222-10081-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 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.51 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. Cc: alsa-devel@alsa-project.org Signed-off-by: Lee Jones --- sound/soc/ux500/ux500_pcm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 6162f70..2f1bdb7 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -104,26 +104,25 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream, struct dma_slave_config *slave_config) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct ux500_msp_dma_params *dma_params; - struct stedma40_chan_cfg *dma_cfg; + struct snd_dmaengine_dai_dma_data *dma_params; 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; + slave_config->dst_addr = dma_params->addr; else - slave_config->src_addr = dma_params->tx_rx_addr; + slave_config->src_addr = dma_params->addr; return 0; }