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

Commit 19b06d7f authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: mvebu: add SMP support in the Armada 38x device tree 



This commit improves the Armada 38x Device Tree to add the CPU reset
and PMSU Device Tree nodes as well as the declaration of the enabling
method for the CPUs. These are needed to get SMP working on Armada 38x
platforms.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397483648-26611-12-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 42eae5a4

arch/arm/boot/dts/armada-380.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 
	cpus {

	cpus {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		#size-cells = <0>;

		enable-method = "marvell,armada-380-smp";



		cpu@0 {

		cpu@0 {

			device_type = "cpu";

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			compatible = "arm,cortex-a9";

arch/arm/boot/dts/armada-385.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 
	cpus {

	cpus {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		#size-cells = <0>;

		enable-method = "marvell,armada-380-smp";



		cpu@0 {

		cpu@0 {

			device_type = "cpu";

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			compatible = "arm,cortex-a9";

arch/arm/boot/dts/armada-38x.dtsi

+10 −0
Original line number Original line Diff line number Diff line
@@ -279,11 +279,21 @@ 
				clock-names = "nbclk", "fixed";

				clock-names = "nbclk", "fixed";

			};

			};





			cpurst@20800 {

				compatible = "marvell,armada-370-cpu-reset";

				reg = <0x20800 0x10>;

			};



			coherency-fabric@21010 {

			coherency-fabric@21010 {

				compatible = "marvell,armada-380-coherency-fabric";

				compatible = "marvell,armada-380-coherency-fabric";

				reg = <0x21010 0x1c>;

				reg = <0x21010 0x1c>;

			};

			};





			pmsu@22000 {

				compatible = "marvell,armada-380-pmsu";

				reg = <0x22000 0x1000>;

			};



			eth1: ethernet@30000 {

			eth1: ethernet@30000 {

				compatible = "marvell,armada-370-neta";

				compatible = "marvell,armada-370-neta";

				reg = <0x30000 0x4000>;

				reg = <0x30000 0x4000>;