MIPS: loongson1: Add watchdog support for Loongson1 board

PATCH In review Yang Ling 1 participant 1 message Oct 11, 2016

Subsystems (2)

MIPS MIPS/LOONGSON1 architecture

lore

Share & tools

lore

Yang Ling

author

2016-10-11 14:21 UTC #0 lore raw

PATCH 2/2 MIPS: loongson1: Add watchdog support for Loongson1 board

The patch adds watchdog support for Loongson1B/1C board.

Signed-off-by Yang Ling <[email protected]>

---
V1.1:
Add watchdog support for Loongson1B.

---
 arch/mips/configs/loongson1c_defconfig           |  4 ++++
 arch/mips/include/asm/mach-loongson32/platform.h |  1 +
 arch/mips/loongson32/common/platform.c           | 16 ++++++++++++++++
 arch/mips/loongson32/ls1b/board.c                |  1 +
 arch/mips/loongson32/ls1c/board.c                |  1 +
 5 files changed, 23 insertions(+)

arch/mips/configs/loongson1c_defconfig +4 -0

index 2304d41..68e42ef 100644
@@ -75,6 +75,10 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_LOONGSON1=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_LOONGSON1_WDT=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_HID_GENERIC=m
 CONFIG_USB_HID=m

arch/mips/include/asm/mach-loongson32/platform.h +1 -0

index 7adc313..5ead0dc 100644
@@ -25,6 +25,7 @@
 extern struct platform_device ls1x_gpio1_pdev;
 extern struct platform_device ls1x_nand_pdev;
 extern struct platform_device ls1x_rtc_pdev;
+extern struct platform_device ls1x_wdt_pdev;
 
 void __init ls1x_clk_init(void);
 void __init ls1x_dma_set_platdata(struct plat_ls1x_dma *pdata);

arch/mips/loongson32/common/platform.c +16 -0

index 4e28e0f..0521ac9 100644
@@ -357,3 +357,19 @@ struct platform_device ls1x_rtc_pdev = {
 	.name		= "ls1x-rtc",
 	.id		= -1,
 };
+
+/* Watchdog */
+static struct resource ls1x_wdt_resources[] = {
+	{
+		.start = LS1X_WDT_BASE,
+		.end   = LS1X_WDT_BASE + SZ_16 - 1,
+		.flags = IORESOURCE_MEM,
+	},
+};
+
+struct platform_device ls1x_wdt_pdev = {
+	.name          = "ls1x-wdt",
+	.id            = -1,
+	.num_resources = ARRAY_SIZE(ls1x_wdt_resources),
+	.resource      = ls1x_wdt_resources,
+};

arch/mips/loongson32/ls1b/board.c +1 -0

index 38a1d40..d0812a3 100644
@@ -72,6 +72,7 @@ struct plat_ls1x_nand ls1x_nand_pdata = {
 	&ls1x_gpio1_pdev,
 	&ls1x_nand_pdev,
 	&ls1x_rtc_pdev,
+	&ls1x_wdt_pdev,
 };
 
 static int __init ls1b_platform_init(void)

arch/mips/loongson32/ls1c/board.c +1 -0

index a96bed5..0e02362 100644
@@ -13,6 +13,7 @@
 	&ls1x_uart_pdev,
 	&ls1x_eth0_pdev,
 	&ls1x_rtc_pdev,
+	&ls1x_wdt_pdev,
 };
 
 static int __init ls1c_platform_init(void)

Signature · 1 line

1.9.1