Unverified Commit bda649b9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v6.4-tag1' of... 

Merge tag 'renesas-arm-soc-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/arm

Renesas ARM SoC updates for v6.4

  - Use of_cpu_node_to_id() to read CPU node 'reg'.

* tag 'renesas-arm-soc-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: sh-mobile: Use of_cpu_node_to_id() to read CPU node 'reg'

Link: https://lore.kernel.org/r/cover.1681113113.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a8739ac1 6050cb1c

arch/arm/mach-shmobile/platsmp-apmu.c

+16 −20
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/smp.h>

#include <linux/suspend.h>
@@ -210,7 +211,6 @@ static void apmu_parse_dt(void (*fn)(struct resource *res, int cpu, int bit)) 
	struct device_node *np_apmu, *np_cpu;

	struct resource res;

	int bit, index;

	u32 id;



	for_each_matching_node(np_apmu, apmu_ids) {

		/* only enable the cluster that includes the boot CPU */
@@ -218,36 +218,32 @@ static void apmu_parse_dt(void (*fn)(struct resource *res, int cpu, int bit)) 


		for (bit = 0; bit < CONFIG_NR_CPUS; bit++) {

			np_cpu = of_parse_phandle(np_apmu, "cpus", bit);

			if (np_cpu) {

				if (!of_property_read_u32(np_cpu, "reg", &id)) {

					if (id == cpu_logical_map(0)) {

			if (!np_cpu)

				break;

			if (of_cpu_node_to_id(np_cpu) == 0) {

				is_allowed = true;

				of_node_put(np_cpu);

				break;

			}



				}

			of_node_put(np_cpu);

		}

		}

		if (!is_allowed)

			continue;



		for (bit = 0; bit < CONFIG_NR_CPUS; bit++) {

			np_cpu = of_parse_phandle(np_apmu, "cpus", bit);

			if (np_cpu) {

				if (!of_property_read_u32(np_cpu, "reg", &id)) {

					index = get_logical_index(id);

			if (!np_cpu)

				break;



			index = of_cpu_node_to_id(np_cpu);

			if ((index >= 0) &&

					    !of_address_to_resource(np_apmu,

								    0, &res))

			    !of_address_to_resource(np_apmu, 0, &res))

				fn(&res, index, bit);

				}



			of_node_put(np_cpu);

		}

	}

}

}



static void __init shmobile_smp_apmu_setup_boot(void)

{