From patchwork Sun Nov 11 04:39:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 1724881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 1339FDF288 for ; Sun, 11 Nov 2012 04:46:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TXPOM-00009L-PK; Sun, 11 Nov 2012 04:43:31 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TXPM6-00076Z-2O for linux-arm-kernel@lists.infradead.org; Sun, 11 Nov 2012 04:41:13 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi5so3323958pad.36 for ; Sat, 10 Nov 2012 20:41:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=mTcw+wKGlwzwpLQ2jM6rdQsPusv6U3ugOoTat7mJN6s=; b=IFIF3BuBedHKuofCwEfj8y1MRoodNTfNmeb/stvoAPQ8fGjzExWKobmULBJQx/c8Bn b6gCQ753hXOTljfat312lxURDUqb08wd2YkrEmjGEnNvudm/sc9EDhIV95kdOh7nUGp3 OuKw9doKq8e7JtYEE7M1fI+zKmJHQqvU9Eg76TWjpqgTwbqTyYCcGQsVYIdrgYpM2fih IMqMiys8641dChcKnJNdFOi34kh/xzBFZy5Z/weksmW5KZU2fFJDsnWEya3KwfFmDFWt UhDjI7FGXhwraeeweNPVzQRxwKBPFLeDp2CMCapCrDsZb3LsU1Fo0zF4yJ9oECAG48V/ kqtA== Received: by 10.68.230.2 with SMTP id su2mr14484747pbc.54.1352608869121; Sat, 10 Nov 2012 20:41:09 -0800 (PST) Received: from localhost ([122.178.255.135]) by mx.google.com with ESMTPS id t1sm2005163paw.11.2012.11.10.20.41.05 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 10 Nov 2012 20:41:08 -0800 (PST) From: Viresh Kumar To: arm@kernel.org, olof@lixom.net, arnd@arndb.de Subject: [PATCH 11/14] ARM: SPEAr1310: Fix AUXDATA for compact flash controller Date: Sun, 11 Nov 2012 10:09:33 +0530 Message-Id: <4d8f93cb25c6d29c20972e3b1fd8945c299034a5.1352608333.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQl6NZfEoMv2Yr7Ta39arhn+x+Emy+r6r5D/op/0spXBvC1g6CSDnyjgehtyqk5MFrUdgH5J X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121110_234110_374533_F8BB9452 X-CRM114-Status: GOOD ( 12.85 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Vipul Kumar Samar , Viresh Kumar , devicetree-discuss@lists.ozlabs.org, spear-devel@list.st.com, sr@denx.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Vipul Kumar Samar This patch fixes the platform data for compact flash controller. Signed-off-by: Vipul Kumar Samar Signed-off-by: Viresh Kumar --- arch/arm/mach-spear13xx/spear1310.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c index 451f3b1..02f4724 100644 --- a/arch/arm/mach-spear13xx/spear1310.c +++ b/arch/arm/mach-spear13xx/spear1310.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,12 @@ #define SPEAR1310_RAS_BASE UL(0xD8400000) #define VA_SPEAR1310_RAS_BASE IOMEM(UL(0xFA400000)) +static struct arasan_cf_pdata cf_pdata = { + .cf_if_clk = CF_IF_CLK_166M, + .quirk = CF_BROKEN_UDMA, + .dma_priv = &cf_dma_priv, +}; + /* ssp device registration */ static struct pl022_ssp_controller ssp1_plat_data = { .enable_dma = 0, @@ -39,7 +46,7 @@ static struct pl022_ssp_controller ssp1_plat_data = { /* Add SPEAr1310 auxdata to pass platform data */ static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = { - OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_dma_priv), + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata), OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data), OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data), OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data),