hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MIPS: Loongson1: Add watchdog support for Loongson1 board 

The patch adds watchdog support for Loongson1 board.

Signed-off-by: Yang Ling <gnaygnil@gmail.com>
Cc: keguang.zhang@gmail.com
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14644/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Yang Ling 2016-12-04 23:05:40 +08:00 committed by Ralf Baechle
parent e31e4505b2
commit 5e73ad3ffc
6 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/configs/loongson1b_defconfig
View File

@ -74,6 +74,10 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIO_LOONGSON1=y CONFIG_GPIO_LOONGSON1=y
# CONFIG_HWMON is not set # 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_VGA_CONSOLE is not set
CONFIG_HID_GENERIC=m CONFIG_HID_GENERIC=m
CONFIG_USB_HID=m CONFIG_USB_HID=m

4
arch/mips/configs/loongson1c_defconfig
View File

@ -75,6 +75,10 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIO_LOONGSON1=y CONFIG_GPIO_LOONGSON1=y
# CONFIG_HWMON is not set # 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_VGA_CONSOLE is not set
CONFIG_HID_GENERIC=m CONFIG_HID_GENERIC=m
CONFIG_USB_HID=m CONFIG_USB_HID=m

9
arch/mips/include/asm/mach-loongson32/platform.h
View File

@ -1,9 +1,9 @@
/* /*
* Copyright (c) 2011 Zhang, Keguang <keguang.zhang@gmail.com> * Copyright (c) 2011 Zhang, Keguang <keguang.zhang@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
@ -25,11 +25,12 @@ extern struct platform_device ls1x_gpio0_pdev;
extern struct platform_device ls1x_gpio1_pdev; extern struct platform_device ls1x_gpio1_pdev;
extern struct platform_device ls1x_nand_pdev; extern struct platform_device ls1x_nand_pdev;
extern struct platform_device ls1x_rtc_pdev; extern struct platform_device ls1x_rtc_pdev;
extern struct platform_device ls1x_wdt_pdev;
void __init ls1x_clk_init(void); void __init ls1x_clk_init(void);
void __init ls1x_dma_set_platdata(struct plat_ls1x_dma *pdata); void __init ls1x_dma_set_platdata(struct plat_ls1x_dma *pdata);
void __init ls1x_nand_set_platdata(struct plat_ls1x_nand *pdata); void __init ls1x_nand_set_platdata(struct plat_ls1x_nand *pdata);
void __init ls1x_serial_set_uartclk(struct platform_device *pdev);
void __init ls1x_rtc_set_extclk(struct platform_device *pdev); void __init ls1x_rtc_set_extclk(struct platform_device *pdev);
void __init ls1x_serial_set_uartclk(struct platform_device *pdev);
#endif /* __ASM_MACH_LOONGSON32_PLATFORM_H */ #endif /* __ASM_MACH_LOONGSON32_PLATFORM_H */

16
arch/mips/loongson32/common/platform.c
View File

@ -356,3 +356,19 @@ struct platform_device ls1x_rtc_pdev = {
.name = "ls1x-rtc", .name = "ls1x-rtc",
.id = -1, .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,
};

7
arch/mips/loongson32/ls1b/board.c
View File

@ -1,9 +1,9 @@
/* /*
* Copyright (c) 2011-2016 Zhang, Keguang <keguang.zhang@gmail.com> * Copyright (c) 2011-2016 Zhang, Keguang <keguang.zhang@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
@ -72,6 +72,7 @@ static struct platform_device *ls1b_platform_devices[] __initdata = {
&ls1x_gpio1_pdev, &ls1x_gpio1_pdev,
&ls1x_nand_pdev, &ls1x_nand_pdev,
&ls1x_rtc_pdev, &ls1x_rtc_pdev,
&ls1x_wdt_pdev,
}; };
static int __init ls1b_platform_init(void) static int __init ls1b_platform_init(void)

7
arch/mips/loongson32/ls1c/board.c
View File

@ -1,9 +1,9 @@
/* /*
* Copyright (c) 2016 Yang Ling <gnaygnil@gmail.com> * Copyright (c) 2016 Yang Ling <gnaygnil@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
@ -13,6 +13,7 @@ static struct platform_device *ls1c_platform_devices[] __initdata = {
&ls1x_uart_pdev, &ls1x_uart_pdev,
&ls1x_eth0_pdev, &ls1x_eth0_pdev,
&ls1x_rtc_pdev, &ls1x_rtc_pdev,
&ls1x_wdt_pdev,
}; };
static int __init ls1c_platform_init(void) static int __init ls1c_platform_init(void)