• Olof Johansson's avatar
    Merge tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi into next/soc · c8bc4dce
    Olof Johansson authored
    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: default avatarOlof Johansson <olof@lixom.net>
    c8bc4dce
Makefile 13.8 KB