diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 12:36:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 12:36:43 +0100 |
| commit | 3510c70df7694b282406020c51ccd67afc79dea5 (patch) | |
| tree | bca807dc1a917aeb7625d671e043ec085cc4645f /arch/arm | |
| parent | 321081f5f5ad40880d2a92dedd07052ea2a25516 (diff) | |
| parent | b77d43943ea83997c6c37b8831d1561981d499c5 (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 0f50d5d44345..ebcd2d2eef74 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -46,7 +46,6 @@ cpus { #address-cells = <1>; #size-cells = <0>; - enable-method = "rockchip,rk3066-smp"; rockchip,pmu = <&pmu>; cpu0: cpu@500 { |