From patchwork Tue Jul 5 12:03:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommy Lin X-Patchwork-Id: 944682 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p65C3WF5018924 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 5 Jul 2011 12:03:53 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe4LX-0002d7-Qp; Tue, 05 Jul 2011 12:03:19 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qe4LX-0006dE-FZ; Tue, 05 Jul 2011 12:03:19 +0000 Received: from mail-gx0-f177.google.com ([209.85.161.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe4LT-0006cv-M5 for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2011 12:03:16 +0000 Received: by gxk2 with SMTP id 2so2609467gxk.36 for ; Tue, 05 Jul 2011 05:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=XSIMD+lWv+DdUyDzwdr8WzOCNn4RaKh5UQnGCL//4d0=; b=MOV23yKrWN7OFPmY4mRBLSlS4dvC6bLIlu0G0FXdfXlm08lGUFORiw+dsCz5D92YBZ l7m9VcQx7Es1GJ9pggz9ASdAcLt7oZgQzTbHkU99NdyBAobw0PE9qfcfuLfZ7UomI1Nb 0ey11yrp5guUJ29qn67g1qOVrxeubo9+N7xH0= Received: by 10.90.5.24 with SMTP id 24mr5773179age.206.1309867389690; Tue, 05 Jul 2011 05:03:09 -0700 (PDT) Received: from localhost.localdomain (60-250-205-192.HINET-IP.hinet.net [60.250.205.192]) by mx.google.com with ESMTPS id e14sm4414038anm.46.2011.07.05.05.03.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jul 2011 05:03:09 -0700 (PDT) From: Tommy Lin To: Russell King , Anton Vorontsov Subject: [PATCH 1/2] watchdog: Add MPcore watchdog support for cns3xxx SOCs Date: Tue, 5 Jul 2011 20:03:02 +0800 Message-Id: <1309867382-7806-1-git-send-email-tommy.lin@caviumnetworks.com> X-Mailer: git-send-email 1.7.0.4 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110705_080315_915499_AB05727F X-CRM114-Status: GOOD ( 14.42 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tommy.lin.1101[at]gmail.com) 0.1 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (tommy.lin.1101[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.177 listed in list.dnswl.org] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Tommy Lin , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mac.lin@caviumnetworks.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 05 Jul 2011 12:03:53 +0000 (UTC) 1. Made the connection between CNS3xxx SOCs(ARCH_CNS3xxx) and MPcore watchdog since the CNS3xxx SOCs have ARM11 MPcore CPU. 2. Enable mpcore_watchdog option as module to default configuration at arch/arm/configs/cns3420vb_defconfig. Signed-off-by: Tommy Lin --- arch/arm/Kconfig | 1 + arch/arm/configs/cns3420vb_defconfig | 2 ++ arch/arm/mach-cns3xxx/cns3420vb.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9adc278..3262b15 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -326,6 +326,7 @@ config ARCH_CNS3XXX select ARM_GIC select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select HAVE_ARM_TWD help Support for Cavium Networks CNS3XXX platform. diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig index 313627a..bd0a355 100644 --- a/arch/arm/configs/cns3420vb_defconfig +++ b/arch/arm/configs/cns3420vb_defconfig @@ -53,6 +53,8 @@ CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set # CONFIG_VGA_CONSOLE is not set +CONFIG_WATCHDOG=y +CONFIG_MPCORE_WATCHDOG=m # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index 08e5c87..09f20fe 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c @@ -159,10 +159,32 @@ static struct platform_device cns3xxx_usb_ohci_device = { }, }; +/* Watchdog */ +static struct resource cns3xxx_watchdog_resources[] = { + [0] = { + .start = CNS3XXX_TC11MP_TWD_BASE, + .end = CNS3XXX_TC11MP_TWD_BASE + PAGE_SIZE - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_LOCALWDOG, + .end = IRQ_LOCALWDOG, + .flags = IORESOURCE_IRQ, + } +}; + +static struct platform_device cns3xxx_watchdog_device = { + .name = "mpcore_wdt", + .id = -1, + .num_resources = ARRAY_SIZE(cns3xxx_watchdog_resources), + .resource = cns3xxx_watchdog_resources, +}; + /* * Initialization */ static struct platform_device *cns3420_pdevs[] __initdata = { + &cns3xxx_watchdog_device, &cns3420_nor_pdev, &cns3xxx_usb_ehci_device, &cns3xxx_usb_ohci_device,