diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 13:06:15 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 13:06:15 -0800 |
| commit | 9cdac4a20a963d946f3ce13e6dd4943a780f5b54 (patch) | |
| tree | 81b0ed886ab6e9828b4dabd16167dc360c2a4522 /Documentation | |
| parent | f877df2bcf916ce76851b0f0a669512aa8183446 (diff) | |
| parent | 2608224c81a7d242a9b451b97011410b182f0da7 (diff) | |
| download | lwn-9cdac4a20a963d946f3ce13e6dd4943a780f5b54.tar.gz lwn-9cdac4a20a963d946f3ce13e6dd4943a780f5b54.zip | |
Merge tag 'v4.5-rockchip-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
SMP special case for the rk3036 and addition of the rk3228
quad-core Cortex-A7 cpu.
* tag 'v4.5-rockchip-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: enable support for RK3228 SoCs
ARM: rockchip: use const and __initconst for rk3036 smp_operations
ARM: rockchip: add support smp for rk3036
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/cpus.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index 3a07a87fef20..8fb074996caf 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -200,6 +200,7 @@ nodes to be present and contain the properties described below. "qcom,gcc-msm8660" "qcom,kpss-acc-v1" "qcom,kpss-acc-v2" + "rockchip,rk3036-smp" "rockchip,rk3066-smp" "ste,dbx500-smp" |