Skip to content

Commit 27994cb

Browse files
committed
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>
2 parents 5ca2653 + cb56f50 commit 27994cb

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

arch/arm/mach-exynos/exynos.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@ void __init exynos_sysram_init(void)
5050
struct device_node *node;
5151

5252
for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram") {
53+
struct resource res;
5354
if (!of_device_is_available(node))
5455
continue;
55-
sysram_base_addr = of_iomap(node, 0);
56-
sysram_base_phys = of_translate_address(node,
57-
of_get_address(node, 0, NULL, NULL));
56+
57+
of_address_to_resource(node, 0, &res);
58+
sysram_base_addr = ioremap(res.start, resource_size(&res));
59+
sysram_base_phys = res.start;
5860
of_node_put(node);
5961
break;
6062
}

arch/arm/mach-exynos/suspend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ void __init exynos_pm_init(void)
667667
return;
668668
}
669669

670-
if (WARN_ON(!of_find_property(np, "interrupt-controller", NULL))) {
670+
if (WARN_ON(!of_property_read_bool(np, "interrupt-controller"))) {
671671
pr_warn("Outdated DT detected, suspend/resume will NOT work\n");
672672
of_node_put(np);
673673
return;

0 commit comments

Comments
 (0)