From patchwork Fri Oct 1 11:55:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 66383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ww0-f56.google.com (mail-ww0-f56.google.com [74.125.82.56]) by ozlabs.org (Postfix) with ESMTP id 57524B70E0 for ; Fri, 1 Oct 2010 21:59:55 +1000 (EST) Received: by mail-ww0-f56.google.com with SMTP id 14sf1398744wwi.11 for ; Fri, 01 Oct 2010 04:59:55 -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=Uj3fSsHLXhRgDTlTYAg8QwJJs41wWGiV8MFvvFBlIks=; b=JAlOi5++/BwWeR8GQZF8kjT696+xMQk70R+rnJm81tESmjhhoSzIqYgh/PTt7l3yGE o7oGKmy/7JYNorDhIh7v7FsDn+HWJX+tYiseT/wYcT3NYQ4vhoGbjVQORkBliYxVka1/ 4dmZ+Lf7Of18FJ1oj4pleGUm11lxAFoPeku5E= 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=s55AKPx9YkpuXDO7BD+6TKgyEnL2x6QlsZhiYpZfzNN52oE/QhrhcngkSgFfAEvlUM jtwvTeAG4h3sVskskoR+X2NSIxpYbe+GnF1eeSrqo4yl8OIEyfIjmYB6X46HwDMP8ic+ ywFSsG1DcZOnfq73RW4GGPZDWbxh8SzZEs9W4= Received: by 10.216.145.135 with SMTP id p7mr1119673wej.11.1285934394170; Fri, 01 Oct 2010 04:59:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.14.35.157 with SMTP id u29ls233077eea.6.p; Fri, 01 Oct 2010 04:59:53 -0700 (PDT) Received: by 10.14.48.5 with SMTP id u5mr761931eeb.24.1285934393764; Fri, 01 Oct 2010 04:59:53 -0700 (PDT) Received: by 10.14.48.5 with SMTP id u5mr761930eeb.24.1285934393744; Fri, 01 Oct 2010 04:59:53 -0700 (PDT) Received: from eu1sys200aog120.obsmtp.com (eu1sys200aog120.obsmtp.com [207.126.144.149]) by gmr-mx.google.com with ESMTP id r57si1121652eeh.1.2010.10.01.04.58.06; Fri, 01 Oct 2010 04:59:53 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of viresh.kumar@st.com) client-ip=207.126.144.149; Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob120.postini.com ([207.126.147.11]) with SMTP ID DSNKTKXMzR6bkmjA4+K2mqCq440GDs4a2dRQ@postini.com; Fri, 01 Oct 2010 11:59:53 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 DDB21C2; Fri, 1 Oct 2010 11:57:48 +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 0B8FA2649; Fri, 1 Oct 2010 11:57:44 +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 CUF00982 (AUTH viresh.kumar@st.com); Fri, 1 Oct 2010 17:27:44 +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 Cc: Viresh Kumar , 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, pratyush.anand@st.com, bhupesh.sharma@st.com Subject: [rtc-linux] [PATCH V2 36/69] ST SPEAr: Adding miscellaneous devices Date: Fri, 1 Oct 2010 17:25:56 +0530 Message-Id: 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.149 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: , Signed-off-by: Viresh Kumar --- arch/arm/mach-spear3xx/include/mach/generic.h | 7 ++ arch/arm/mach-spear3xx/spear310.c | 115 +++++++++++++++++++------ arch/arm/mach-spear3xx/spear320.c | 26 ++++++ 3 files changed, 123 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index 9bd9424..ea170a6 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -161,6 +161,11 @@ extern struct clcd_board clcd_plat_data; /* spear310 declarations */ #elif defined(CONFIG_MACH_SPEAR310) /* Add spear310 machine device structure declarations here */ +extern struct amba_device uart1_device; +extern struct amba_device uart2_device; +extern struct amba_device uart3_device; +extern struct amba_device uart4_device; +extern struct amba_device uart5_device; extern struct platform_device plgpio_device; extern struct platform_device nand_device; @@ -182,6 +187,8 @@ void __init spear310_init(void); /* Add spear320 machine device structure declarations here */ extern struct amba_device clcd_device; extern struct amba_device ssp_device[]; +extern struct amba_device uart1_device; +extern struct amba_device uart2_device; extern struct platform_device i2c1_device; extern struct platform_device nand_device; extern struct platform_device plgpio_device; diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index 189e3d4..25a0e94 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c @@ -142,6 +142,96 @@ struct pmx_driver pmx_driver = { }; /* Add spear310 specific devices here */ +/* uart1 device registeration */ +struct amba_device uart1_device = { + .dev = { + .init_name = "uart1", + }, + .res = { + .start = SPEAR310_UART1_BASE, + .end = SPEAR310_UART1_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART1, NO_IRQ}, +}; + +/* uart2 device registeration */ +struct amba_device uart2_device = { + .dev = { + .init_name = "uart2", + }, + .res = { + .start = SPEAR310_UART2_BASE, + .end = SPEAR310_UART2_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART2, NO_IRQ}, +}; + +/* uart3 device registeration */ +struct amba_device uart3_device = { + .dev = { + .init_name = "uart3", + }, + .res = { + .start = SPEAR310_UART3_BASE, + .end = SPEAR310_UART3_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART3, NO_IRQ}, +}; + +/* uart4 device registeration */ +struct amba_device uart4_device = { + .dev = { + .init_name = "uart4", + }, + .res = { + .start = SPEAR310_UART4_BASE, + .end = SPEAR310_UART4_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART4, NO_IRQ}, +}; + +/* uart5 device registeration */ +struct amba_device uart5_device = { + .dev = { + .init_name = "uart5", + }, + .res = { + .start = SPEAR310_UART5_BASE, + .end = SPEAR310_UART5_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART5, NO_IRQ}, +}; + +/* nand device registeration */ +static struct fsmc_nand_platform_data nand_platform_data; + +static struct resource nand_resources[] = { + { + .name = "nand_data", + .start = SPEAR310_NAND_BASE, + .end = SPEAR310_NAND_BASE + SZ_16 - 1, + .flags = IORESOURCE_MEM, + }, { + .name = "fsmc_regs", + .start = SPEAR310_FSMC_BASE, + .end = SPEAR310_FSMC_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +struct platform_device nand_device = { + .name = "nand", + .id = -1, + .resource = nand_resources, + .num_resources = ARRAY_SIZE(nand_resources), + .dev.platform_data = &nand_platform_data, +}; + /* plgpio device registeration */ /* * pin to offset and offset to pin converter functions @@ -178,31 +268,6 @@ int spear300_o2p(int offset) return offset + 2; } -/* nand device registeration */ -static struct fsmc_nand_platform_data nand_platform_data; - -static struct resource nand_resources[] = { - { - .name = "nand_data", - .start = SPEAR310_NAND_BASE, - .end = SPEAR310_NAND_BASE + SZ_16 - 1, - .flags = IORESOURCE_MEM, - }, { - .name = "fsmc_regs", - .start = SPEAR310_FSMC_BASE, - .end = SPEAR310_FSMC_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, -}; - -struct platform_device nand_device = { - .name = "nand", - .id = -1, - .resource = nand_resources, - .num_resources = ARRAY_SIZE(nand_resources), - .dev.platform_data = &nand_platform_data, -}; - static struct plgpio_platform_data plgpio_plat_data = { .gpio_base = 8, .irq_base = SPEAR_PLGPIO_INT_BASE, diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index 3f1c88b..8ecad40 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c @@ -447,6 +447,32 @@ struct amba_device ssp_device[] = { } }; +/* uart1 device registeration */ +struct amba_device uart1_device = { + .dev = { + .init_name = "uart1", + }, + .res = { + .start = SPEAR320_UART1_BASE, + .end = SPEAR320_UART1_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART1, NO_IRQ}, +}; + +/* uart2 device registeration */ +struct amba_device uart2_device = { + .dev = { + .init_name = "uart2", + }, + .res = { + .start = SPEAR320_UART2_BASE, + .end = SPEAR320_UART2_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + .irq = {VIRQ_UART2, NO_IRQ}, +}; + /* plgpio device registeration */ static struct plgpio_platform_data plgpio_plat_data = { .gpio_base = 8,