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

This reverts commit 746f0770f916e6c48e422d6a34e67eae16707f0e.

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: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241029191131.2329414-1-peter.griffin@linaro.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b0010f5943f5e662950e52c7c23624e303a59692..1f1eae0e175ff85d13f52b2a1f3e04f741e51788 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 686cf544d0ae7a607f087a09c0ff6a64b3803158..349d30462c8c0c7c6a5e0f6fae071b2a052ca97f 100644 (file)
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -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,
-                                                "samsung,syscon-phandle");
+               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);