[PATCH 1/2] fixup! watchdog: add designware driver

[PATCH 1/2] fixup! watchdog: add designware driver

[Steffen Trumtrar]

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 drivers/watchdog/dw_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index fa2752896c2f..8fd8c81e6c38 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -151,7 +151,7 @@ static int dw_wdt_drv_probe(struct device_d *dev)
 	if (ret)
 		return ret;
 
-	dw_wdt->rst = reset_control_get(dev, "dw-wdt");
+	dw_wdt->rst = reset_control_get(dev, NULL);
 	if (IS_ERR(dw_wdt->rst))
 		dev_warn(dev, "No reset lines. Will not be able to stop once started.\n");
 
-- 
2.10.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] fixup! ARM: socfpga: dtsi: add dw-wdt reset lines

[Steffen Trumtrar]

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/dts/socfpga.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 66d7f21dc6a3..5b141c23914c 100644
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -52,10 +52,8 @@
 
 &watchdog0 {
 	resets = <&rst L4WD0_RESET>;
-	reset-names = "dw-wdt";
 };
 
 &watchdog1 {
 	resets = <&rst L4WD1_RESET>;
-	reset-names = "dw-wdt";
 };
-- 
2.10.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] fixup! watchdog: add designware driver

[Sascha Hauer]

On Tue, Nov 01, 2016 at 10:52:26AM +0100, Steffen Trumtrar wrote:
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  drivers/watchdog/dw_wdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Squashed into the original commits, thanks

Sascha

> 
> diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
> index fa2752896c2f..8fd8c81e6c38 100644
> --- a/drivers/watchdog/dw_wdt.c
> +++ b/drivers/watchdog/dw_wdt.c
> @@ -151,7 +151,7 @@ static int dw_wdt_drv_probe(struct device_d *dev)
>  	if (ret)
>  		return ret;
>  
> -	dw_wdt->rst = reset_control_get(dev, "dw-wdt");
> +	dw_wdt->rst = reset_control_get(dev, NULL);
>  	if (IS_ERR(dw_wdt->rst))
>  		dev_warn(dev, "No reset lines. Will not be able to stop once started.\n");
>  
> -- 
> 2.10.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox