From patchwork Fri May 3 14:32: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: 16647 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 302E123905 for ; Fri, 3 May 2013 14:34:07 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 1sf3078732qee.3 for ; Fri, 03 May 2013 07:33:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received: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=w2CWCM0qJdmsKD8De3kAGpfZN1MWbUahZ1Pm4CIwZG8=; b=KoFMZmVG9tWpuFKcvX2P9zKXSvTnyFA93E7DQ0YgEEScYbxx3ALX5xzmqkJtAwvAf8 mO7dCWzvL/49jtaTjPfy4GCZEazkBAmGq37qRxGBJg/LOgyCnwyon3uEvjqF8fnDYDWT kC+rIWVzFTOniCqy2hknAPTb5xN2xgNC4IdVZ03B4sxYOKTk1Pd5PGbD/5o/CBmZj18c AenlrCDRIwfr8k/iOVkoWkZhTAnLXbjDuwvQbRuZ4bFyRbXFQlTKNvWK+ShZW85LFDaP fntnJeO84g6TxwIbiVk/gmcaHKkQWlUXrNbwCOS45I9p9Uyr4wzuaMB8/B1dW7TpVZkY 0z2A== X-Received: by 10.58.244.168 with SMTP id xh8mr1258676vec.21.1367591637435; Fri, 03 May 2013 07:33:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.4 with SMTP id 4ls1840751qei.68.gmail; Fri, 03 May 2013 07:33:57 -0700 (PDT) X-Received: by 10.221.3.2 with SMTP id nw2mr3738668vcb.55.1367591637220; Fri, 03 May 2013 07:33:57 -0700 (PDT) Received: from mail-vb0-x234.google.com (mail-vb0-x234.google.com [2607:f8b0:400c:c02::234]) by mx.google.com with ESMTPS id wl5si5154516vec.25.2013.05.03.07.33.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:33:57 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::234 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:c02::234; Received: by mail-vb0-f52.google.com with SMTP id p13so1408988vbe.11 for ; Fri, 03 May 2013 07:33:57 -0700 (PDT) X-Received: by 10.52.228.71 with SMTP id sg7mr3022705vdc.51.1367591637145; Fri, 03 May 2013 07:33:57 -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.127.98 with SMTP id nf2csp25179veb; Fri, 3 May 2013 07:33:56 -0700 (PDT) X-Received: by 10.180.13.179 with SMTP id i19mr13711647wic.18.1367591636094; Fri, 03 May 2013 07:33:56 -0700 (PDT) Received: from mail-we0-x22a.google.com (mail-we0-x22a.google.com [2a00:1450:400c:c03::22a]) by mx.google.com with ESMTPS id e4si3611677wjy.75.2013.05.03.07.33.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:33:56 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22a; Received: by mail-we0-f170.google.com with SMTP id z53so1420920wey.1 for ; Fri, 03 May 2013 07:33:55 -0700 (PDT) X-Received: by 10.180.24.69 with SMTP id s5mr40842639wif.34.1367591635643; Fri, 03 May 2013 07:33:55 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id o3sm17516019wia.2.2013.05.03.07.33.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:33:54 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones Subject: [PATCH 16/63] ARM: ux500: Remove superfluous 'psize' attribute from Audio platform data Date: Fri, 3 May 2013 15:32:02 +0100 Message-Id: <1367591569-32197-17-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> References: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlV0s8LM9hOWTC1PKYIQg6AFQc6/YR24M7vFZYCPvmzF9tdoeCQsRfBIHJ6FWJ91mvMSn/Z X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::234 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: , 'psize' is used to calculate the maximum DMA burst size. However it is only taken into consideration when editing the DMA channel's configuration. The Audio DMA platform data is only used to allocate a channel, not configure it. That will be done at a later date within the MSP driver. We're also removing comments which are no longer required, as 'data_width' is no longer set in any device's platform data period. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-audio.c | 38 ------------------------------ 1 file changed, 38 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index f012cfa..972bec0 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -23,25 +23,13 @@ static struct stedma40_chan_cfg msp0_dma_rx = { .high_priority = true, .dir = STEDMA40_PERIPH_TO_MEM, - .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, - - .src_info.psize = STEDMA40_PSIZE_LOG_4, - .dst_info.psize = STEDMA40_PSIZE_LOG_4, - - /* data_width is set during configuration */ }; static struct stedma40_chan_cfg msp0_dma_tx = { .high_priority = true, .dir = STEDMA40_MEM_TO_PERIPH, - .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, - - .src_info.psize = STEDMA40_PSIZE_LOG_4, - .dst_info.psize = STEDMA40_PSIZE_LOG_4, - - /* data_width is set during configuration */ }; struct msp_i2s_platform_data msp0_platform_data = { @@ -53,25 +41,13 @@ struct msp_i2s_platform_data msp0_platform_data = { static struct stedma40_chan_cfg msp1_dma_rx = { .high_priority = true, .dir = STEDMA40_PERIPH_TO_MEM, - .dev_type = DB8500_DMA_DEV30_MSP3, - - .src_info.psize = STEDMA40_PSIZE_LOG_4, - .dst_info.psize = STEDMA40_PSIZE_LOG_4, - - /* data_width is set during configuration */ }; static struct stedma40_chan_cfg msp1_dma_tx = { .high_priority = true, .dir = STEDMA40_MEM_TO_PERIPH, - .dev_type = DB8500_DMA_DEV30_MSP1, - - .src_info.psize = STEDMA40_PSIZE_LOG_4, - .dst_info.psize = STEDMA40_PSIZE_LOG_4, - - /* data_width is set during configuration */ }; struct msp_i2s_platform_data msp1_platform_data = { @@ -83,29 +59,15 @@ struct msp_i2s_platform_data msp1_platform_data = { static struct stedma40_chan_cfg msp2_dma_rx = { .high_priority = true, .dir = STEDMA40_PERIPH_TO_MEM, - .dev_type = DB8500_DMA_DEV14_MSP2, - - /* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */ - .src_info.psize = STEDMA40_PSIZE_LOG_1, - .dst_info.psize = STEDMA40_PSIZE_LOG_1, - - /* data_width is set during configuration */ }; static struct stedma40_chan_cfg msp2_dma_tx = { .high_priority = true, .dir = STEDMA40_MEM_TO_PERIPH, - .dev_type = DB8500_DMA_DEV14_MSP2, - - .src_info.psize = STEDMA40_PSIZE_LOG_4, - .dst_info.psize = STEDMA40_PSIZE_LOG_4, - .use_fixed_channel = true, .phy_channel = 1, - - /* data_width is set during configuration */ }; static struct platform_device *db8500_add_msp_i2s(struct device *parent,