1. 06 Apr, 2014 29 commits
  2. 05 Apr, 2014 11 commits
    • Linus Torvalds's avatar
      Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2bf73dd6
      Linus Torvalds authored
      Pull ARM SoC late cleanups from Arnd Bergmann:
       "These could not be part of the first cleanup branch, because they
        either came too late in the cycle, or they have dependencies on other
        branches.  Important changes are:
      
         - The integrator platform is almost multiplatform capable after some
           reorganization (Linus Walleij)
         - Minor cleanups on Zynq (Michal Simek)
         - Lots of changes for Exynos and other Samsung platforms, including
           further preparations for multiplatform support and the clocks
           bindings are rearranged"
      
      * tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
        devicetree: fix newly added exynos sata bindings
        ARM: EXYNOS: Fix compilation error in cpuidle.c
        ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
        ARM: EXYNOS: Remove hardware.h file
        ARM: SAMSUNG: Remove hardware.h inclusion
        ARM: S3C24XX: Remove invalid code from hardware.h
        dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
        ARM: dts: Keep some essential LDOs enabled for arndale-octa board
        ARM: dts: Disable MDMA1 node for arndale-octa board
        ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
        serial: s3c: Fix build of header without serial_core.h preinclusion
        ARM: EXYNOS: Allow wake-up using GIC interrupts
        ARM: EXYNOS: Stop using legacy Samsung PM code
        ARM: EXYNOS: Remove PM initcalls and useless indirection
        ARM: EXYNOS: Fix abuse of CONFIG_PM
        ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
        ARM: SAMSUNG: Move common save/restore helpers to separate file
        ARM: SAMSUNG: Move Samsung PM debug code into separate file
        ARM: SAMSUNG: Consolidate PM debug functions
        ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
        ...
      2bf73dd6
    • Linus Torvalds's avatar
      Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d2b150d0
      Linus Torvalds authored
      Pull ARM SoC sh driver change from Arnd Bergmann:
       "The drivers/sh subdirectory used to get merged through the SH
        architecture tree, but things are in flux there and some of the
        drivers are shared with ARM shmobile, we have picked it up for the
        time being.
      
        There is only one trivial patch from Laurent Pinchart this time"
      
      * tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        sh: intc: Enable driver compilation with COMPILE_TEST
      d2b150d0
    • Linus Torvalds's avatar
      Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · cbda94e0
      Linus Torvalds authored
      Pull ARM SoC driver changes from Arnd Bergmann:
       "These changes are mostly for ARM specific device drivers that either
        don't have an upstream maintainer, or that had the maintainer ask us
        to pick up the changes to avoid conflicts.
      
        A large chunk of this are clock drivers (bcm281xx, exynos, versatile,
        shmobile), aside from that, reset controllers for STi as well as a
        large rework of the Marvell Orion/EBU watchdog driver are notable"
      
      * tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits)
        Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac."
        Revert "net: stmmac: Add SOCFPGA glue driver"
        ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks
        ARM: STi: Add reset controller support to mach-sti Kconfig
        drivers: reset: stih416: add softreset controller
        drivers: reset: stih415: add softreset controller
        drivers: reset: Reset controller driver for STiH416
        drivers: reset: Reset controller driver for STiH415
        drivers: reset: STi SoC system configuration reset controller support
        dts: socfpga: Add sysmgr node so the gmac can use to reference
        dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
        reset: Add optional resets and stubs
        ARM: shmobile: r7s72100: fix bus clock calculation
        Power: Reset: Generalize qnap-poweroff to work on Synology devices.
        dts: socfpga: Update clock entry to support multiple parents
        ARM: socfpga: Update socfpga_defconfig
        dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
        net: stmmac: Add SOCFPGA glue driver
        watchdog: orion_wdt: Use %pa to print 'phys_addr_t'
        drivers: cci: Export CCI PMU revision
        ...
      cbda94e0
    • Linus Torvalds's avatar
      Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f83ccb93
      Linus Torvalds authored
      Pull ARM SoC device tree changes from Arnd Bergmann:
       "A large part of the arm-soc patches are nowadays DT changes, adding
        support for new SoCs, boards and devices without changing kernel
        source.  The plan is still to move the devicetree files out of the
        kernel tree and reduce the amount of churn going on here, but we keep
        finding reasons to delay doing that.
      
        Changes are really all over the place, with little sticking out
        particularly.  We have contributions from a total of 116 people in
        this branch.
      
        Unfortunately, the size of this branch also causes a significant
        number of conflicts at the moment, typically when subsystem
        maintainers merge patches that change the driver at the same time as
        the dts files.  In most cases this could be avoided because the dts
        changes are supposed to be compatible in both ways, and we are asking
        everyone to send ARM dts changes through our tree only"
      
      * tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (541 commits)
        dts: stmmac: Document the clocks property in the stmmac base document
        dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
        ARM: STi: stih41x: Add support for the FSM Serial Flash Controller
        ARM: STi: stih416: Add support for the FSM Serial Flash Controller
        ARM: tegra: fix Dalmore pinctrl configuration
        ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
        ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
        ARM: dts: Build all keystone dt blobs
        ARM: dts: keystone: Fix control register range for clktsip
        ARM: dts: keystone: Fix domain register range for clkfftc1
        ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
        ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
        ARM: dts: bcm21664: Add device tree files.
        ARM: DT: bcm21664: Device tree bindings
        ARM: efm32: properly namespace i2c location property
        ARM: efm32: fix unit address part in USART2 device nodes' names
        ARM: mvebu: Enable NAND controller in Armada 385-DB
        ARM: mvebu: Add support for NAND controller in Armada 38x SoC
        ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
        ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
        ...
      f83ccb93
    • Linus Torvalds's avatar
      Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 930b440c
      Linus Torvalds authored
      Pull ARM SoC board changes from Arnd Bergmann:
       "As we continue to replace board files with device tree descriptions,
        this part of the ARM support is getting smaller.  We have basically
        just defconfig changes here this time, and a significant number of
        Renesas shmobile changes, as Renesas is still in the process of
        deprecating board file support"
      
      * tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
        ARM: enable fhandle in multi_v7_defconfig
        ARM: tegra: enable fhandle in tegra_defconfig
        ARM: update multi_v7_defconfig for Tegra
        ARM: add Marvell Dove and some drivers to multi_v7 defconfig
        ARM: fix duplicate symbols in multi_v5_defconfig
        ARM: pxa: add gpio keys information
        ARM: tegra: defconfig updates
        ARM: config: keystone: enable AEMIF/NAND support
        ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig
        ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
        ARM: config: Add mvebu_v5_defconfig
        ARM: config: Add a multi_v5_defconfig
        ARM: shmobile: r7s72100: update defconfig for I2C usage
        ARM: shmobile: Remove Lager DT reference legacy clock bits
        ARM: shmobile: Remove Koelsch DT reference legacy clock bits
        ARM: shmobile: Remove KZM9D board code
        ARM: mvebu: update defconfigs for Armada 375 and 38x
        ARM: dove: Enable watchdog support in the defconfig
        ARM: mvebu: Enable watchdog support in defconfig
        ARM: config: keystone: enable led support
        ...
      930b440c
    • Linus Torvalds's avatar
      Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ff050ad1
      Linus Torvalds authored
      Pull ARM SoC specific changes from Arnd Bergmann:
       "Lots of changes specific to one of the SoC families.  Some that stick
        out are:
      
         - mach-qcom gains new features, most importantly SMP support for the
           newer chips (Stephen Boyd, Rohit Vaswani)
         - mvebu gains support for three new SoCs: Armada 375, 380 and 385
           (Thomas Petazzoni and Free-electrons team)
         - SMP support for Rockchips (Heiko Stübner)
         - Lots of i.MX changes (Shawn Guo)
         - Added support for BCM5301x SoC (Hauke Mehrtens)
         - Multiplatform support for Marvell Kirkwood and Dove (Andrew Lunn
           and Sebastian Hesselbarth doing the final part of a long journey)
         - Unify davinci platforms and remove obsolete ones (Sekhar Nori, Arnd
           Bergmann)"
      
      * tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (126 commits)
        ARM: sunxi: Select HAVE_ARM_ARCH_TIMER
        ARM: cache-tauros2: remove ARMv6 code
        ARM: mvebu: don't select CONFIG_NEON
        ARM: davinci: fix DT booting with default defconfig
        ARM: configs: bcm_defconfig: enable bcm590xx regulator support
        ARM: davinci: remove tnetv107x support
        MAINTAINERS: Update ARM STi maintainers
        ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
        ARM: bcm21664: Add board support.
        ARM: sunxi: Add the new watchog compatibles to the reboot code
        ARM: enable ARM_HAS_SG_CHAIN for multiplatform
        ARM: davinci: remove da8xx_omapl_defconfig
        ARM: davinci: da8xx: fix multiple watchdog device registration
        ARM: davinci: add da8xx specific configs to davinci_all_defconfig
        ARM: davinci: enable da8xx build concurrently with older devices
        ARM: BCM5301X: workaround suppress fault
        ARM: BCM5301X: add early debugging support
        ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU
        ARM: mach-bcm: Remove GENERIC_TIME
        ARM: shmobile: APMU: Fix warnings due to improper printk formats
        ...
      ff050ad1
    • Linus Torvalds's avatar
      Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dfc25e45
      Linus Torvalds authored
      Pull ARM SoC cleanups from Arnd Bergmann:
       "These cleanup patches are mainly move stuff around and should all be
        harmless.  They are mainly split out so that other branches can be
        based on top to avoid conflicts.
      
        Notable changes are:
      
         - We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
           longer used (Uwe Kleine-König)
         - The Qualcomm MSM platform is split out into legacy mach-msm and
           new-style mach-qcom, to allow easier maintainance of the new
           hardware support without regressions (Kumar Gala)
         - A rework of some of the Kconfig logic to simplify multiplatform
           support (Rob Herring)
         - Samsung Exynos gets closer to supporting multiplatform (Sachin
           Kamat and others)
         - mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
         - at91 gains some common clock framework support (Alexandre Belloni,
           Jean-Jacques Hiblot and other French people)"
      
      * tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (89 commits)
        ARM: hisi: select HAVE_ARM_SCU only for SMP
        ARM: efm32: allow uncompress debug output
        ARM: prima2: build reset code standalone
        ARM: at91: add PWM clock
        ARM: at91: move sam9261 SoC to common clk
        ARM: at91: prepare common clk transition for sam9261 SoC
        ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
        ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
        ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
        ARM: at91: dt: Add at91sam9261 dt SoC support
        ARM: at91: switch sam9rl to common clock framework
        ARM: at91/dt: define main clk frequency of at91sam9rlek
        ARM: at91/dt: define at91sam9rl clocks
        ARM: at91: prepare common clk transition for sam9rl SoCs
        ARM: at91: prepare sam9 dt boards transition to common clk
        ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
        ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
        ARM: at91: Add at91sam9rl DT SoC support
        ARM: at91: prepare at91sam9rl DT transition
        ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
        ...
      dfc25e45
    • Linus Torvalds's avatar
      Merge tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9f800363
      Linus Torvalds authored
      Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
       "Lots of isolated bug fixes that were not found to be important enough
        to be submitted before the merge window or backported into stable
        kernels.
      
        The vast majority of these came out of Arnd's randconfig testing and
        just prevents running into build-time bugs in configurations that we
        do not care about in practice"
      
      * tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
        ARM: at91: fix a typo
        ARM: moxart: fix CPU selection
        ARM: tegra: fix board DT pinmux setup
        ARM: nspire: Fix compiler warning
        IXP4xx: Fix DMA masks.
        Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
        IXP4xx: Fix Goramo Multilink GPIO conversion.
        Revert "ARM: ixp4xx: fix gpio rework"
        ARM: tegra: make debug_ll code build for ARMv6
        ARM: sunxi: fix build for THUMB2_KERNEL
        ARM: exynos: add missing include of linux/module.h
        ARM: exynos: fix l2x0 saved regs handling
        ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
        ARM: samsung: select ATAGS where necessary
        ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
        ARM: samsung: allow serial driver to be disabled
        ARM: s5pv210: enable IDE support in MACH_TORBRECK
        ARM: s5p64x0: fix building with only one soc type
        ARM: s3c64xx: select power domains only when used
        ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
        ...
      9f800363
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 2d1eb87a
      Linus Torvalds authored
      Pull ARM changes from Russell King:
      
       - Perf updates from Will Deacon:
         - Support for Qualcomm Krait processors (run perf on your phone!)
         - Support for Cortex-A12 (run perf stat on your FPGA!)
         - Support for perf_sample_event_took, allowing us to automatically decrease
           the sample rate if we can't handle the PMU interrupts quickly enough
           (run perf record on your FPGA!).
      
       - Basic uprobes support from David Long:
           This patch series adds basic uprobes support to ARM. It is based on
           patches developed earlier by Rabin Vincent. That approach of adding
           hooks into the kprobes instruction parsing code was not well received.
           This approach separates the ARM instruction parsing code in kprobes out
           into a separate set of functions which can be used by both kprobes and
           uprobes. Both kprobes and uprobes then provide their own semantic action
           tables to process the results of the parsing.
      
       - ARMv7M (microcontroller) updates from Uwe Kleine-König
      
       - OMAP DMA updates (recently added Vinod's Ack even though they've been
         sitting in linux-next for a few months) to reduce the reliance of
         omap-dma on the code in arch/arm.
      
       - SA11x0 changes from Dmitry Eremin-Solenikov and Alexander Shiyan
      
       - Support for Cortex-A12 CPU
      
       - Align support for ARMv6 with ARMv7 so they can cooperate better in a
         single zImage.
      
       - Addition of first AT_HWCAP2 feature bits for ARMv8 crypto support.
      
       - Removal of IRQ_DISABLED from various ARM files
      
       - Improved efficiency of virt_to_page() for single zImage
      
       - Patch from Ulf Hansson to permit runtime PM callbacks to be available for
         AMBA devices for suspend/resume as well.
      
       - Finally kill asm/system.h on ARM.
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (89 commits)
        dmaengine: omap-dma: more consolidation of CCR register setup
        dmaengine: omap-dma: move IRQ handling to omap-dma
        dmaengine: omap-dma: move register read/writes into omap-dma.c
        ARM: omap: dma: get rid of 'p' allocation and clean up
        ARM: omap: move dma channel allocation into plat-omap code
        ARM: omap: dma: get rid of errata global
        ARM: omap: clean up DMA register accesses
        ARM: omap: remove almost-const variables
        ARM: omap: remove references to disable_irq_lch
        dmaengine: omap-dma: cleanup errata 3.3 handling
        dmaengine: omap-dma: provide register read/write functions
        dmaengine: omap-dma: use cached CCR value when enabling DMA
        dmaengine: omap-dma: move barrier to omap_dma_start_desc()
        dmaengine: omap-dma: move clnk_ctrl setting to preparation functions
        dmaengine: omap-dma: improve efficiency loading C.SA/C.EI/C.FI registers
        dmaengine: omap-dma: consolidate clearing channel status register
        dmaengine: omap-dma: move CCR buffering disable errata out of the fast path
        dmaengine: omap-dma: provide register definitions
        dmaengine: omap-dma: consolidate setup of CCR
        dmaengine: omap-dma: consolidate setup of CSDP
        ...
      2d1eb87a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel · 2f997759
      Linus Torvalds authored
      Pull Hexagon updates from Richard Kuo:
       "Mostly cleanups for compilation with allmodconfig and some other
        miscellaneous fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
        Hexagon: update CR year for elf.h
        Hexagon: remove SP macro
        Hexagon:  set ELF_EXEC_PAGESIZE to PAGE_SIZE
        Hexagon: set the e_flags in user regset view for core dumps
        Hexagon: fix atomic_set
        Hexagon: add screen_info for VGA_CONSOLE
        hexagon: correct type on pgd copy
        smp, hexagon: kill SMP single function call interrupt
        arch: hexagon: include: asm: add generic macro 'mmiowb' in "io.h"
        arch: hexagon: kernel: hexagon_ksyms.c: export related symbols which various modules need
        arch: hexagon: kernel: reset.c: use function pointer instead of function for pm_power_off and export it
        arch: hexagon: include: asm: add "vga.h" in Kbuild
        arch: hexagon: include: asm: Kbuild: add generic "serial.h" in Kbuild
        arch: hexagon: include: uapi: asm: setup.h add swith macro __KERNEL__
        arch: hexagon: include: asm: add prefix "hvm[ci]_" for all enum members in "hexagon_vm.h"
        arch: hexagon: Kconfig: add HAVE_DMA_ATTR in Kconfig and remove "linux/dma-mapping.h" from "asm/dma-mapping.h"
        arch: hexagon: kernel: add export symbol function __delay()
        hexagon: include: asm: kgdb: extend DBG_MAX_REG_NUM for "cs0/1"
        hexagon: kernel: kgdb: include related header for pass compiling.
        hexagon: kernel: remove useless variables 'dn', 'r' and 'err' in time_init_deferred() in "time.c"
      2f997759
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 472e3741
      Linus Torvalds authored
      Pull m68k fixes from Greg Ungerer:
       "Just a couple of fixes.  Clean up compile warnings by using correct
        types in function args, and clean out the removed CONFIG_MTD_PARTITIONS"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: fix arg types for outs* functions
        m68k : Kill CONFIG_MTD_PARTITIONS
      472e3741