watchdog: ar9344-wdt: disable watchdog in probe
Subsystems (2)
PATCH 1/2 watchdog: ar9344-wdt: disable watchdog in probe
This should avoid of triggering reset if we boot barebox from barebox.
Signed-off-by Oleksij Rempel <[email protected]>
--- drivers/watchdog/ar9344_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/ar9344_wdt.c +2 -0
@@ -101,6 +101,8 @@ static int ar9344_wdt_probe(struct device_d *dev) dev->priv = priv;ar9344_watchdog_detect_reset_source (priv); +/* disable watchdog on probe */ +iowrite32be (0 , priv->base +AR9344_WD_REG_CTRL ); priv->clk =clk_get (dev,NULL );if (IS_ERR (priv->clk)) {
Signature · 7 lines
2.14.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/2 MIPS: dts: enable heartbeat led for ar9331-dptechnics-dpt-module
Signed-off-by Oleksij Rempel <[email protected]>
--- arch/mips/dts/ar9331-dptechnics-dpt-module.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/dts/ar9331-dptechnics-dpt-module.dts +6 -0
@@ -12,6 +12,12 @@ device-path = &spiflash, "partname:barebox-environment"; }; }; + + leds { + system { + barebox,default-trigger = "heartbeat"; + }; + }; }; &spiflash {
Signature · 7 lines
2.14.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedRe: [PATCH v1 2/2] MIPS: dts: enable heartbeat led for ar9331-dptechnics-dpt-module
Quoted 5 lines · Oleksij Rempel
Signed-off-by Oleksij Rempel <[email protected]>--- arch/mips/dts/ar9331-dptechnics-dpt-module.dts | 6 ++++++ 1 file changed, 6 insertions(+)
Applied, thanks
Sascha
Quoted 26 lines
arch/mips/dts/ar9331-dptechnics-dpt-module.dts +6
-0@@ -12,6 +12,12 @@ device-path = &spiflash, "partname:barebox-environment"; }; }; + + leds { + system { + barebox,default-trigger = "heartbeat"; + }; + }; }; &spiflash {Signature · 7 lines
2.14.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 13 lines · Oleksij Rempel
This should avoid of triggering reset if we boot barebox from barebox.
Signed-off-by Oleksij Rempel <[email protected]>--- drivers/watchdog/ar9344_wdt.c | 2 ++ 1 file changed, 2 insertions(+)drivers/watchdog/ar9344_wdt.c +0
-0
drivers/watchdog/ar9344_wdt.c static int ar9344_wdt_probe(struct device_d *dev) · line 105
Quoted 5 lines
drivers/watchdog/ar9344_wdt.c +2
-0@@ -101,6 +101,8 @@ static int ar9344_wdt_probe(struct device_d *dev) dev->priv = priv;ar9344_watchdog_detect_reset_source (priv); +/* disable watchdog on probe */ +iowrite32be (0 , priv->base +AR9344_WD_REG_CTRL );
Do we really want this? I would assume that if the watchdog is enabled here, then it is enabled on purpose and disabling it just bypasses this purpose.
Sascha
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox