All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v3 1/2] watchdog/denali: Adding DesignWare watchdog driver support
@ 2014-02-21 20:57 Chin Liang See
  2014-02-24  7:51 ` Michal Simek
  0 siblings, 1 reply; 4+ messages in thread
From: Chin Liang See @ 2014-02-21 20:57 UTC (permalink / raw)
  To: u-boot

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.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
---
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

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 06ced10..0276a10 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -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
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
new file mode 100644
index 0000000..cb88844
--- /dev/null
+++ b/drivers/watchdog/designware_wdt.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2013 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;
+	if (i > 15)
+		i = 15;
+	if (i < 0)
+		i = 0;
+
+	writel((i | (i<<4)), (CONFIG_DW_WDT_BASE + DW_WDT_TORR));
+	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)
+{
+	unsigned long val;
+	val = readl((CONFIG_DW_WDT_BASE + DW_WDT_CR));
+	return val & 0x1;
+}
+
+#if defined(CONFIG_HW_WATCHDOG)
+void hw_watchdog_reset(void)
+{
+	if (designware_wdt_is_enabled())
+		/* restart the watchdog counter */
+		writel(DW_WDT_CRR_RESTART_VAL,
+		      (CONFIG_DW_WDT_BASE + DW_WDT_CRR));
+}
+
+void hw_watchdog_init(void)
+{
+	/* reset to disable the watchdog */
+	hw_watchdog_reset();
+	/* set timer in miliseconds */
+	designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS);
+	/* enable the watchdog */
+	designware_wdt_enable();
+	/* reset the watchdog */
+	hw_watchdog_reset();
+}
+#endif
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH v3 1/2] watchdog/denali: Adding DesignWare watchdog driver support
  2014-02-21 20:57 [U-Boot] [PATCH v3 1/2] watchdog/denali: Adding DesignWare watchdog driver support Chin Liang See
@ 2014-02-24  7:51 ` Michal Simek
  2014-02-27 19:52   ` Chin Liang See
  0 siblings, 1 reply; 4+ messages in thread
From: Michal Simek @ 2014-02-24  7:51 UTC (permalink / raw)
  To: u-boot

On 02/21/2014 09:57 PM, Chin Liang See wrote:
> 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.
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Anatolij Gustschin <agust@denx.de>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Tom Rini <trini@ti.com>
> ---
> 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
> 

Checkpatch.
total: 0 errors, 1 warnings, 1 checks, 77 lines checked


> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 06ced10..0276a10 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -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
> diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
> new file mode 100644
> index 0000000..cb88844
> --- /dev/null
> +++ b/drivers/watchdog/designware_wdt.c
> @@ -0,0 +1,73 @@
> +/*
> + * Copyright (C) 2013 Altera Corporation <www.altera.com>

2014?


> + *
> + * 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;

you should separate variables from code.

Thanks,
Michal

-- 
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/20140224/10f94877/attachment.pgp>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH v3 1/2] watchdog/denali: Adding DesignWare watchdog driver support
  2014-02-24  7:51 ` Michal Simek
@ 2014-02-27 19:52   ` Chin Liang See
  2014-02-28 10:28     ` Michal Simek
  0 siblings, 1 reply; 4+ messages in thread
From: Chin Liang See @ 2014-02-27 19:52 UTC (permalink / raw)
  To: u-boot

Hi Michal,

On Mon, 2014-02-24 at 08:51 +0100, Michal Simek wrote:
> On 02/21/2014 09:57 PM, Chin Liang See wrote:
> > 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.
> > 
> > Signed-off-by: Chin Liang See <clsee@altera.com>
> > Cc: Anatolij Gustschin <agust@denx.de>
> > Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> > Cc: Heiko Schocher <hs@denx.de>
> > Cc: Tom Rini <trini@ti.com>
> > ---
> > 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
> > 
> 
> Checkpatch.
> total: 0 errors, 1 warnings, 1 checks, 77 lines checked

Fixed

> 
> 
> > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > index 06ced10..0276a10 100644
> > --- a/drivers/watchdog/Makefile
> > +++ b/drivers/watchdog/Makefile
> > @@ -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
> > diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
> > new file mode 100644
> > index 0000000..cb88844
> > --- /dev/null
> > +++ b/drivers/watchdog/designware_wdt.c
> > @@ -0,0 +1,73 @@
> > +/*
> > + * Copyright (C) 2013 Altera Corporation <www.altera.com>
> 
> 2014?

Oops, good catch. Fixed

> 
> 
> > + *
> > + * 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;
> 
> you should separate variables from code.

Actually I am trying to avoid to create a new header as its just few
simple defines.

Thanks
Chin Liang

> 
> Thanks,
> Michal
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH v3 1/2] watchdog/denali: Adding DesignWare watchdog driver support
  2014-02-27 19:52   ` Chin Liang See
@ 2014-02-28 10:28     ` Michal Simek
  0 siblings, 0 replies; 4+ messages in thread
From: Michal Simek @ 2014-02-28 10:28 UTC (permalink / raw)
  To: u-boot

On 02/27/2014 08:52 PM, Chin Liang See wrote:
> Hi Michal,
> 
> On Mon, 2014-02-24 at 08:51 +0100, Michal Simek wrote:
>> On 02/21/2014 09:57 PM, Chin Liang See wrote:
>>> 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.
>>>
>>> Signed-off-by: Chin Liang See <clsee@altera.com>
>>> Cc: Anatolij Gustschin <agust@denx.de>
>>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>>> Cc: Heiko Schocher <hs@denx.de>
>>> Cc: Tom Rini <trini@ti.com>
>>> ---
>>> 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
>>>
>>
>> Checkpatch.
>> total: 0 errors, 1 warnings, 1 checks, 77 lines checked
> 
> Fixed
> 
>>
>>
>>> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
>>> index 06ced10..0276a10 100644
>>> --- a/drivers/watchdog/Makefile
>>> +++ b/drivers/watchdog/Makefile
>>> @@ -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
>>> diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
>>> new file mode 100644
>>> index 0000000..cb88844
>>> --- /dev/null
>>> +++ b/drivers/watchdog/designware_wdt.c
>>> @@ -0,0 +1,73 @@
>>> +/*
>>> + * Copyright (C) 2013 Altera Corporation <www.altera.com>
>>
>> 2014?
> 
> Oops, good catch. Fixed
> 
>>
>>
>>> + *
>>> + * 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;
>>
>> you should separate variables from code.
> 
> Actually I am trying to avoid to create a new header as its just few
> simple defines.

don't get you. I just thought to add one more blank line below this
line.

Thanks,
Michal



-- 
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/88b8df8b/attachment.pgp>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-02-28 10:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-21 20:57 [U-Boot] [PATCH v3 1/2] watchdog/denali: Adding DesignWare watchdog driver support Chin Liang See
2014-02-24  7:51 ` Michal Simek
2014-02-27 19:52   ` Chin Liang See
2014-02-28 10:28     ` Michal Simek

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.