1. 31 7月, 2014 3 次提交
  2. 28 7月, 2014 7 次提交
  3. 27 7月, 2014 2 次提交
    • A
      Merge tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu into next/soc · 39fbf984
      Arnd Bergmann 提交于
      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: NArnd Bergmann <arnd@arndb.de>
      39fbf984
    • A
      Merge branch 'cleanup/gpio-header-removal' into next/soc · dffd7e35
      Arnd Bergmann 提交于
      * cleanup/gpio-header-removal:
        ARM: delete old reference to ARM_GPIOLIB_COMPLEX
        ARM: kill CONFIG_NEED_MACH_GPIO_H
        ARM: mach-s5p: get rid of all <mach/gpio.h> headers
        ARM: s5p: cut the custom ARCH_NR_GPIOS definition
      
      This resolves a massive amount of conflicts between the
      mach/gpio.h removal and the s5p platform removal.
      
      Almost all changes are trivial, as both sides remove
      stuff.
      
      Conflicts:
      	arch/arm/Kconfig
      	arch/arm/mach-s5p64x0/common.c
      	arch/arm/mach-s5p64x0/dev-audio.c
      	arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
      	arch/arm/mach-s5p64x0/mach-smdk6440.c
      	arch/arm/mach-s5p64x0/mach-smdk6450.c
      	arch/arm/mach-s5p64x0/setup-fb-24bpp.c
      	arch/arm/mach-s5p64x0/setup-i2c0.c
      	arch/arm/mach-s5p64x0/setup-i2c1.c
      	arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
      	arch/arm/mach-s5p64x0/setup-spi.c
      	arch/arm/mach-s5pc100/dev-audio.c
      	arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
      	arch/arm/mach-s5pc100/mach-smdkc100.c
      	arch/arm/mach-s5pc100/setup-fb-24bpp.c
      	arch/arm/mach-s5pc100/setup-i2c0.c
      	arch/arm/mach-s5pc100/setup-i2c1.c
      	arch/arm/mach-s5pc100/setup-ide.c
      	arch/arm/mach-s5pc100/setup-keypad.c
      	arch/arm/mach-s5pc100/setup-sdhci-gpio.c
      	arch/arm/mach-s5pc100/setup-spi.c
      	arch/arm/mach-s5pv210/dev-audio.c
      	arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
      	arch/arm/mach-s5pv210/mach-aquila.c
      	arch/arm/mach-s5pv210/mach-goni.c
      	arch/arm/mach-s5pv210/mach-smdkv210.c
      	arch/arm/mach-s5pv210/setup-fb-24bpp.c
      	arch/arm/mach-s5pv210/setup-fimc.c
      	arch/arm/mach-s5pv210/setup-i2c0.c
      	arch/arm/mach-s5pv210/setup-i2c1.c
      	arch/arm/mach-s5pv210/setup-i2c2.c
      	arch/arm/mach-s5pv210/setup-ide.c
      	arch/arm/mach-s5pv210/setup-keypad.c
      	arch/arm/mach-s5pv210/setup-sdhci-gpio.c
      	arch/arm/mach-s5pv210/setup-spi.c
      	arch/arm/plat-samsung/Kconfig
      	arch/arm/plat-samsung/s5p-irq-eint.c
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      dffd7e35
  4. 26 7月, 2014 9 次提交
  5. 25 7月, 2014 4 次提交
  6. 24 7月, 2014 15 次提交