From patchwork Fri Sep 7 11:14:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11236 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 460EE23FAA for ; Fri, 7 Sep 2012 11:15:22 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id D4B2DA18DB7 for ; Fri, 7 Sep 2012 11:15:21 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so4488374iea.11 for ; Fri, 07 Sep 2012 04:15:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=2jg5cLG1zxDIS5JYfKUyfiQxlRO9/jXC0Yw5icHfn+g=; b=mox8wiPPLaQ8XI2zFN+Kc+IAot8aRppbvBLqnnHu75tANZORneJY/h5O7Lvuvuk1ui t+6pvVVilMcMZjicga7zfkxTagdlOeZlPWS6+pPxvDcNDaxcm+C9g+gQtBpenTYLJ0qq JwBdxOuMLT2Mp87scOzWLV6bh2oUbXGczggL2ZYczvy6DvVlUqExnd/D0r+CRZpe/MeJ 2DwdQXmpiqJkH+GV04MMBb329R4Mgvb8fglMvK00YB3Y7QAxt+VjBMJDydj55MqCodfe QoyVyILOtasIrx8N7m+zIA+iKWZZurwu/ZpdrrAW9O6ar7OGO3mRbjWv71sfj/rKmY+O vwkA== Received: by 10.42.84.69 with SMTP id k5mr6585479icl.5.1347016521648; Fri, 07 Sep 2012 04:15:21 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp373417igc; Fri, 7 Sep 2012 04:15:20 -0700 (PDT) Received: by 10.216.131.204 with SMTP id m54mr2880281wei.93.1347016520056; Fri, 07 Sep 2012 04:15:20 -0700 (PDT) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by mx.google.com with ESMTPS id bd3si12701755wib.22.2012.09.07.04.15.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 04:15:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.170; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f170.google.com with SMTP id hq12so455143wib.1 for ; Fri, 07 Sep 2012 04:15:19 -0700 (PDT) Received: by 10.180.24.4 with SMTP id q4mr52433992wif.19.1347016519564; Fri, 07 Sep 2012 04:15:19 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id k20sm9151505wiv.11.2012.09.07.04.15.18 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 04:15:19 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones Subject: [PATCH 03/19] ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI Date: Fri, 7 Sep 2012 12:14:43 +0100 Message-Id: <1347016499-29354-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> References: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnCZoE727A1qqJYWbnFLnQ3cD2SVdxlikELzJgW42nQ/tPnLqQHtt2yDFWzSj1ib9UuWEPK There are four SDIs on the HREF, as opposed to the original two enabled on Snowball. To get them working we have to pass their DMA information in the same was as we need with the other two. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-sdi.c | 4 ++-- arch/arm/mach-ux500/board-mop500.c | 2 ++ arch/arm/mach-ux500/board-mop500.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 18ff781..9c8e4a9 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -152,7 +152,7 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = { }; #endif -static struct mmci_platform_data mop500_sdi1_data = { +struct mmci_platform_data mop500_sdi1_data = { .ocr_mask = MMC_VDD_29_30, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA, @@ -189,7 +189,7 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = { }; #endif -static struct mmci_platform_data mop500_sdi2_data = { +struct mmci_platform_data mop500_sdi2_data = { .ocr_mask = MMC_VDD_165_195, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 9d2d08e..9575150 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -754,6 +754,8 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires DMA bindings. */ OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0", &ssp0_plat), OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", &mop500_sdi0_data), + OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data), + OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", &mop500_sdi2_data), OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", &mop500_sdi4_data), /* Requires clock name bindings. */ OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL), diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index a0f920d..1f86387 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -81,6 +81,8 @@ struct device; struct i2c_board_info; extern struct mmci_platform_data mop500_sdi0_data; +extern struct mmci_platform_data mop500_sdi1_data; +extern struct mmci_platform_data mop500_sdi2_data; extern struct mmci_platform_data mop500_sdi4_data; extern struct msp_i2s_platform_data msp0_platform_data; extern struct msp_i2s_platform_data msp1_platform_data;