From: Tommy Lin <tommy.lin.1101@gmail.com> To: Russell King <linux@arm.linux.org.uk>, Anton Vorontsov <avorontsov@mvista.com> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mac.lin@caviumnetworks.com, Tommy Lin <tommy.lin@caviumnetworks.com> Subject: [PATCH 1/2] watchdog: Add MPcore watchdog support for cns3xxx SOCs Date: Tue, 5 Jul 2011 20:03:02 +0800 [thread overview] Message-ID: <1309867382-7806-1-git-send-email-tommy.lin@caviumnetworks.com> (raw) 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 <tommy.lin@caviumnetworks.com> --- 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, -- 1.7.6
WARNING: multiple messages have this Message-ID (diff)
From: tommy.lin.1101@gmail.com (Tommy Lin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] watchdog: Add MPcore watchdog support for cns3xxx SOCs Date: Tue, 5 Jul 2011 20:03:02 +0800 [thread overview] Message-ID: <1309867382-7806-1-git-send-email-tommy.lin@caviumnetworks.com> (raw) 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 <tommy.lin@caviumnetworks.com> --- 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, -- 1.7.6
next reply other threads:[~2011-07-05 12:03 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-05 12:03 Tommy Lin [this message] 2011-07-05 12:03 ` [PATCH 1/2] watchdog: Add MPcore watchdog support for cns3xxx SOCs Tommy Lin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1309867382-7806-1-git-send-email-tommy.lin@caviumnetworks.com \ --to=tommy.lin.1101@gmail.com \ --cc=avorontsov@mvista.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=mac.lin@caviumnetworks.com \ --cc=tommy.lin@caviumnetworks.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.