diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-17 15:27:54 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-17 15:27:54 -0700 |
| commit | cb1110ca797812699fea5a8285dd668a16d5387e (patch) | |
| tree | a4ace2236b255a15c0cd7ff8d4ae8411627491b5 /arch/arm/boot/dts | |
| parent | 0d481d4187d05b253374bda9e146fa3bc17a9244 (diff) | |
| parent | 78bbca1a54bd05f7c7d38a306073a3ee7f866e51 (diff) | |
Merge tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/soc
From Rob Herring:
Highbank platform updates for 3.13
- convert Calxeda cpuidle driver to a platform driver and to use PSCI
- convert highbank smp_ops and suspend to PSCI
* tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dts: calxeda: add ARM PSCI binding
ARM: highbank: adapt to use ARM PSCI calls
ARM: PSCI: remove unnecessary include of arm-gic.h
cpuidle: calxeda: add support to use PSCI calls
ARM: highbank: cpuidle: convert to platform driver
cpuidle: calxeda: add cpu_pm_enter/exit calls
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/ecx-common.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ecx-common.dtsi b/arch/arm/boot/dts/ecx-common.dtsi index e8559b753c9d..bc22557d7a6a 100644 --- a/arch/arm/boot/dts/ecx-common.dtsi +++ b/arch/arm/boot/dts/ecx-common.dtsi @@ -19,6 +19,14 @@ bootargs = "console=ttyAMA0"; }; + psci { + compatible = "arm,psci"; + method = "smc"; + cpu_suspend = <0x84000002>; + cpu_off = <0x84000004>; + cpu_on = <0x84000006>; + }; + soc { #address-cells = <1>; #size-cells = <1>; |