watchdog/denali: Adding DesignWare watchdog driver support
PATCH v4 1/2 watchdog/denali: Adding DesignWare watchdog driver support
To add the DesignWare watchdog driver support. It required information such as register base address and clock info from configuration header file within include/configs folder.
---
Changes for v4
- Add 2014 to license header
Changes for v3
- Split to 2 series patch
Changes for v2
- Enable this driver at socfpga_cyclone5 board
--- drivers/watchdog/Makefile | 1 + drivers/watchdog/designware_wdt.c | 73 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 drivers/watchdog/designware_wdt.c
drivers/watchdog/Makefile +1 -0
@@ -15,3 +15,4 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_BFIN_WATCHDOG) += bfin_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o +obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o
drivers/watchdog/designware_wdt.c new file +73 -0
73 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 1/2 watchdog/denali: Adding DesignWare watchdog driver support
Quoted 62 lines · Chin Liang See
To add the DesignWare watchdog driver support. It required information such as register base address and clock info from configuration header file within
include/configsfolder.Signed-off-by Chin Liang See <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Albert Aribaud <[email protected]>Cc Heiko Schocher <[email protected]>Cc Tom Rini <[email protected]>---
Changes for v4
- Add 2014 to license header
Changes for v3
- Split to 2 series patch
Changes for v2
- Enable this driver atsocfpga_cyclone5board--- drivers/watchdog/Makefile | 1 + drivers/watchdog/designware_wdt.c | 73 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 drivers/watchdog/designware_wdt.cdrivers/watchdog/Makefile +1
-0@@ -15,3 +15,4 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_BFIN_WATCHDOG) += bfin_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o +obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.odrivers/watchdog/designware_wdt.c new file +25
-0@@ -0,0 +1,73 @@ +/* +* Copyright (C) 2013-2014 Altera Corporation <www.altera.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <watchdog.h> +#include <asm/io.h> +#include <asm/utils.h> + +#define DW_WDT_CR 0x00 +#define DW_WDT_TORR 0x04 +#define DW_WDT_CRR 0x0C + +#define DW_WDT_CR_EN_OFFSET 0x00 +#define DW_WDT_CR_RMOD_OFFSET 0x01 +#define DW_WDT_CR_RMOD_VAL 0x00 +#define DW_WDT_CRR_RESTART_VAL 0x76 + +/* +* Set the watchdog time interval. +* Counter is 32 bit. +*/ +int designware_wdt_settimeout (unsigned int timeout)
drivers/watchdog/designware_wdt.c line 35
Quoted 10 lines
drivers/watchdog/designware_wdt.c new file +10
-0+{ +signed int i; +/* calculate the timeout range value */ + i = (log_2_n_round_up (timeout *CONFIG_DW_WDT_CLOCK_KHZ )) -16 ; +if (i >15 ) + i =15 ; +if (i <0 ) + i =0 ; + +writel ((i | (i<<4 )), (CONFIG_DW_WDT_BASE +DW_WDT_TORR ));
i << 4
Quoted 6 lines
drivers/watchdog/designware_wdt.c new file +6
-0+return 0 ; +} + +void designware_wdt_enable (void ) +{ + writel(((DW_WDT_CR_RMOD_VAL << DW_WDT_CR_RMOD_OFFSET) |
drivers/watchdog/designware_wdt.c line 51
Quoted 10 lines
drivers/watchdog/designware_wdt.c new file +10
-0+ (0x1 << DW_WDT_CR_EN_OFFSET)), + (CONFIG_DW_WDT_BASE + DW_WDT_CR)); +} + +unsigned int designware_wdt_is_enabled (void ) +{ +unsigned long val; + val =readl ((CONFIG_DW_WDT_BASE +DW_WDT_CR )); +return val &0x1 ; +}
all 3 functions above I believe should be static because you use them just here.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140228/08b51319/attachment.pgp>
PATCH v4 1/2 watchdog/denali: Adding DesignWare watchdog driver support
Quoted 67 lines · Michal Simek
Quoted 66 lines · Chin Liang See
To add the DesignWare watchdog driver support. It required information such as register base address and clock info from configuration header file within
include/configsfolder.Signed-off-by Chin Liang See <[email protected]>Cc Anatolij Gustschin <[email protected]>Cc Albert Aribaud <[email protected]>Cc Heiko Schocher <[email protected]>Cc Tom Rini <[email protected]>---
Changes for v4
- Add 2014 to license header
Changes for v3
- Split to 2 series patch
Changes for v2
- Enable this driver atsocfpga_cyclone5board--- drivers/watchdog/Makefile | 1 + drivers/watchdog/designware_wdt.c | 73 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 drivers/watchdog/designware_wdt.cdrivers/watchdog/Makefile +1
-0@@ -15,3 +15,4 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_BFIN_WATCHDOG) += bfin_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o +obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.odrivers/watchdog/designware_wdt.c new file +29
-0@@ -0,0 +1,73 @@ +/* +* Copyright (C) 2013-2014 Altera Corporation <www.altera.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <watchdog.h> +#include <asm/io.h> +#include <asm/utils.h> + +#define DW_WDT_CR 0x00 +#define DW_WDT_TORR 0x04 +#define DW_WDT_CRR 0x0C + +#define DW_WDT_CR_EN_OFFSET 0x00 +#define DW_WDT_CR_RMOD_OFFSET 0x01 +#define DW_WDT_CR_RMOD_VAL 0x00 +#define DW_WDT_CRR_RESTART_VAL 0x76 + +/* +* Set the watchdog time interval. +* Counter is 32 bit. +*/ +int designware_wdt_settimeout (unsigned int timeout) +{ +signed int i; +/* calculate the timeout range value */ + i = (log_2_n_round_up (timeout *CONFIG_DW_WDT_CLOCK_KHZ )) -16 ;
Quoted 8 lines
drivers/watchdog/designware_wdt.c line 35
Quoted 6 lines
drivers/watchdog/designware_wdt.c new file +6
-0+if (i >15 ) + i =15 ; +if (i <0 ) + i =0 ; + +writel ((i | (i<<4 )), (CONFIG_DW_WDT_BASE +DW_WDT_TORR ));i << 4
Fixed
Quoted 13 lines
Quoted 13 lines
drivers/watchdog/designware_wdt.c new file +11
-0+return 0 ; +} + +void designware_wdt_enable (void ) +{ +writel (((DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET ) | + (0x1 <<DW_WDT_CR_EN_OFFSET )), + (CONFIG_DW_WDT_BASE +DW_WDT_CR )); +} + +unsigned int designware_wdt_is_enabled (void )
Quoted 8 lines
drivers/watchdog/designware_wdt.c line 51
Quoted 5 lines
drivers/watchdog/designware_wdt.c new file +5
-0+{ +unsigned long val; + val =readl ((CONFIG_DW_WDT_BASE +DW_WDT_CR )); +return val &0x1 ; +}all 3 functions above I believe should be static because you use them just here.
Yup, I can enhance that.
Thanks
Chin Liang
Quoted 4 lines
Thanks,
Michal