From ebfc33f744eb725225d46a7920962d12a2b9c435 Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Wed, 24 May 2017 18:16:53 +0800 Subject: [PATCH] MLK-14960-1: watchdog: imx2_wdt: remove wdog_b ext_reset used instead of wdog_b on v4.9, no need wdog_b anymore. Signed-off-by: Robin Gong --- drivers/watchdog/imx2_wdt.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 873c4e0a21fb..93ccdb35c44f 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -3,6 +3,7 @@ * * Copyright (C) 2010 Wolfram Sang, Pengutronix e.K. * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright 2017 NXP. * * some parts adapted by similar drivers from Darius Augulis and Vladimir * Zapolskiy, additional improvements by Wim Van Sebroeck. @@ -68,7 +69,6 @@ struct imx2_wdt_device { struct regmap *regmap; struct watchdog_device wdog; bool ext_reset; - bool wdog_b; }; static bool nowayout = WATCHDOG_NOWAYOUT; @@ -108,10 +108,6 @@ static int imx2_wdt_restart(struct watchdog_device *wdog, unsigned long action, /* Assert SRS signal */ regmap_write(wdev->regmap, IMX2_WDT_WCR, wcr_enable); - /* Assert WDOG_B signal */ - if (wdev->wdog_b) - wcr_enable = 0x14; - /* * Due to imx6q errata ERR004346 (WDOG: WDOG SRS bit requires to be * written twice), we add another two writes to ensure there must be at @@ -260,7 +256,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) void __iomem *base; int ret; u32 val; - struct device_node *of_node = pdev->dev.of_node; wdev = devm_kzalloc(&pdev->dev, sizeof(*wdev), GFP_KERNEL); if (!wdev) @@ -284,11 +279,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) return PTR_ERR(wdev->clk); } - if (of_get_property(of_node, "fsl,wdog_b", NULL)) { - wdev->wdog_b = true; - dev_info(&pdev->dev, "use WDOG_B to reboot.\n"); - } - wdog = &wdev->wdog; wdog->info = &imx2_wdt_info; wdog->ops = &imx2_wdt_ops; -- 2.17.1