mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 20:58:14 -04:00
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: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -36,6 +36,7 @@ timer {
|
||||
cpus: cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "brcm,bcm2836-smp";
|
||||
|
||||
v7_cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
||||
@@ -30,6 +30,7 @@ timer {
|
||||
cpus: cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
||||
Reference in New Issue
Block a user