]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: at91: wdt: Convert watchdog driver to dm/dt
authorPrasanthi Chellakumar <Prasanthi.Chellakumar@microchip.com>
Tue, 9 Oct 2018 18:46:40 +0000 (11:46 -0700)
committerTom Rini <trini@konsulko.com>
Fri, 16 Nov 2018 18:34:34 +0000 (13:34 -0500)
Convert the Watchdog driver for AT91SAM9x processors to support
the driver model and device tree. Changes "CONFIG_AT91SAM9_WATCHDOG"
to new "CONFIG_WDT_AT91" Kconfig option.

Signed-off-by: Prasanthi Chellakumar <prasanthi.chellakumar@microchip.com>
19 files changed:
arch/arm/dts/at91sam9260-smartweb.dts
arch/arm/dts/at91sam9g20-taurus.dts
arch/arm/mach-at91/include/mach/at91_wdt.h
arch/arm/mach-at91/spl.c
arch/arm/mach-at91/spl_at91.c
arch/arm/mach-at91/spl_atmel.c
common/board_f.c
configs/picosam9g45_defconfig
configs/smartweb_defconfig
configs/taurus_defconfig
doc/README.at91
doc/README.watchdog
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
drivers/watchdog/at91sam9_wdt.c
include/configs/picosam9g45.h
include/configs/smartweb.h
include/configs/taurus.h
scripts/config_whitelist.txt

index e59781bf45be969279296bb4edd9e0e3aefccb10..a22de2d927db994b1475e94c3b36759a30a7121e 100644 (file)
@@ -89,6 +89,7 @@
                        };
 
                        watchdog@fffffd40 {
+                               timeout-sec = <15>;
                                status = "okay";
                        };
 
index 7931c0af7b49c8295aedcf8a95f0bb581af7f6fa..cee228bb8cf5e57c4449f3eb954bfb8cee32003b 100644 (file)
@@ -98,6 +98,7 @@
                        };
 
                        watchdog@fffffd40 {
+                               timeout-sec = <15>;
                                status = "okay";
                        };
 
index 99b0cc812dc3e2db7ade29b27473b3f0f13fde54..cd2272367b53a0df87e1cffee681270493dd353f 100644 (file)
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2008 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  * Copyright (C) 2007 Andrew Victor
- * Copyright (C) 2007 Atmel Corporation.
+ * Copyright (C) 2018 Microchip Technology Inc.
  *
  * Watchdog Timer (WDT) - System peripherals regsters.
  * Based on AT91SAM9261 datasheet revision D.
