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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by Linus Walleij and committed by Olof Johansson bf64dd26 c1bfa985

+28 -26
+1
Documentation/devicetree/bindings/arm/cpus.txt
··· 199 "qcom,kpss-acc-v1" 200 "qcom,kpss-acc-v2" 201 "rockchip,rk3066-smp" 202 203 - cpu-release-addr 204 Usage: required for systems that have an "enable-method"
··· 199 "qcom,kpss-acc-v1" 200 "qcom,kpss-acc-v2" 201 "rockchip,rk3066-smp" 202 + "ste,dbx500-smp" 203 204 - cpu-release-addr 205 Usage: required for systems that have an "enable-method"
+27 -26
arch/arm/boot/dts/ste-dbx5x0.dtsi
··· 15 #include "skeleton.dtsi" 16 17 / { 18 soc { 19 #address-cells = <1>; 20 #size-cells = <1>; 21 compatible = "stericsson,db8500"; 22 interrupt-parent = <&intc>; 23 ranges; 24 - 25 - cpus { 26 - #address-cells = <1>; 27 - #size-cells = <0>; 28 - 29 - cpu-map { 30 - cluster0 { 31 - core0 { 32 - cpu = <&CPU0>; 33 - }; 34 - core1 { 35 - cpu = <&CPU1>; 36 - }; 37 - }; 38 - }; 39 - CPU0: cpu@0 { 40 - device_type = "cpu"; 41 - compatible = "arm,cortex-a9"; 42 - reg = <0>; 43 - }; 44 - CPU1: cpu@1 { 45 - device_type = "cpu"; 46 - compatible = "arm,cortex-a9"; 47 - reg = <1>; 48 - }; 49 - }; 50 51 ptm@801ae000 { 52 compatible = "arm,coresight-etm3x", "arm,primecell";
··· 15 #include "skeleton.dtsi" 16 17 / { 18 + cpus { 19 + #address-cells = <1>; 20 + #size-cells = <0>; 21 + enable-method = "ste,dbx500-smp"; 22 + 23 + cpu-map { 24 + cluster0 { 25 + core0 { 26 + cpu = <&CPU0>; 27 + }; 28 + core1 { 29 + cpu = <&CPU1>; 30 + }; 31 + }; 32 + }; 33 + CPU0: cpu@300 { 34 + device_type = "cpu"; 35 + compatible = "arm,cortex-a9"; 36 + reg = <0x300>; 37 + }; 38 + CPU1: cpu@301 { 39 + device_type = "cpu"; 40 + compatible = "arm,cortex-a9"; 41 + reg = <0x301>; 42 + }; 43 + }; 44 + 45 soc { 46 #address-cells = <1>; 47 #size-cells = <1>; 48 compatible = "stericsson,db8500"; 49 interrupt-parent = <&intc>; 50 ranges; 51 52 ptm@801ae000 { 53 compatible = "arm,coresight-etm3x", "arm,primecell";