From patchwork Wed Jun 12 07:57:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 17813 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C48923903 for ; Wed, 12 Jun 2013 07:58:22 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id fe20sf9012639lab.2 for ; Wed, 12 Jun 2013 00:58:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=QCGkPrbgifL06+MQkSBhOlEDYJVvGrNJuL118pWIk8A=; b=FEDYS0aL+dsT/lu6ZNjYh8Yh9/Xw1QGHjU8POMJYRANN5Pt4koEloj8+IJ896Xwi+m 5TlIlc4JzOBruvOeY+2zfNCTlQbEWZvsPL9zNjvAN096Yt9auoyqwoOJDKk1i/7coBoV eITg/DbSZ8llZupS9l+mrXrC5511jIyaf1Na5xxz+MGG91SdbFufA/jSNQNLCYwkJe6N 3MHTdvMm/2AhAVNykV/tNj0n5i0I1stsPyg+1RrzPFm3F+CuKY4UlhEp8TOlzAyNyZi1 3HW9wuDaBvMjZ+q3wd6ddmU/1dcL3uZAhR9enbOxe6TchSDEYFv/F3Z1gJLAg3Hzo9Xq iuOg== X-Received: by 10.180.37.229 with SMTP id b5mr3258428wik.4.1371023900575; Wed, 12 Jun 2013 00:58:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.11.66 with SMTP id o2ls58415wib.43.canary; Wed, 12 Jun 2013 00:58:20 -0700 (PDT) X-Received: by 10.194.110.73 with SMTP id hy9mr10846227wjb.95.1371023900345; Wed, 12 Jun 2013 00:58:20 -0700 (PDT) Received: from mail-ve0-x22e.google.com (mail-ve0-x22e.google.com [2607:f8b0:400c:c01::22e]) by mx.google.com with ESMTPS id gr4si6402426wib.63.2013.06.12.00.58.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Jun 2013 00:58:20 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22e; Received: by mail-ve0-f174.google.com with SMTP id oz10so6364576veb.19 for ; Wed, 12 Jun 2013 00:58:19 -0700 (PDT) X-Received: by 10.58.251.144 with SMTP id zk16mr1641074vec.37.1371023899272; Wed, 12 Jun 2013 00:58:19 -0700 (PDT) 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.58.191.99 with SMTP id gx3csp134431vec; Wed, 12 Jun 2013 00:58:18 -0700 (PDT) X-Received: by 10.14.1.136 with SMTP id 8mr18002785eed.106.1371023898225; Wed, 12 Jun 2013 00:58:18 -0700 (PDT) Received: from mail-ee0-x236.google.com (mail-ee0-x236.google.com [2a00:1450:4013:c00::236]) by mx.google.com with ESMTPS id 8si14153427eeg.286.2013.06.12.00.58.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Jun 2013 00:58:18 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4013:c00::236 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:4013:c00::236; Received: by mail-ee0-f54.google.com with SMTP id t10so3988070eei.41 for ; Wed, 12 Jun 2013 00:58:17 -0700 (PDT) X-Received: by 10.14.89.66 with SMTP id b42mr20313410eef.89.1371023897698; Wed, 12 Jun 2013 00:58:17 -0700 (PDT) Received: from localhost ([2a01:2003:1:1e74:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id c5sm35111772eeu.8.2013.06.12.00.58.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Jun 2013 00:58:17 -0700 (PDT) From: Fabio Baltieri To: Mark Brown Cc: Liam Girdwood , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Ola Lilja , Fabio Baltieri Subject: [PATCH 2/3] ASoC: ux500: Set DMA address during device init Date: Wed, 12 Jun 2013 09:57:58 +0200 Message-Id: <1371023879-21884-3-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1371023879-21884-1-git-send-email-fabio.baltieri@linaro.org> References: <1371023879-21884-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQlzYjB/cal/pbSCJVXMApuPAW7dDDU2+Ld2hGrvl6AnTUJLlgA1QxCB++t8P6erAERK9dcH X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22e 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: , Add a field with the tx/rx register address to the DMA parameters structure, and set it to the correct address during device initialization. This address used to be hardcoded in the DMA controller driver, it now needs to be explicitly figured out by the device driver. Signed-off-by: Fabio Baltieri --- sound/soc/ux500/ux500_msp_i2s.c | 3 +++ sound/soc/ux500/ux500_msp_i2s.h | 1 + 2 files changed, 4 insertions(+) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 14a4a5b..1ca8b08 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -685,6 +685,9 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, return -ENOMEM; } + msp->playback_dma_data.tx_rx_addr = res->start + MSP_DR; + msp->capture_dma_data.tx_rx_addr = res->start + MSP_DR; + msp->registers = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (msp->registers == NULL) { diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 8796171..258d0bc 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -470,6 +470,7 @@ struct ux500_msp_config { struct ux500_msp_dma_params { unsigned int data_size; + dma_addr_t tx_rx_addr; struct stedma40_chan_cfg *dma_cfg; };