From patchwork Thu Sep 20 12:12:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11552 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 428541B4E37 for ; Thu, 20 Sep 2012 12:13:32 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id BF877A1917C for ; Thu, 20 Sep 2012 12:13:31 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so1561861iaf.11 for ; Thu, 20 Sep 2012 05:13:31 -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=Q62OneaaF3AzrZy7KBiXcxpC+O6Q9rCVetjF4Cx6CW4=; b=KwrfkI/a7rk2QIiiwejQzZrRrdXARxGVEuIvPI2kJTdtyHGpWagygY0DI82qLS9eGe 1HFOhWC0VmqKYjQpLs/qCUxJvWlGSedsDyxAaeqUfb/f+qQPJhyLFg7LcXIervFXiXqK rp1no0siRCHm75lg3nrpGnE06fL4WKUdzYX8dCCxiChQowwdJ1pjyC0sgbVQVAaJcWpc gTB0D1WZIKDYC3CPi1zUl7o6g9YAy8rpRpuYxxcbJVmg9XGGu/KsE7P2jUCtNVLHStnk V/tkVLV6y7ldcPCxmQ58WbXpSOxufYYOlHzh9g97B6LC8bTa5eI17U1dLbWTDt5QtRaD 32pQ== Received: by 10.42.109.194 with SMTP id m2mr1178297icp.48.1348143211550; Thu, 20 Sep 2012 05:13:31 -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 ex8csp71617igc; Thu, 20 Sep 2012 05:13:30 -0700 (PDT) Received: by 10.180.97.106 with SMTP id dz10mr4095868wib.21.1348143210100; Thu, 20 Sep 2012 05:13:30 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id d6si41909124wiv.2.2012.09.20.05.13.29 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:30 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-we0-f178.google.com with SMTP id u7so1482367wey.37 for ; Thu, 20 Sep 2012 05:13:29 -0700 (PDT) Received: by 10.216.162.141 with SMTP id y13mr1073701wek.14.1348143209551; Thu, 20 Sep 2012 05:13:29 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:29 -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, olof.johansson@gmail.com, Lee Jones Subject: [PATCH 15/32] ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI Date: Thu, 20 Sep 2012 14:12:33 +0200 Message-Id: <1348143170-2130-16-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlx6n2iVDZIPxgqi/LusoaS1hOm12CHPxQQhs7NVZ0bUe/FYxMhML53j7W9Vl7ZcTEKMEK1 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. Acked-by: Linus Walleij 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 5d0f135..8890b19 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -736,6 +736,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 d04a8e6..eb421f9 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -80,6 +80,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 arm_pmu_platdata db8500_pmu_platdata;