From patchwork Thu May 17 16:35:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 8765 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 1B20623E23 for ; Thu, 17 May 2012 16:22:46 +0000 (UTC) Received: from mail-qc0-f180.google.com (mail-qc0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id E0CD0A18B7A for ; Thu, 17 May 2012 16:22:45 +0000 (UTC) Received: by qcmv28 with SMTP id v28so1698297qcm.11 for ; Thu, 17 May 2012 09:22:45 -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:x-auditid :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-brightmail-tracker:x-tm-as-mml:x-gm-message-state; bh=5uhM7AbP4J0gpn7eblbsLRqzdLOK3j0Rlu0ApHkS1YE=; b=Pj/DEyF+tZxbK+5c+Z8SBvRm6Yb0pwZDZFZyVtsoCw6NWQMQ9aahLRix38isxB/X/Q FdTUIsTXzslHVRnl+BjyIRE1sen3XexbOYtE76na9c1Q1LEBFjFTSbn1l267SXqEhWIU 3LZM8fMK1nf07bSnQuk/uLeY38/ZRr2D8Y/gvPEUCyLTx6FO2+6w/7XHw9baYdsCFLKJ J+9b+8AG0f/5whhdousxyAkp9+mlNkjlaedpIhtjAqpP2d5MoDarp/qmWnMCX0nyII3N DXFE6OY3Ti+mgpT6N1uq3yXkdYiS3X9aWiB1GoytohikxZcT+0lBb3MtE6e9gxsQkJ9G z9NA== Received: by 10.50.163.99 with SMTP id yh3mr6022964igb.53.1337271765217; Thu, 17 May 2012 09:22:45 -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.231.35.72 with SMTP id o8csp39873ibd; Thu, 17 May 2012 09:22:44 -0700 (PDT) Received: by 10.68.201.195 with SMTP id kc3mr28848013pbc.33.1337271764391; Thu, 17 May 2012 09:22:44 -0700 (PDT) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by mx.google.com with ESMTP id ns8si10731933pbb.33.2012.05.17.09.22.44; Thu, 17 May 2012 09:22:44 -0700 (PDT) Received-SPF: neutral (google.com: 203.254.224.24 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.24; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.24 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm2.samsung.com (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M4600CUCDHLKF50@mailout1.samsung.com> for patches@linaro.org; Fri, 18 May 2012 01:22:43 +0900 (KST) X-AuditID: cbfee61b-b7bb6ae0000006fb-34-4fb525d338b4 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id 9C.43.01787.3D525BF4; Fri, 18 May 2012 01:22:43 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M4600C3IDGOZP50@mmp1.samsung.com> for patches@linaro.org; Fri, 18 May 2012 01:22:43 +0900 (KST) From: Thomas Abraham To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, patches@linaro.org Subject: [PATCH 2/3] ARM: Exynos5: Add AUXDATA support for MSHC controllers Date: Thu, 17 May 2012 22:05:33 +0530 Message-id: <1337272534-30370-3-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1337272534-30370-1-git-send-email-thomas.abraham@linaro.org> References: <1337272534-30370-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== X-TM-AS-MML: No X-Gm-Message-State: ALoCoQni+HQr0jO3clpJyayqAOCm0qflaH4XIsVfVcTQ+6o4QWEdsxto9sHcrRwbj5+HHwZbq+U/ Add entries if MSHC controllers in AUXDATA table for correct device name initialization. Signed-off-by: Abhilash Kesavan Signed-off-by: Thomas Abraham --- arch/arm/mach-exynos/include/mach/map.h | 1 + arch/arm/mach-exynos/mach-exynos5-dt.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index cf7d200..1f3e61a 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -129,6 +129,7 @@ #define EXYNOS4_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) #define EXYNOS4_PA_DWMCI 0x12550000 +#define EXYNOS5_PA_DWMCI(x) (0x12200000 + ((x) * 0x10000)) #define EXYNOS4_PA_SATA 0x12560000 #define EXYNOS4_PA_SATAPHY 0x125D0000 diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 00e25fc..2cb0c6a 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -72,6 +72,14 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "s3c2440-i2c.0", NULL), OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), "s3c2440-i2c.1", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI(0), + "dw_mmc.0", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI(1), + "dw_mmc.1", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI(2), + "dw_mmc.2", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI(3), + "dw_mmc.3", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),