Commit ccfb7659 authored by Peter Griffin's avatar Peter Griffin Committed by Wim Van Sebroeck
Browse files

Revert "watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs" 



This reverts commit 746f0770.

Now that we can register a SoC specific regmap with syscon using
of_syscon_register_regmap() api we can switch back to using
syscon_regmap_lookup_by_phandle() in the client drivers.

Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Reviewed-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241029191131.2329414-1-peter.griffin@linaro.org


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent bad201b2

drivers/watchdog/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ config S3C2410_WATCHDOG 
	tristate "S3C6410/S5Pv210/Exynos Watchdog"

	depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST

	select WATCHDOG_CORE

	select MFD_SYSCON if ARCH_EXYNOS

	help

	  Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos

	  SoCs. This will reboot the system when the timer expires with

drivers/watchdog/s3c2410_wdt.c

+4 −4
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <linux/slab.h>

#include <linux/err.h>

#include <linux/of.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>

#include <linux/delay.h>

#include <linux/soc/samsung/exynos-pmu.h>



#define S3C2410_WTCON		0x00

#define S3C2410_WTDAT		0x04
@@ -699,11 +699,11 @@ static int s3c2410wdt_probe(struct platform_device *pdev) 
		return ret;



	if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) {

		wdt->pmureg = exynos_get_pmu_regmap_by_phandle(dev->of_node,

		wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node,

						"samsung,syscon-phandle");

		if (IS_ERR(wdt->pmureg))

			return dev_err_probe(dev, PTR_ERR(wdt->pmureg),

					     "PMU regmap lookup failed.\n");

					     "syscon regmap lookup failed.\n");

	}



	wdt_irq = platform_get_irq(pdev, 0);