From patchwork Fri Oct 1 11:56:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 66365 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wy0-f184.google.com (mail-wy0-f184.google.com [74.125.82.184]) by ozlabs.org (Postfix) with ESMTP id 1FD09B70E9 for ; Fri, 1 Oct 2010 21:58:25 +1000 (EST) Received: by mail-wy0-f184.google.com with SMTP id 11sf1396670wyi.11 for ; Fri, 01 Oct 2010 04:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:mime-version:x-beenthere:received :received:received:received:received-spf:received:received:received :received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=doDSxAoMSnymb1fZiB9+Up6qGdvTJLzNj78yhNRsCT4=; b=HbRA2ulX1oa3TRVUwwFdOq3T3LFojh3nhW6JKfTke6L5o91RP+vx5T/CjLrjy9Aq/q 5kZQajUkI2/cTA6GsQz/OzXCAdNjWFuRtA6kEO9kx1nKby5qXoagUKQvYNotJhGBj/PA FcavEMXQcHmQQEp86+XTLDFLiuTrvlzI9htO0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; b=hiFwIeLC2DB6n67NfZtRJGfTf0hQcLStT7BXc0J+4LxRkqLZixMb9oujnsx/ii1B1q FE32VtioFfXWBzSnjszhR9Udw39hhzt4zpuRlRZuoa0GSIRKaiRyoVzKPOPReZEzXg7d smJxOSuoELZ1bRYegn/j3x8cO4hAZPr/mb8K8= Received: by 10.216.144.196 with SMTP id n46mr1088315wej.21.1285934304898; Fri, 01 Oct 2010 04:58:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.14.46.209 with SMTP id r57ls233385eeb.2.p; Fri, 01 Oct 2010 04:58:24 -0700 (PDT) Received: by 10.14.127.195 with SMTP id d43mr488756eei.28.1285934304484; Fri, 01 Oct 2010 04:58:24 -0700 (PDT) Received: by 10.14.127.195 with SMTP id d43mr488755eei.28.1285934304447; Fri, 01 Oct 2010 04:58:24 -0700 (PDT) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) by gmr-mx.google.com with ESMTP id w43si1114465eeh.7.2010.10.01.04.58.09; Fri, 01 Oct 2010 04:58:24 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of viresh.kumar@st.com) client-ip=207.126.144.119; Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKTKXM0PfmSKrUB6DC9wuCAIu8PQpQ7whJ@postini.com; Fri, 01 Oct 2010 11:58:24 UTC Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 50A76B6; Fri, 1 Oct 2010 11:57:51 +0000 (GMT) Received: from mail2.dlh.st.com (mail2.dlh.st.com [10.199.8.22]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A5075265B; Fri, 1 Oct 2010 11:57:47 +0000 (GMT) Received: from localhost (dlhl0509.dlh.st.com [10.199.7.86]) by mail2.dlh.st.com (MOS 3.8.7a) with ESMTP id CUF00992 (AUTH viresh.kumar@st.com); Fri, 1 Oct 2010 17:27:46 +0530 (IST) From: Viresh KUMAR To: linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com, a.zummo@towertech.it, dbrownell@users.sourceforge.net, linux-usb@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, linux-mtd@lists.infradead.org, dwmw2@infradead.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Pratyush Anand , shiraz.hashim@st.com, vipin.kumar@st.com, deepak.sikri@st.com, armando.visconti@st.com, vipulkumar.samar@st.com, rajeev-dlh.kumar@st.com, bhupesh.sharma@st.com, Viresh Kumar Subject: [rtc-linux] [PATCH V2 46/69] ST SPEAr13xx: Adding machine support for pci gadget Date: Fri, 1 Oct 2010 17:26:06 +0530 Message-Id: <52b8b1701090d726b3af6b79b98cd967229113d8.1285933332.git.viresh.kumar@st.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: References: In-Reply-To: References: X-Original-Sender: viresh.kumar@st.com X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of viresh.kumar@st.com) smtp.mail=viresh.kumar@st.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Pratyush Anand Signed-off-by: Pratyush Anand Signed-off-by: Shiraz Hashim Signed-off-by: Viresh Kumar --- arch/arm/mach-spear13xx/include/mach/generic.h | 3 + arch/arm/mach-spear13xx/include/mach/spear.h | 2 +- arch/arm/mach-spear13xx/spear1300_evb.c | 1 + arch/arm/mach-spear13xx/spear1310_evb.c | 1 + arch/arm/mach-spear13xx/spear13xx.c | 94 ++++++++++++++++++++++++ 5 files changed, 100 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-spear13xx/include/mach/generic.h b/arch/arm/mach-spear13xx/include/mach/generic.h index 9b0f009..56ed7a7 100644 --- a/arch/arm/mach-spear13xx/include/mach/generic.h +++ b/arch/arm/mach-spear13xx/include/mach/generic.h @@ -40,6 +40,9 @@ extern struct platform_device spear13xx_kbd_device; extern struct platform_device spear13xx_nand_device; extern struct platform_device spear13xx_ohci0_device; extern struct platform_device spear13xx_ohci1_device; +extern struct platform_device spear13xx_pcie_gadget0_device; +extern struct platform_device spear13xx_pcie_gadget1_device; +extern struct platform_device spear13xx_pcie_gadget2_device; extern struct platform_device spear13xx_rtc_device; extern struct platform_device spear13xx_sdhci_device; extern struct platform_device spear13xx_smi_device; diff --git a/arch/arm/mach-spear13xx/include/mach/spear.h b/arch/arm/mach-spear13xx/include/mach/spear.h index cf25eb5..d043280 100644 --- a/arch/arm/mach-spear13xx/include/mach/spear.h +++ b/arch/arm/mach-spear13xx/include/mach/spear.h @@ -60,7 +60,7 @@ #define SPEAR13XX_SYS_LOCATION (SPEAR13XX_SYSRAM0_BASE + 0x600) #define SPEAR13XX_SYSRAM1_BASE UL(0xE0800000) -#define SPEAR13XX_SYSRAM1_SIZE 0x00800000 +#define SPEAR13XX_SYSRAM1_SIZE 0x00001000 #define SPEAR13XX_CLCD_BASE UL(0xE1000000) #define SPEAR13XX_C3_BASE UL(0xE1800000) #define SPEAR13XX_GETH_BASE UL(0xE2000000) diff --git a/arch/arm/mach-spear13xx/spear1300_evb.c b/arch/arm/mach-spear13xx/spear1300_evb.c index e56fbd4..34e2647 100644 --- a/arch/arm/mach-spear13xx/spear1300_evb.c +++ b/arch/arm/mach-spear13xx/spear1300_evb.c @@ -52,6 +52,7 @@ static struct platform_device *plat_devs[] __initdata = { &spear13xx_nand_device, &spear13xx_ohci0_device, &spear13xx_ohci1_device, + &spear13xx_pcie_gadget0_device, &spear13xx_rtc_device, &spear13xx_sdhci_device, &spear13xx_smi_device, diff --git a/arch/arm/mach-spear13xx/spear1310_evb.c b/arch/arm/mach-spear13xx/spear1310_evb.c index f6b4323..1af152f 100644 --- a/arch/arm/mach-spear13xx/spear1310_evb.c +++ b/arch/arm/mach-spear13xx/spear1310_evb.c @@ -53,6 +53,7 @@ static struct platform_device *plat_devs[] __initdata = { &spear13xx_nand_device, &spear13xx_ohci0_device, &spear13xx_ohci1_device, + &spear13xx_pcie_gadget0_device, &spear13xx_rtc_device, &spear13xx_sdhci_device, &spear13xx_smi_device, diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c index 08e87d7..c86bd1c 100644 --- a/arch/arm/mach-spear13xx/spear13xx.c +++ b/arch/arm/mach-spear13xx/spear13xx.c @@ -429,6 +429,100 @@ struct platform_device spear13xx_sdhci_device = { .resource = sdhci_resources, }; +/* pcie gadget registration */ +static struct resource pcie_gadget0_resources[] = { + { + .start = SPEAR13XX_PCIE0_APP_BASE, + .end = SPEAR13XX_PCIE0_APP_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = SPEAR13XX_PCIE0_BASE, + .end = SPEAR13XX_PCIE0_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_PCIE0, + .flags = IORESOURCE_IRQ, + }, +}; + +/* pcie_gadget0_id defaults to 0, being static variable */ +static int pcie_gadget0_id; +static u64 pcie_gadget0_dmamask = ~0; + +struct platform_device spear13xx_pcie_gadget0_device = { + .name = "pcie-gadget-spear", + .id = 0, + .dev = { + .coherent_dma_mask = ~0, + .dma_mask = &pcie_gadget0_dmamask, + .platform_data = &pcie_gadget0_id, + }, + .num_resources = ARRAY_SIZE(pcie_gadget0_resources), + .resource = pcie_gadget0_resources, +}; + +static struct resource pcie_gadget1_resources[] = { + { + .start = SPEAR13XX_PCIE1_APP_BASE, + .end = SPEAR13XX_PCIE1_APP_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = SPEAR13XX_PCIE1_BASE, + .end = SPEAR13XX_PCIE1_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_PCIE1, + .flags = IORESOURCE_IRQ, + }, +}; + +/* pcie_gadget1_id defaults to 0, being static variable */ +static int pcie_gadget1_id; +static u64 pcie_gadget1_dmamask = ~0; + +struct platform_device spear13xx_pcie_gadget1_device = { + .name = "pcie-gadget-spear", + .id = 1, + .dev = { + .coherent_dma_mask = ~0, + .dma_mask = &pcie_gadget1_dmamask, + .platform_data = &pcie_gadget1_id, + }, + .num_resources = ARRAY_SIZE(pcie_gadget1_resources), + .resource = pcie_gadget1_resources, +}; + +static struct resource pcie_gadget2_resources[] = { + { + .start = SPEAR13XX_PCIE2_APP_BASE, + .end = SPEAR13XX_PCIE2_APP_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = SPEAR13XX_PCIE2_BASE, + .end = SPEAR13XX_PCIE2_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_PCIE2, + .flags = IORESOURCE_IRQ, + }, +}; + +/* pcie_gadget2_id defaults to 0, being static variable */ +static int pcie_gadget2_id; +static u64 pcie_gadget2_dmamask = ~0; + +struct platform_device spear13xx_pcie_gadget2_device = { + .name = "pcie-gadget-spear", + .id = 2, + .dev = { + .coherent_dma_mask = ~0, + .dma_mask = &pcie_gadget2_dmamask, + .platform_data = &pcie_gadget2_id, + }, + .num_resources = ARRAY_SIZE(pcie_gadget2_resources), + .resource = pcie_gadget2_resources, +}; + /* Do spear13xx familiy common initialization part here */ void __init spear13xx_init(void) {