From patchwork Fri Oct 1 11:55:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 223292 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o91Bw5QY013175 for ; Fri, 1 Oct 2010 11:58:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756671Ab0JAL6E (ORCPT ); Fri, 1 Oct 2010 07:58:04 -0400 Received: from eu1sys200aog119.obsmtp.com ([207.126.144.147]:42298 "EHLO eu1sys200aog119.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755634Ab0JAL6B (ORCPT ); Fri, 1 Oct 2010 07:58:01 -0400 Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob119.postini.com ([207.126.147.11]) with SMTP ID DSNKTKXMve0YBWXm7dfGt7oS7094SmAlRpRU@postini.com; Fri, 01 Oct 2010 11:58:01 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 52C90B5; Fri, 1 Oct 2010 11:57:45 +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 2F9FE2646; Fri, 1 Oct 2010 11:57:43 +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 CUF00973 (AUTH viresh.kumar@st.com); Fri, 1 Oct 2010 17:27:42 +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: [PATCH V2 27/69] ST SPEAr: Adding Watchdog support Date: Fri, 1 Oct 2010 17:25:47 +0530 Message-Id: X-Mailer: git-send-email 1.7.2.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 01 Oct 2010 11:58:06 +0000 (UTC) diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index 9317af8..91c0c09 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -33,6 +33,7 @@ /* Add spear3xx family device structure declarations here */ extern struct amba_device gpio_device; extern struct amba_device uart_device; +extern struct amba_device wdt_device; extern struct platform_device ehci_device; extern struct platform_device i2c_device; extern struct platform_device ohci0_device; diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c index c948289..7bd8963 100644 --- a/arch/arm/mach-spear3xx/spear300_evb.c +++ b/arch/arm/mach-spear3xx/spear300_evb.c @@ -38,6 +38,7 @@ static struct amba_device *amba_devs[] __initdata = { /* spear3xx specific devices */ &gpio_device, &uart_device, + &wdt_device, /* spear300 specific devices */ &clcd_device, diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c index 2a88cd2..cd076c9 100644 --- a/arch/arm/mach-spear3xx/spear310_evb.c +++ b/arch/arm/mach-spear3xx/spear310_evb.c @@ -45,6 +45,7 @@ static struct amba_device *amba_devs[] __initdata = { /* spear3xx specific devices */ &gpio_device, &uart_device, + &wdt_device, /* spear310 specific devices */ }; diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c index d0cfd96..7f7b5dd 100644 --- a/arch/arm/mach-spear3xx/spear320_evb.c +++ b/arch/arm/mach-spear3xx/spear320_evb.c @@ -42,6 +42,7 @@ static struct amba_device *amba_devs[] __initdata = { /* spear3xx specific devices */ &gpio_device, &uart_device, + &wdt_device, /* spear320 specific devices */ &clcd_device, diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index ff9f6e9..88a6bd4 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -54,6 +54,18 @@ struct amba_device uart_device = { .irq = {IRQ_UART, NO_IRQ}, }; +/* watchdog device registeration */ +struct amba_device wdt_device = { + .dev = { + .init_name = "wdt", + }, + .res = { + .start = SPEAR3XX_ICM3_WDT_BASE, + .end = SPEAR3XX_ICM3_WDT_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; + /* i2c device registeration */ static struct resource i2c_resources[] = { { diff --git a/arch/arm/mach-spear6xx/include/mach/generic.h b/arch/arm/mach-spear6xx/include/mach/generic.h index 8aee3ad..f885898 100644 --- a/arch/arm/mach-spear6xx/include/mach/generic.h +++ b/arch/arm/mach-spear6xx/include/mach/generic.h @@ -32,6 +32,7 @@ extern struct amba_device clcd_device; extern struct amba_device gpio_device[]; extern struct amba_device uart_device[]; +extern struct amba_device wdt_device; extern struct platform_device ehci0_device; extern struct platform_device ehci1_device; extern struct platform_device i2c_device; diff --git a/arch/arm/mach-spear6xx/spear600_evb.c b/arch/arm/mach-spear6xx/spear600_evb.c index bd4be34..0eb5f50 100644 --- a/arch/arm/mach-spear6xx/spear600_evb.c +++ b/arch/arm/mach-spear6xx/spear600_evb.c @@ -24,6 +24,7 @@ static struct amba_device *amba_devs[] __initdata = { &gpio_device[2], &uart_device[0], &uart_device[1], + &wdt_device, }; static struct platform_device *plat_devs[] __initdata = { diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index 000b3a8..2eec8ac 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c @@ -118,6 +118,18 @@ struct amba_device gpio_device[] = { } }; +/* watchdog device registeration */ +struct amba_device wdt_device = { + .dev = { + .init_name = "wdt", + }, + .res = { + .start = SPEAR6XX_ICM3_WDT_BASE, + .end = SPEAR6XX_ICM3_WDT_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; + /* i2c device registeration */ static struct resource i2c_resources[] = { {