Commit 60b628ff authored by Florian Fainelli's avatar Florian Fainelli

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
...@@ -200,6 +200,7 @@ described below. ...@@ -200,6 +200,7 @@ described below.
"arm,realview-smp" "arm,realview-smp"
"brcm,bcm11351-cpu-method" "brcm,bcm11351-cpu-method"
"brcm,bcm23550" "brcm,bcm23550"
"brcm,bcm2836-smp"
"brcm,bcm-nsp-smp" "brcm,bcm-nsp-smp"
"brcm,brahma-b15" "brcm,brahma-b15"
"marvell,armada-375-smp" "marvell,armada-375-smp"
......
...@@ -36,6 +36,7 @@ timer { ...@@ -36,6 +36,7 @@ timer {
cpus: cpus { cpus: cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "brcm,bcm2836-smp";
v7_cpu0: cpu@0 { v7_cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
...@@ -30,6 +30,7 @@ timer { ...@@ -30,6 +30,7 @@ timer {
cpus: cpus { cpus: cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit
cpu0: cpu@0 { cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment