Unverified Commit 27994cb0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-6.4' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 5ca26530 cb56f508

arch/arm/mach-exynos/exynos.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

	}

arch/arm/mach-exynos/suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -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;