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

Unverified Commit 60b628ff authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2017-08-15' into devicetree/next 



This pull request brings in a new SMP enable-method compat string,
which is needed to move the 32-bit SMP boot code out of the irqchip.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents ad41eacc f29c2568

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ described below. 
			    "arm,realview-smp"

			    "brcm,bcm11351-cpu-method"

			    "brcm,bcm23550"

			    "brcm,bcm2836-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

arch/arm/boot/dts/bcm2836.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
	cpus: cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "brcm,bcm2836-smp";



		v7_cpu0: cpu@0 {

			device_type = "cpu";

arch/arm/boot/dts/bcm2837.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
	cpus: cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit



		cpu0: cpu@0 {

			device_type = "cpu";