@@ -27,9 +27,13 @@ typedef struct at91_wdt {
 
 #endif
 
+/* Watchdog Control Register */
+#define AT91_WDT_CR                    0x00
 #define AT91_WDT_CR_WDRSTT             1
 #define AT91_WDT_CR_KEY                        0xa5000000      /* KEY Password */
 
+/* Watchdog Mode Register*/
+#define AT91_WDT_MR                    0X04
 #define AT91_WDT_MR_WDV(x)             (x & 0xfff)
 #define AT91_WDT_MR_WDFIEN             0x00001000
 #define AT91_WDT_MR_WDRSTEN            0x00002000
index 8bfb2a452b5e89b898697df2d1f9ee1600bcf558..6da6d41be2ecffc5cbe99b46e80a538e046f1683 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/arch/clk.h>
 #include <spl.h>
 
-#if !defined(CONFIG_AT91SAM9_WATCHDOG)
+#if !defined(CONFIG_WDT_AT91)
 void at91_disable_wdt(void)
 {
        struct at91_wdt *wdt = (struct at91_wdt *)ATMEL_BASE_WDT;
index 8c368042a6b29a0ace586c7b17026f0b0a24f482..23ebaa99b169507efd6f14d9fab1ada91fd5dfa2 100644 (file)
@@ -76,7 +76,7 @@ void __weak spl_board_init(void)
 void board_init_f(ulong dummy)
 {
        lowlevel_clock_init();
-#if !defined(CONFIG_AT91SAM9_WATCHDOG)
+#if !defined(CONFIG_WDT_AT91)
        at91_disable_wdt();
 #endif
 
index 597ff8c036736f206b61389b7945a61bfe7721d9..ef745c94775dc81f80d0fa19650b8244642625a0 100644 (file)
@@ -98,7 +98,7 @@ void board_init_f(ulong dummy)
        configure_2nd_sram_as_l2_cache();
 #endif
 
-#if !defined(CONFIG_AT91SAM9_WATCHDOG)
+#if !defined(CONFIG_WDT_AT91)
        /* disable watchdog */
        at91_disable_wdt();
 #endif
index 96503ff8d3c36a12339de06b0f872f678118baec..f1a1432d869712cebd13654c72c14dc0f2bea073 100644 (file)
@@ -91,7 +91,7 @@ static int init_func_watchdog_init(void)
 {
 # if defined(CONFIG_HW_WATCHDOG) && \
        (defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \
-       defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \
+       defined(CONFIG_SH) || \
        defined(CONFIG_DESIGNWARE_WATCHDOG) || \
        defined(CONFIG_IMX_WATCHDOG))
        hw_watchdog_init();
index df979f93267045013452668b87ec3216a40fd1ef..699e2e230ab329237a7687b4cdd998d15a05b8ac 100644 (file)
@@ -40,3 +40,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
+CONFIG_DM=y
+CONFIG_SPL_DM=y
+CONFIG_WDT=y
+CONFIG_WDT_AT91=y
index cf6f2757cae28e010fa4bb179e3dbca89bec98f5..e9c2b6350991241dbfc7f1da2afdc0d508fc481d 100644 (file)
@@ -59,3 +59,6 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_MCS7830=y
 CONFIG_SPL_TINY_MEMSET=y
 # CONFIG_EFI_LOADER is not set
+CONFIG_WDT=y
+CONFIG_WDT_AT91=y
+CONFIG_AT91_HW_WDT_TIMEOUT=y
index ee5da43ccbaf8adaa013349dc0176f7524585f0b..e53e075d48250bc21e77583e5c1f68e9d2b23fa7 100644 (file)
@@ -61,3 +61,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908
 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_TINY_PRINTF=y
+CONFIG_WDT=y
+CONFIG_WDT_AT91=y
+CONFIG_AT91_HW_WDT_TIMEOUT=y
index 67412136eeba1760b2d117fb1f468eb1a0168d38..39dd5632baa94ed5529caf98fa09e99cb0fd1a03 100644 (file)
@@ -171,4 +171,4 @@ III. Watchdog support
        your code (make sure not to disable it in AT91Bootstrap for instance).
 
        In the U-Boot configuration, the AT91 watchdog support is enabled using
-       the CONFIG_AT91SAM9_WATCHDOG and CONFIG_HW_WATCHDOG options.
+       the CONFIG_WDT and CONFIG_WDT_AT91 options.
index 7097c8766b437a232908055758cbbf0d5ce3cacd..f23c923910a6775af930d1489cacaa87e2289d0d 100644 (file)
@@ -14,7 +14,7 @@ CONFIG_WATCHDOG_TIMEOUT_MSECS
        If not given, will default to maximum timeout. This would
        be 128000 msec for i.mx31/35/5x/6x.
 
-CONFIG_AT91SAM9_WATCHDOG
+CONFIG_WDT_AT91
        Available for AT91SAM9 to service the watchdog.
 
 CONFIG_FTWDT010_WATCHDOG
index 02f4e1e32fc7505bb1b67c017868825fa582bf35..a911dba73a4c439d5f9101ed30eba5ccde3fd6d3 100644 (file)
@@ -118,4 +118,14 @@ config IMX_WATCHDOG
           Select this to enable the IMX and LSCH2 of Layerscape watchdog
           driver.
 
+config WDT_AT91
+       bool "AT91 watchdog timer support"
+       depends on WDT
+       help
+          Select this to enable Microchip watchdog timer, which can be found on
+          some AT91 devices.
+
+config AT91_HW_WDT_TIMEOUT
+       bool "AT91 watchdog timeout specified"
+       depends on WDT_AT91
 endmenu
index 08406caa0f9c29c6bc26b3e499c8f60164f3e625..a5c27b0f4cf86633066a571686fb608cc2d3121c 100644 (file)
@@ -3,7 +3,7 @@
 # (C) Copyright 2008
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-obj-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
+obj-$(CONFIG_WDT_AT91) += at91sam9_wdt.o
 obj-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
 ifneq (,$(filter $(SOC), mx25 mx31 mx35 mx5 mx6 mx7 vf610))
 obj-y += imx_watchdog.o
index fca2849918f8fc24986bb24a8537ef179858730d..13f8772e4130ac1e273c920d211eefc4491f5eff 100644 (file)
@@ -2,7 +2,7 @@
 /*
  * [origin: Linux kernel drivers/watchdog/at91sam9_wdt.c]
  *
- * Watchdog driver for Atmel AT91SAM9x processors.
+ * Watchdog driver for AT91SAM9x processors.
  *
  * Copyright (C) 2008 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  * Copyright (C) 2008 Renaud CERRATO r.cerrato@til-technologies.fr
  * write to this register. Inform Linux to it too
  */
 
-#include <common.h>
-#include <watchdog.h>
-#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/at91_wdt.h>
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <wdt.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * AT91SAM9 watchdog runs a 12bit counter @ 256Hz,
  * use this to convert a watchdog
- * value from/to milliseconds.
+ * value from seconds.
  */
-#define ms_to_ticks(t) (((t << 8) / 1000) - 1)
-#define ticks_to_ms(t) (((t + 1) * 1000) >> 8)
+#define WDT_SEC2TICKS(s)       (((s) << 8) - 1)
 
 /* Hardware timeout in seconds */
-#if !defined(CONFIG_AT91_HW_WDT_TIMEOUT)
-#define WDT_HW_TIMEOUT 2
-#else
-#define WDT_HW_TIMEOUT CONFIG_AT91_HW_WDT_TIMEOUT
-#endif
+#define WDT_MAX_TIMEOUT 16
+#define WDT_MIN_TIMEOUT 0
+#define WDT_DEFAULT_TIMEOUT 2
+
+struct at91_wdt_priv {
+       void __iomem *regs;
+       u32     regval;
+       u32     timeout;
+};
 
 /*
  * Set the watchdog time interval in 1/256Hz (write-once)
  * Counter is 12 bit.
  */
-static int at91_wdt_settimeout(unsigned int timeout)
+static int at91_wdt_start(struct udevice *dev, u64 timeout_s, ulong flags)
 {
-       unsigned int reg;
-       at91_wdt_t *wd = (at91_wdt_t *) ATMEL_BASE_WDT;
+       struct at91_wdt_priv *priv = dev_get_priv(dev);
+       u32 timeout = WDT_SEC2TICKS(timeout_s);
+
+       if (timeout_s > WDT_MAX_TIMEOUT || timeout_s < WDT_MIN_TIMEOUT)
+               timeout = priv->timeout;
 
        /* Check if disabled */
-       if (readl(&wd->mr) & AT91_WDT_MR_WDDIS) {
+       if (readl(priv->regs + AT91_WDT_MR) & AT91_WDT_MR_WDDIS) {
                printf("sorry, watchdog is disabled\n");
                return -1;
        }
@@ -57,24 +66,71 @@ static int at91_wdt_settimeout(unsigned int timeout)
         * 4096 / 256 = 16 seconds.
         */
 
-       reg = AT91_WDT_MR_WDRSTEN               /* causes watchdog reset */
+       priv->regval = AT91_WDT_MR_WDRSTEN      /* causes watchdog reset */
                | AT91_WDT_MR_WDDBGHLT          /* disabled in debug mode */
                | AT91_WDT_MR_WDD(0xfff)        /* restart at any time */
                | AT91_WDT_MR_WDV(timeout);     /* timer value */
 
-       writel(reg, &wd->mr);
+       writel(priv->regval, priv->regs + AT91_WDT_MR);
+
+       return 0;
+}
+
+static int at91_wdt_stop(struct udevice *dev)
+{
+       struct at91_wdt_priv *priv = dev_get_priv(dev);
+
+       /* Disable Watchdog Timer */
+       priv->regval |= AT91_WDT_MR_WDDIS;
+       writel(priv->regval, priv->regs + AT91_WDT_MR);
 
        return 0;
 }
 
-void hw_watchdog_reset(void)
+static int at91_wdt_reset(struct udevice *dev)
 {
-       at91_wdt_t *wd = (at91_wdt_t *) ATMEL_BASE_WDT;
-       writel(AT91_WDT_CR_WDRSTT | AT91_WDT_CR_KEY, &wd->cr);
+       struct at91_wdt_priv *priv = dev_get_priv(dev);
+
+       writel(AT91_WDT_CR_WDRSTT | AT91_WDT_CR_KEY, priv->regs + AT91_WDT_CR);
+
+       return 0;
 }
 
-void hw_watchdog_init(void)
+static const struct wdt_ops at91_wdt_ops = {
+       .start = at91_wdt_start,
+       .stop = at91_wdt_stop,
+       .reset = at91_wdt_reset,
+};
+
+static const struct udevice_id at91_wdt_ids[] = {
+       { .compatible = "atmel,at91sam9260-wdt" },
+       {}
+};
+
+static int at91_wdt_probe(struct udevice *dev)
 {
-       /* 16 seconds timer, resets enabled */
-       at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000));
+       struct at91_wdt_priv *priv = dev_get_priv(dev);
+
+       priv->regs = dev_remap_addr(dev);
+       if (!priv->regs)
+               return -EINVAL;
+
+#ifdef CONFIG_AT91_HW_WDT_TIMEOUT
+       priv->timeout = dev_read_u32_default(dev, "timeout-sec",
+                                            WDT_DEFAULT_TIMEOUT);
+       debug("%s: timeout %d", __func__, priv->timeout);
+#endif
+
+       debug("%s: Probing wdt%u\n", __func__, dev->seq);
+
+       return 0;
 }
+
+U_BOOT_DRIVER(at91_wdt) = {
+       .name = "at91_wdt",
+       .id = UCLASS_WDT,
+       .of_match = at91_wdt_ids,
+       .priv_auto_alloc_size = sizeof(struct at91_wdt_priv),
+       .ops = &at91_wdt_ops,
+       .probe = at91_wdt_probe,
+};
index 0b240e7ebc32a229598f8106b1ad5e8cc47dbb91..c2882e6daf6c65e0b1b17dfd4bce999658600014 100644 (file)
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-/* Enable the watchdog */
-#define CONFIG_AT91SAM9_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-
 /*
  * Command line configuration.
  */
index 114b87e1b399e66412831877544ec51c518ac97c..28af575bf20339e5c7ba70a6370919db1f3ce86e 100644 (file)
        "root=/dev/nfs ip=dhcp nfsroot=${serverip}:/srv/nfs/rootfs; "   \
        "dhcp"
 
-/* Enable the watchdog */
-#define CONFIG_AT91SAM9_WATCHDOG
-#if !defined(CONFIG_SPL_BUILD)
-#define CONFIG_HW_WATCHDOG
-#endif
-#define CONFIG_AT91_HW_WDT_TIMEOUT     15
-
 #if !defined(CONFIG_SPL_BUILD)
 /* USB configuration */
 #define CONFIG_USB_ATMEL
index 4fdb0dd962e777d9d1cc3f53d824fa06cf2f4799..f283ab7fcab75d0496a7df7a248cf0238adecec2 100644 (file)
 #define CONFIG_RMII
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
-#define CONFIG_AT91SAM9_WATCHDOG
-#define CONFIG_AT91_HW_WDT_TIMEOUT     15
-#if !defined(CONFIG_SPL_BUILD)
-/* Enable the watchdog */
-#define CONFIG_HW_WATCHDOG
-#endif
-
 /* USB */
 #if defined(CONFIG_BOARD_TAURUS)
 #define CONFIG_USB_ATMEL
index 0627024e71c4bacf6374a898793f37d5fb8eee40..abfb0ff89fa988f5f65a44b9ff6a313ae43df0c2 100644 (file)
@@ -82,7 +82,6 @@ CONFIG_AT91SAM9G20EK_2MMC
 CONFIG_AT91SAM9G45EKES
 CONFIG_AT91SAM9G45_LCD_BASE
 CONFIG_AT91SAM9M10G45EK
-CONFIG_AT91SAM9_WATCHDOG
 CONFIG_AT91_CAN
 CONFIG_AT91_EFLASH
 CONFIG_AT91_GPIO_PULLUP