From patchwork Fri Aug 26 09:38:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 3717 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 B156223F22 for ; Fri, 26 Aug 2011 09:41:43 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 828ECA18271 for ; Fri, 26 Aug 2011 09:41:43 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id 7so3707757ywo.11 for ; Fri, 26 Aug 2011 02:41:43 -0700 (PDT) Received: by 10.150.98.4 with SMTP id v4mr1393897ybb.326.1314351703049; Fri, 26 Aug 2011 02:41:43 -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.151.27.20 with SMTP id e20cs276454ybj; Fri, 26 Aug 2011 02:41:42 -0700 (PDT) Received: by 10.231.66.85 with SMTP id m21mr1827753ibi.53.1314351702409; Fri, 26 Aug 2011 02:41:42 -0700 (PDT) Received: from mail-pz0-f45.google.com (mail-pz0-f45.google.com [209.85.210.45]) by mx.google.com with ESMTPS id k2si32544pbd.104.2011.08.26.02.41.42 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Aug 2011 02:41:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.210.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by mail-pz0-f45.google.com with SMTP id 33so5444264pzk.32 for ; Fri, 26 Aug 2011 02:41:42 -0700 (PDT) Received: by 10.143.76.8 with SMTP id d8mr459125wfl.400.1314351702068; Fri, 26 Aug 2011 02:41:42 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id z1sm1748700pbz.6.2011.08.26.02.41.39 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Aug 2011 02:41:41 -0700 (PDT) From: Tushar Behera To: linux-samsung-soc@vger.kernel.org Cc: linaro-dev@lists.linaro.org, kgene.kim@samsung.com, patches@linaro.org Subject: [PATCH 2/3] ARM: EXYNOS4: Add support for secondary MMC port on ORIGEN Date: Fri, 26 Aug 2011 15:08:43 +0530 Message-Id: <1314351524-10942-3-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314351524-10942-1-git-send-email-tushar.behera@linaro.org> References: <1314351524-10942-1-git-send-email-tushar.behera@linaro.org> Secondary MMC port on ORIGEN is connected to sdhci instance 0. Support for secondary MMC port is extended by registering sdhci instance 0. Since sdhci instance 2 can contain a bootable media, sdhci instance 0 is registered after instance 2. Signed-off-by: Tushar Behera --- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/mach-origen.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index e6925de..4c14d5e 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -229,6 +229,7 @@ config MACH_ORIGEN select CPU_EXYNOS4210 select S3C_DEV_RTC select S3C_DEV_WDT + select S3C_DEV_HSMMC select S3C_DEV_HSMMC2 select EXYNOS4_SETUP_SDHCI help diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index e280270..ae18812 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -72,6 +72,11 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = { }, }; +static struct s3c_sdhci_platdata origen_hsmmc0_pdata __initdata = { + .cd_type = S3C_SDHCI_CD_INTERNAL, + .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, +}; + static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = { .cd_type = S3C_SDHCI_CD_INTERNAL, .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, @@ -79,6 +84,7 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = { static struct platform_device *origen_devices[] __initdata = { &s3c_device_hsmmc2, + &s3c_device_hsmmc0, &s3c_device_rtc, &s3c_device_wdt, }; @@ -93,6 +99,7 @@ static void __init origen_map_io(void) static void __init origen_machine_init(void) { s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); + s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata); platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); }