1. 31 Jul, 2014 2 commits
  2. 28 Jul, 2014 7 commits
  3. 26 Jul, 2014 11 commits
    • 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
    • Arnd Bergmann's avatar
      Merge branch 'cleanup/gpio-header-removal' into next/soc · dffd7e35
      Arnd Bergmann authored
      * 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: default avatarArnd Bergmann <arnd@arndb.de>
      dffd7e35
    • Arnd Bergmann's avatar
      Merge branch 'next/fixes-non-critical' into next/soc · 944483d0
      Arnd Bergmann authored
      This resolves a nontrivial conflict against a bug fix
      in another branch.
      
      Conflicts:
      	arch/arm/mach-exynos/pm.c
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      944483d0
    • Arnd Bergmann's avatar
      Merge tag 'v3.17-rockchip-smp-hotplug' of... · 03eea7cd
      Arnd Bergmann authored
      Merge tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
      
      Merge "CPU-Hotplug support for RK3066 and RK3188" from Heiko Stuebner:
      
      * tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: rockchip: Add cpu hotplug support for RK3XXX SoCs
        ARM: rockchip: select ARMv7 compiler flags for platsmp.o
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      03eea7cd
    • Arnd Bergmann's avatar
      Merge tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi into next/soc · 71b4807a
      Arnd Bergmann authored
      Merge "update MAINTAINERS to add Hisilicon SoC maintainer" from Wei Xu:
      
      * tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi:
        MAINTAINERS:ARM:hisi: add Hisilicon SoC family
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      71b4807a
    • Arnd Bergmann's avatar
      Merge tag 's5pv210-dt' of... · 96bda115
      Arnd Bergmann authored
      Merge tag 's5pv210-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
      
      Merge "Samsung S5PV210 DT support for v3.17" from Kukjin Kim:
      
      - support common clock framework for s5pv210 clock
      - add generic PHY driver on s5pv210 to support it via DT
      - add dt support for s5pv210-goni, smdkc110, smdkv210 and torbreck boards
      - remove board files from mach-s5pv210 and unused codes
      - enable multiplatform for s5pv210
      
      * tag 's5pv210-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        clk: samsung: s5pv210: Remove legacy board support
        ARM: SAMSUNG: Remove remaining legacy code
        gpio: samsung: Remove legacy support of S5PV210
        ARM: S5PV210: Enable multi-platform build support
        cpufreq: s5pv210: Make the driver multiplatform aware
        ARM: S5PV210: Register cpufreq platform device
        ARM: S5PV210: move debug-macro.S into the common space
        ARM: S5PV210: Untie PM support from legacy code
        ARM: S5PV210: Remove support for board files
        ARM: dts: Add Device tree for s5pc110/s5pv210 boards
        ARM: dts: Add Device tree for s5pv210 SoC
        ARM: S5PV210: Add board file for boot using Device Tree
        phy: Add support for S5PV210 to the Exynos USB 2.0 PHY driver
        clk: samsung: Add S5PV210 Audio Subsystem clock driver
        ARM: SAMSUNG: Remove legacy clock code
        serial: samsung: Remove support for legacy clock code
        cpufreq: s3c24xx: Remove some dead code
        ARM: S5PV210: Migrate clock handling to Common Clock Framework
        clk: samsung: Add clock driver for S5PV210 and compatible SoCs
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      96bda115
    • Arnd Bergmann's avatar
      Merge tag 'power-exynos' of... · 8e5655cd
      Arnd Bergmann authored
      Merge tag 'power-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
      
      Merge "Samsung power management related updates for v3.17" from Kukjin Kim
      
      - support cluster power off on exynos5420 and exynos5800
        to save power.
      - use PMU address via DT to remove PMU static mapping
      - remove exynos_cpuidle_init() and exynos_cpufreq_init()
      
      * Note that this is including tags/samsung-cleanup and
      tags/exynos-cpuidle are already merged into arm-soc.
      
      * tag 'power-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Move cpufreq and cpuidle device registration to init_machine
        ARM: EXYNOS: Refactored code for using PMU address via DT
        ARM: EXYNOS: Support cluster power off on exynos5420/5800
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      8e5655cd
    • Arnd Bergmann's avatar
      Merge branches 'samsung/cleanup' and 'samsung/s5p-cleanup-v2', tag 'v3.16-rc6' into next/soc · f169f400
      Arnd Bergmann authored
      The following samsung branches are based on these cleanups,
      which are already in mainline before this branch gets pulled.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f169f400
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.17/fixes-not-urgent-signed' of... · fd9f5edf
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.17/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
      
      Merge non-urgent omap fixes from Tony Lindgren:
      
      Fixes for omaps that were not considered urgent enough for the
      rc series. Mostly a fix for GPMC allocation and omap5 ABB
      (Adaptive Body Bias).
      
      * tag 'omap-for-v3.17/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: omap2+: gpmc-nand: Use dynamic platform_device_alloc()
        omap16xx: Removes fixme no longer needed in ocpi_enable()
        ARM: dts: OMAP5: Add device nodes for ABB
        ARM: omap2+: usb-tusb6010.c: Cleaning up variable is set more than once
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      fd9f5edf
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.17/soc-new' of... · 0081b77d
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      Merge "SoC related changes for omaps for v3.17 merge window"
      from Tony Lindgren:
      
      - Add device tree and hwmod data for various devices
        for new SoCs
      
      - Remove legacy mailbox hwmod data that's no longer
        needed for SoCs that are DT only. Note that this may
        cause a minor merge conflict in mach-omap2/devices.c
        with omap_init_mbox() and omap_init_hdmi_audio(), both
        are legacy code that is getting removed
      
      * tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: DRA7: hwmod: Add data for RTC
        arm: dra7xx: Add hwmod data for MDIO and CPSW
        arm: dra7xx: Add hwmod data for pcie1 and pcie2 subsystems
        arm: dra7xx: Add hwmod data for pcie1 phy and pcie2 phy
        ARM: DRA7: hwmod: Add OCP2SCP3 module
        ARM: DRA7: hwmod: remove interrupts for DMA
        ARM: OMAP2+: DMA: remove requirement of irq for platform-dma driver
        ARM: AM33xx: hwmod_data: Remove legacy mailbox addrs
        ARM: OMAP4: hwmod_data: Remove legacy mailbox addrs
        ARM: OMAP2: hwmod_data: Remove legacy mailbox data and addrs
        ARM: OMAP2+: Avoid mailbox legacy device creation for DT-boot
        ARM: DRA7: hwmod_data: Add mailbox hwmod data
        ARM: dts: DRA7: Add mailbox nodes
        ARM: dts: AM4372: Correct mailbox node data
        ARM: dts: AM33xx: Add mailbox node
        ARM: dts: OMAP4: Add mailbox node
        ARM: dts: OMAP2+: Add mailbox fifo and user information
        ARM: AM43xx: hwmod: add DSS hwmod data
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      0081b77d
    • Arnd Bergmann's avatar
      Merge branch 'omap/cleanup' into next/soc · ba66d7f0
      Arnd Bergmann authored
      This is a dependency for the omap/soc branch
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ba66d7f0
  4. 25 Jul, 2014 2 commits
  5. 24 Jul, 2014 17 commits
  6. 23 Jul, 2014 1 commit