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

Commit bf64dd26 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM: ux500: add an SMP enablement type and move cpu nodes 



The "cpus" node cannot be inside the "soc" node, while this
works for the CoreSight blocks, the early boot code will look
for "cpus" directly under the root node, so this is a hard
convention. So move the CPU nodes.

Augment the "reg" property to match what is actually in the
hardware: 0x300 and 0x301 respectively.

Then add an SMP enablement type to be used by the SMP init
code, "ste,dbx500-smp".

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent c1bfa985

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"



	- cpu-release-addr

		Usage: required for systems that have an "enable-method"

arch/arm/boot/dts/ste-dbx5x0.dtsi

+27 −26
Original line number Diff line number Diff line
@@ -15,16 +15,10 @@ 
#include "skeleton.dtsi"



/ {

	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "stericsson,db8500";

		interrupt-parent = <&intc>;

		ranges;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "ste,dbx500-smp";



		cpu-map {

			cluster0 {
@@ -36,18 +30,25 @@ 
				};

			};

		};

			CPU0: cpu@0 {

		CPU0: cpu@300 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

				reg = <0>;

			reg = <0x300>;

		};

			CPU1: cpu@1 {

		CPU1: cpu@301 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

				reg = <1>;

			reg = <0x301>;

		};

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "stericsson,db8500";

		interrupt-parent = <&intc>;

		ranges;



		ptm@801ae000 {

			compatible = "arm,coresight-etm3x", "arm,primecell";

			reg = <0x801ae000 0x1000>;