From patchwork Wed Aug 17 07:00:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3477 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 4B86623F71 for ; Wed, 17 Aug 2011 07:02:50 +0000 (UTC) Received: from mail-ey0-f170.google.com (mail-ey0-f170.google.com [209.85.215.170]) by fiordland.canonical.com (Postfix) with ESMTP id 41F77A188BD for ; Wed, 17 Aug 2011 07:02:50 +0000 (UTC) Received: by eyd10 with SMTP id 10so563657eyd.29 for ; Wed, 17 Aug 2011 00:02:50 -0700 (PDT) Received: by 10.213.14.67 with SMTP id f3mr1130194eba.56.1313564569977; Wed, 17 Aug 2011 00:02:49 -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.213.102.5 with SMTP id e5cs1867ebo; Wed, 17 Aug 2011 00:02:49 -0700 (PDT) Received: from mr.google.com ([10.236.157.133]) by 10.236.157.133 with SMTP id o5mr2956051yhk.39.1313564569723 (num_hops = 1); Wed, 17 Aug 2011 00:02:49 -0700 (PDT) Received: by 10.236.157.133 with SMTP id o5mr2109147yhk.39.1313564569112; Wed, 17 Aug 2011 00:02:49 -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 k7si1355218pbk.45.2011.08.17.00.02.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Aug 2011 00:02:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of sachin.kamat@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 sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pz0-f45.google.com with SMTP id 33so800136pzk.32 for ; Wed, 17 Aug 2011 00:02:47 -0700 (PDT) Received: by 10.142.242.6 with SMTP id p6mr44253wfh.352.1313564567374; Wed, 17 Aug 2011 00:02:47 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id i8sm393602pbi.28.2011.08.17.00.02.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Aug 2011 00:02:46 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, linaro-dev@lists.linaro.org, patches@linaro.org, sachin.kamat@linaro.org Subject: [PATCH] ARM: EXYNOS4: Add USB EHCI device to Origen Date: Wed, 17 Aug 2011 12:30:20 +0530 Message-Id: <1313564420-862-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 Signed-off-by: Pankaj Dubey Signed-off-by: Sachin Kamat --- arch/arm/mach-exynos4/Kconfig | 2 ++ arch/arm/mach-exynos4/mach-origen.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 3ab0f18..fba97a4 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -189,8 +189,10 @@ config MACH_NURI config MACH_ORIGEN bool "ORIGEN" select CPU_EXYNOS4210 + select S5P_DEV_USB_EHCI select S3C_DEV_RTC select S3C_DEV_WDT + select EXYNOS4_SETUP_USB_PHY 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 ed59f86..d101756 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include @@ -79,10 +81,21 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = { .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, }; +/* USB EHCI */ +static struct s5p_ehci_platdata origen_ehci_pdata; + +static void __init origen_ehci_init(void) +{ + struct s5p_ehci_platdata *pdata = &origen_ehci_pdata; + + s5p_ehci_set_platdata(pdata); +} + static struct platform_device *origen_devices[] __initdata = { &s3c_device_hsmmc2, &s3c_device_rtc, &s3c_device_wdt, + &s5p_device_ehci, }; static void __init origen_map_io(void) @@ -95,6 +108,10 @@ static void __init origen_map_io(void) static void __init origen_machine_init(void) { s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); + + origen_ehci_init(); + clk_xusbxti.rate = 24000000; + platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); }