Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c7685a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull Devicetree fixes from Rob Herring:

 - fix cpu node iterator for powerpc systems

 - clarify ARM CPU binding 'capacities-dmips-mhz' property calculations

* tag 'devicetree-fixes-for-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: Fix cpu node iterator to not ignore disabled cpu nodes
  dt-bindings: arm: Explain capacities-dmips-mhz calculations in example
parents b5b1de35 c961cb3b

Documentation/devicetree/bindings/arm/cpu-capacity.txt

+5 −3
Original line number Diff line number Diff line
@@ -59,9 +59,11 @@ mhz values (normalized w.r.t. the highest value found while parsing the DT). 
===========================================



Example 1 (ARM 64-bit, 6-cpu system, two clusters):

capacities-dmips-mhz are scaled w.r.t. 1024 (cpu@0 and cpu@1)

supposing cluster0@max-freq=1100 and custer1@max-freq=850,

final capacities are 1024 for cluster0 and 446 for cluster1

The capacities-dmips-mhz or DMIPS/MHz values (scaled to 1024)

are 1024 and 578 for cluster0 and cluster1. Further normalization

is done by the operating system based on cluster0@max-freq=1100 and

custer1@max-freq=850, final capacities are 1024 for cluster0 and

446 for cluster1 (576*850/1100).



cpus {

	#address-cells = <2>;

drivers/of/base.c

+0 −2
Original line number Diff line number Diff line
@@ -777,8 +777,6 @@ struct device_node *of_get_next_cpu_node(struct device_node *prev) 
		if (!(of_node_name_eq(next, "cpu") ||

		      (next->type && !of_node_cmp(next->type, "cpu"))))

			continue;

		if (!__of_device_is_available(next))

			continue;

		if (of_node_get(next))

			break;

	}