diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-11-26 18:01:29 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-26 18:01:29 +0000 |
commit | 211669da3b1ca89da78afd32a7012c41958cc378 (patch) | |
tree | 6ef0925b47bd06799bacd0ec9752f93bd050b545 /target/linux/cns3xxx/patches-3.14/020-watchdog_support.patch | |
parent | 0525ffa4c5faaa0214b40c6b80a06c8a2567cc62 (diff) | |
download | master-31e0f0ae-211669da3b1ca89da78afd32a7012c41958cc378.tar.gz master-31e0f0ae-211669da3b1ca89da78afd32a7012c41958cc378.tar.bz2 master-31e0f0ae-211669da3b1ca89da78afd32a7012c41958cc378.zip |
cns3xxx: update to linux 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43397
Diffstat (limited to 'target/linux/cns3xxx/patches-3.14/020-watchdog_support.patch')
-rw-r--r-- | target/linux/cns3xxx/patches-3.14/020-watchdog_support.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/cns3xxx/patches-3.14/020-watchdog_support.patch b/target/linux/cns3xxx/patches-3.14/020-watchdog_support.patch new file mode 100644 index 0000000000..74ffcc34bf --- /dev/null +++ b/target/linux/cns3xxx/patches-3.14/020-watchdog_support.patch @@ -0,0 +1,59 @@ +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/configs/cns3420vb_defconfig ++++ b/arch/arm/configs/cns3420vb_defconfig +@@ -56,6 +56,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 +@@ -206,10 +206,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, |