• Arnd Bergmann's avatar
    Merge tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu into next/soc · 39fbf984
    Arnd Bergmann authored
    Merge "mvebu SoC changes for v3.17 (round 4)" from Jason Cooper:
    
     - Armada XP
        - Fix return value check in pmsu code
        - Document URLs for new public datasheets (Thanks, Marvell & free-electrons!)
    
     - Armada 370/38x
        - Add cpuidle support
    
     - mvebu
        - Fix build when no platforms are selected
        - Update EBU SoC status in docs
    
    * tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu: (21 commits)
      Documentation: arm: misc updates to Marvell EBU SoC status
      Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
      ARM: mvebu: fix build without platforms selected
      ARM: mvebu: add cpuidle support for Armada 38x
      ARM: mvebu: add cpuidle support for Armada 370
      cpuidle: mvebu: add Armada 38x support
      cpuidle: mvebu: add Armada 370 support
      cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
      ARM: mvebu: export the SCU address
      ARM: mvebu: make the snoop disabling optional in mvebu_v7_pmsu_idle_prepare()
      ARM: mvebu: use a local variable to store the resume address
      ARM: mvebu: make the cpuidle initialization more generic
      ARM: mvebu: rename the armada_370_xp symbols to mvebu_v7 in pmsu.c
      ARM: mvebu: use the common function for Armada 375 SMP workaround
      ARM: mvebu: add a common function for the boot address work around
      ARM: mvebu: sort the #include of pmsu.c in alphabetic order
      ARM: mvebu: split again armada_370_xp_pmsu_idle_enter() in PMSU code
      ARM: mvebu: fix return value check in armada_xp_pmsu_cpufreq_init()
      clk: mvebu: extend clk-cpu for dynamic frequency scaling
      ARM: mvebu: extend PMSU code to support dynamic frequency scaling
      ...
    
    Conflicts:
    	arch/arm/mach-mvebu/Kconfig
    	drivers/cpuidle/cpuidle-armada-370-xp.c
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    39fbf984
Kconfig.arm 1.82 KB