Merge tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Pull "temporarily disable rk3288-smp" from Heiko Stuebner: Disable smp again on rk3288 temporarily to make Olof's boottest run again, until the patches for using the physical architected timers got accepted. * tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: temporarily disable smp on rk3288 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -46,7 +46,6 @@
|
||||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "rockchip,rk3066-smp";
|
||||
rockchip,pmu = <&pmu>;
|
||||
|
||||
cpu0: cpu@500 {
|
||||
|
||||
Reference in New Issue
Block a user