From patchwork Thu Apr 18 10:12:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16216 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f70.google.com (mail-qe0-f70.google.com [209.85.128.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D0DB623974 for ; Thu, 18 Apr 2013 10:14:01 +0000 (UTC) Received: by mail-qe0-f70.google.com with SMTP id 1sf4775345qec.1 for ; Thu, 18 Apr 2013 03:13:24 -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=FqzzVBtiPYkw8rKx2nt8X+w3+JpQwvvB2cejsHeaYC0=; b=I0HLKuIPjeorE4fB8z3QDaVjZlRVe1zXfJN6GTZt1d0QTzsujwCEO1u/CyUuDbPMO6 28pKIMF7EyCQQirylELjLdCFi1TMxJdf6TWniOYX0dkVQxNInoX51JCEX5Rpu+VX3PX1 /ZEWDF+AWiguuCchvBaYpLEcXRjxJxB85l33FjqZaLT3hPZJ9s4wOeKpWqZXPTWSFh7/ ZJ1pablm0Q02g2buUy7/EtWU+cfpHL3zZc1BmwS05SLzM9/WITG412ABoGXaf/lGujvy q71bwqPbVNdGYgtQQg48IUVHHI4PJ5xvRgCBB6/sEyKlzjkBaAs/AZFQ+zmCR7SPUdPu ZFEw== X-Received: by 10.224.58.77 with SMTP id f13mr7561889qah.7.1366280004925; Thu, 18 Apr 2013 03:13:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.133.137 with SMTP id pc9ls863573qeb.48.gmail; Thu, 18 Apr 2013 03:13:24 -0700 (PDT) X-Received: by 10.52.16.48 with SMTP id c16mr6535142vdd.41.1366280004737; Thu, 18 Apr 2013 03:13:24 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id q5si6231502vcw.61.2013.04.18.03.13.24 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id m16so2233088vca.25 for ; Thu, 18 Apr 2013 03:13:24 -0700 (PDT) X-Received: by 10.220.175.3 with SMTP id v3mr7636648vcz.8.1366280004502; Thu, 18 Apr 2013 03:13:24 -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 nf2csp115775veb; Thu, 18 Apr 2013 03:13:23 -0700 (PDT) X-Received: by 10.180.87.170 with SMTP id az10mr7839816wib.3.1366280003515; Thu, 18 Apr 2013 03:13:23 -0700 (PDT) Received: from mail-we0-x230.google.com (mail-we0-x230.google.com [2a00:1450:400c:c03::230]) by mx.google.com with ESMTPS id bc3si3429669wjc.158.2013.04.18.03.13.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:23 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::230 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::230; Received: by mail-we0-f176.google.com with SMTP id s43so2152623wey.35 for ; Thu, 18 Apr 2013 03:13:23 -0700 (PDT) X-Received: by 10.194.240.202 with SMTP id wc10mr17402865wjc.51.1366280003130; Thu, 18 Apr 2013 03:13:23 -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 ESMTPS id t7sm30483773wij.2.2013.04.18.03.13.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:22 -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, Lee Jones Subject: [PATCH 28/32] ARM: ux500: Pass remnant platform data though to DMA40 driver Date: Thu, 18 Apr 2013 11:12:10 +0100 Message-Id: <1366279934-30761-29-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> References: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkgyN4dM8Tm+zaAcMA8yxa7GA33n7wupXAZghY4tg/uSQVw/42FK+MEPstzCz638wLEjLYa X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 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: , Ironically, in order to remove lots of the auxdata assignments, we have to add just one more. A lot of them require DMA information to be passed into clients for DMA channel allocation, but we now have this capability in Device Tree. However, the DMA40 driver still relies on a reverse table look-up to obtain DMA addresses. Until all of the clients are converted, over to the new API, we're stuck with this. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.h | 1 + arch/arm/mach-ux500/cpu-db8500.c | 3 +++ arch/arm/mach-ux500/devices-db8500.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index d38951b..2c5139d 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -93,6 +93,7 @@ extern struct amba_pl011_data uart0_plat; extern struct amba_pl011_data uart1_plat; extern struct amba_pl011_data uart2_plat; extern struct pl022_ssp_controller ssp0_plat; +extern struct stedma40_platform_data dma40_plat_data; extern void mop500_sdi_init(struct device *parent); extern void snowball_sdi_init(struct device *parent); diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index eae3e3a..b216233 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -273,6 +273,9 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { "ux500-msp-i2s.2", &msp2_platform_data), OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, "ux500-msp-i2s.3", &msp3_platform_data), + /* Requires clock name bindings and channel address lookup table. */ + OF_DEV_AUXDATA("stericsson,db8500-dma40", 0x801C0000, + "dma40.0", &dma40_plat_data), {}, }; diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 2fcb8c2..3e4993e 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -120,7 +120,7 @@ static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = { [DB8500_DMA_DEV48_CAC1] = U8500_CRYP1_BASE + CRYP1_RX_REG_OFFSET, }; -static struct stedma40_platform_data dma40_plat_data = { +struct stedma40_platform_data dma40_plat_data = { .dev_rx = dma40_rx_map, .dev_tx = dma40_tx_map, .disabled_channels = {-1},