diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 05:20:10 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 05:21:04 (GMT) |
| commit | c8bc4dceb798fc18abd45ae7b7d9200009b1b2eb (patch) | |
| tree | 0be71a97ffb4850509f94ff609ae2c1c4df30a91 /scripts/recordmcount.pl | |
| parent | 0501414bd52409464a74d457b576c1666f2eb75c (diff) | |
| parent | c9a1df48a97ac9141540f177e4293a9966348f8c (diff) | |
| download | linux-c8bc4dceb798fc18abd45ae7b7d9200009b1b2eb.tar.xz | |
Merge tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi into next/soc
Merge "pull request for hisilicon hip04 soc and D01 board updates" from Wei Xu:
ARM: mach-hisi: Hisilicon hip04 soc and D01 board updates for 3.18
- Add the CONFIG_MCPM_QUAD_CLUSTER configuration to enlarge cluster number from 2 to 4
- Enable MCPM on HiP04 SoC
- Enable 16 cores on HiP04 SoC
- Add platform & Fabric controller devicetree binding document for HiP04 SoC
- Add hip04.dtsi & hip04-d01.dts for hip04 SoC platform and D01 board
- Enable HiP04 SoC in both hi3xxx_defconfig & multi_v7_defconfig
- Add the support of Hisilicon HiP04 debug uart
* tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi:
ARM: debug: add HiP04 debug uart
ARM: config: enable hisilicon hip04
ARM: dts: add hip04 dts
document: dt: add the binding on HiP04
ARM: hisi: enable HiP04
ARM: hisi: enable MCPM implementation
ARM: mcpm: support 4 clusters
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'scripts/recordmcount.pl')
0 files changed, 0 insertions, 0 deletions