diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 14:00:47 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 14:00:47 +0200 |
| commit | 27994cb07cca9203e9d5d6b9465e1e193ec0889a (patch) | |
| tree | c2d52888a81654477e0c2bbd2c863e6cb0608c91 /arch/arm | |
| parent | 5ca2653011a4f4217ebd16144ddd5c2dca177cc0 (diff) | |
| parent | cb56f508e541036ad41cb9a5afb46339b2f83b9f (diff) | |
Merge tag 'samsung-soc-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/arm
Samsung mach/soc changes for v6.4
Cleanup of OF-related functions: use of_property_read_bool() for reading
bool and of_address_to_resource() for mapping MMIO.
* tag 'samsung-soc-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: EXYNOS: Use of_address_to_resource()
ARM: exynos: Use of_property_read_bool() for boolean properties
Link: https://lore.kernel.org/r/20230405080438.156805-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-exynos/exynos.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/suspend.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 51a247ca4da8..966a0995e047 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -50,11 +50,13 @@ void __init exynos_sysram_init(void) struct device_node *node; for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram") { + struct resource res; if (!of_device_is_available(node)) continue; - sysram_base_addr = of_iomap(node, 0); - sysram_base_phys = of_translate_address(node, - of_get_address(node, 0, NULL, NULL)); + + of_address_to_resource(node, 0, &res); + sysram_base_addr = ioremap(res.start, resource_size(&res)); + sysram_base_phys = res.start; of_node_put(node); break; } diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index 3bf14ca78b62..6d5d7696aaf7 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -667,7 +667,7 @@ void __init exynos_pm_init(void) return; } - if (WARN_ON(!of_find_property(np, "interrupt-controller", NULL))) { + if (WARN_ON(!of_property_read_bool(np, "interrupt-controller"))) { pr_warn("Outdated DT detected, suspend/resume will NOT work\n"); of_node_put(np); return; |