Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Peter Griffin and committed by
Wim Van Sebroeck
ccfb7659 bad201b2

+5 -4
+1
drivers/watchdog/Kconfig
··· 557 557 tristate "S3C6410/S5Pv210/Exynos Watchdog" 558 558 depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST 559 559 select WATCHDOG_CORE 560 + select MFD_SYSCON if ARCH_EXYNOS 560 561 help 561 562 Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos 562 563 SoCs. This will reboot the system when the timer expires with
+4 -4
drivers/watchdog/s3c2410_wdt.c
··· 24 24 #include <linux/slab.h> 25 25 #include <linux/err.h> 26 26 #include <linux/of.h> 27 + #include <linux/mfd/syscon.h> 27 28 #include <linux/regmap.h> 28 29 #include <linux/delay.h> 29 - #include <linux/soc/samsung/exynos-pmu.h> 30 30 31 31 #define S3C2410_WTCON 0x00 32 32 #define S3C2410_WTDAT 0x04 ··· 699 699 return ret; 700 700 701 701 if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { 702 - wdt->pmureg = exynos_get_pmu_regmap_by_phandle(dev->of_node, 703 - "samsung,syscon-phandle"); 702 + wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, 703 + "samsung,syscon-phandle"); 704 704 if (IS_ERR(wdt->pmureg)) 705 705 return dev_err_probe(dev, PTR_ERR(wdt->pmureg), 706 - "PMU regmap lookup failed.\n"); 706 + "syscon regmap lookup failed.\n"); 707 707 } 708 708 709 709 wdt_irq = platform_get_irq(pdev, 0);