diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-12-04 23:33:38 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-12-04 23:34:06 -0800 |
| commit | 08bcc754c380da2c99efd61d687de033e1142fbb (patch) | |
| tree | 2da35e9b180224dbfcaeafa87ccd30b285e202e1 /arch/arm/boot | |
| parent | Merge branch 'clocksource/physical-timers' into next/dt (diff) | |
| download | linux-dev-08bcc754c380da2c99efd61d687de033e1142fbb.tar.xz linux-dev-08bcc754c380da2c99efd61d687de033e1142fbb.zip | |
Revert "ARM: dts: rockchip: temporarily disable smp on rk3288"
We now have the physical-timers patches lined up as a dependency in this same
branch, so we can revert the temporary disablement.
This reverts commit b77d43943ea83997c6c37b8831d1561981d499c5.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index acb6a2fba183..8313077b75a7 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -47,6 +47,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "rockchip,rk3066-smp"; rockchip,pmu = <&pmu>; cpu0: cpu@500 { |