diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-11 15:59:23 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-11 15:59:23 +0000 |
| commit | c6114b60db88f1b33d12ecd77a3bed3a63822e06 (patch) | |
| tree | e3da1c10fc00d5cdfbd2cc021fe11ea9ea01df8f /target/linux/cns3xxx/patches-3.1/002-cns3xxx_wdt.patch | |
| parent | 63815e7b5d6aecfc4743f7a83a178bdeb3a79f58 (diff) | |
[cns3xxx]: rename 3.1 patches directory as it will be used for newer kernels as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30454 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/patches-3.1/002-cns3xxx_wdt.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.1/002-cns3xxx_wdt.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/cns3xxx/patches-3.1/002-cns3xxx_wdt.patch b/target/linux/cns3xxx/patches-3.1/002-cns3xxx_wdt.patch deleted file mode 100644 index 0f9004dc6..000000000 --- a/target/linux/cns3xxx/patches-3.1/002-cns3xxx_wdt.patch +++ /dev/null @@ -1,69 +0,0 @@ -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(-) - ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -333,6 +333,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. - ---- 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 ---- a/arch/arm/mach-cns3xxx/cns3420vb.c -+++ b/arch/arm/mach-cns3xxx/cns3420vb.c -@@ -158,10 +158,32 @@ static struct platform_device cns3xxx_us - }, - }; - -+/* 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, |