1. 20 Nov, 2014 1 commit
    • Arnd Bergmann's avatar
      Merge tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux into next/soc · c830343a
      Arnd Bergmann authored
      Pull "arm: pxa: pxa for v3.19" from Robert Jarzmik:
      
      This is a very quiet release, featuring a small cleanup, a tosa change
      on its charger driver, and support for pxa device-tree based pxa27x
      boards.
      
      The device-tree part will only be fully activated once clocks support
      is fully operation in the common clock framework.
      
      * tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux:
        arm: pxa: add pxa27x device-tree support
        arm: pxa: remove unnecessary includes from pxa-dt
        arm: pxa: move init functions into generic.h
        arm: pxa: add device-tree irq init for pxa27x
        ARM: pxa: tosa: switch to gpio-charger
        arm: mach-pxa: Convert pr_warning to pr_warn
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      c830343a
  2. 19 Nov, 2014 11 commits
  3. 12 Nov, 2014 2 commits
  4. 11 Nov, 2014 1 commit
    • Linus Walleij's avatar
      ARM: fix multiplatform allmodcompile · dc680b98
      Linus Walleij authored
      Commit 68f3b875
      "ARM: integrator: make the Integrator multiplatform"
      broke allmodconfig like this:
      
      >> arch/arm/include/asm/cmpxchg.h:114:2: error: #error
      "SMP is not supported on this platform"
      (etc)
      
      This is due to the fact that as we turned on multiplatform
      for the Integrator, this enabled a lot of non-applicable
      CPU's to be selected for its multiplatform images, due to
      a lot of "depends on ARCH_INTEGRATOR" restrictions in
      arch/arm/mm/Kconfig for the different ARM CPU types.
      
      Fix this by restricting the CPU selections to respective
      multiplatform config, which now becomes a subset of the
      possible Integrator configurations, or alternatively the
      non-multiplatform config plus ARCH_INTEGRATOR, i.e.:
      
      if (!ARCH_MULTIPLATFORM || ARCH_MULTI_Vx) &&
         (ARCH_INTEGRATOR || ARCH_FOO ...)
      
      Since the Integrator has been converted to multiplatform,
      this will often take the short form:
      
      if (ARCH_MULTI_Vx && ARCH_INTEGRATOR)
      
      If no other non-multiplatform platforms are elegible.
      Reported-by: default avatarBuild bot for Mark Brown <broonie@kernel.org>
      Reported-by: default avatarKbuild test robot <fengguang.wu@intel.com>
      Suggested-by: default avatarRussell King <linux@arm.linux.org.uk>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      dc680b98
  5. 10 Nov, 2014 1 commit
  6. 09 Nov, 2014 3 commits
    • Olof Johansson's avatar
      Merge tag 'ux500-core-for-arm-soc' of... · 85b80b6b
      Olof Johansson authored
      Merge tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc
      
      Merge "Ux500 core changes for v3.19" from Linus Walleij:
      
      "please pull in these Ux500 core changes for this kernel development
      cycle: mainly a generic power domain implementation from Ulf Hansson
      that needs to get queued up in -next and tested."
      
      Generic power domains for the Ux500
      
      * tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: Add i2c devices to the VAPE PM domain
        ARM: ux500: Add spi and ssp devices to the VAPE PM domain
        ARM: ux500: Add sdi devices to the VAPE PM domain
        ARM: ux500: Add DT node for ux500 PM domains
        ARM: ux500: Enable Kconfig for the generic PM domain
        ARM: ux500: Initial support for PM domains
        dt: bindings: ux500: Add header for PM domains specifiers
        dt: bindings: ux500: Add documentation for PM domains
        ARM: u300: Convert pr_warning to pr_warn
      85b80b6b
    • Olof Johansson's avatar
      Merge tag 'berlin-soc-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc · c6c65189
      Olof Johansson authored
      Merge "ARM: berlin: SoC changes for v3.19 (round 1)" from Sebastian
      Hesselbarth:
      
      Berlin SoC changes for v3.19 (round 1)
      - Select the reset driver for all SoCs
      
      * tag 'berlin-soc-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
        ARM: Berlin: select the reset controller
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c6c65189
    • Olof Johansson's avatar
      Merge branch 'v3.19-next/pm-samsung-2' of... · e7638e7a
      Olof Johansson authored
      Merge branch 'v3.19-next/pm-samsung-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
      
      Merge "1st Round of Samsung PM updates for v3.19" from Kukjin Kim:
      
      Samsung PM (v2) updates for v3.19
      
      - added fix build with ARM_CPU_SUSPEND=n based on previous
        tags/samsung-pm
      
      - Refactor the pm code to use DT based lookup instead of
        using "soc_is_exynosxxxx"
      
      - Firmware supporting suspend and resume to excute of low
        level operations to enter and leave power mode for exynos
        : introduce suspend() and resume() firmware operations
      
      - Fix AFTR mode on boards with secure firmware enabled and
        allows exynos cpuidle driver usage on exynos4x12 SoCs
      
      - Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=y
      
      - SWRESET is needed to boot secondary CPU on exynos3250
      
      * 'v3.19-next/pm-samsung-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Fix build with ARM_CPU_SUSPEND=n
        ARM: EXYNOS: SWRESET is needed to boot secondary CPU on exynos3250
        ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=y
        ARM: EXYNOS: allow driver usage on Exynos4x12 SoCs
        ARM: EXYNOS: fix register setup for AFTR mode code
        ARM: EXYNOS: add secure firmware support to AFTR mode code
        ARM: firmware: add AFTR mode support to firmware do_idle method
        ARM: EXYNOS: replace EXYNOS_BOOT_VECTOR_* macros by static inlines
        ARM: EXYNOS: Add support for firmware-assisted suspend/resume
        ARM: firmware: Introduce suspend and resume operations
        ARM: EXYNOS: Refactor the pm code to use DT based lookup
        ARM: EXYNOS: Move Disabling of JPEG USE_RETENTION for exynos5250 to pmu.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      e7638e7a
  7. 05 Nov, 2014 1 commit
  8. 04 Nov, 2014 5 commits
  9. 02 Nov, 2014 15 commits
    • Linus Torvalds's avatar
      Linux 3.18-rc3 · 0df1f248
      Linus Torvalds authored
      0df1f248
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd · 81d92dc1
      Linus Torvalds authored
      Pull MTD fixes from Brian Norris:
       "Three main MTD fixes for 3.18:
      
         - A regression from 3.16 which was noticed in 3.17.  With the
           restructuring of the m25p80.c driver and the SPI NOR library
           framework, we omitted proper listing of the SPI device IDs.  This
           means m25p80.c wouldn't auto-load (modprobe) properly when built as
           a module.  For now, we duplicate the device IDs into both modules.
      
         - The OMAP / ELM modules were depending on an implicit link ordering.
           Use deferred probing so that the new link order (in 3.18-rc) can
           still allow for successful probing.
      
         - Fix suspend/resume support for LH28F640BF NOR flash"
      
      * tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd:
        mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
        mtd: omap: fix mtd devices not showing up
        mtd: m25p80,spi-nor: Fix module aliases for m25p80
        mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
        mtd: m25p80: get rid of spi_get_device_id
      81d92dc1
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · ad2be379
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a set of six patches consisting of:
         - two MAINTAINER updates
         - two scsi-mq fixs for the old parallel interface (not every request
           is tagged and we need to set the right flags to populate the SPI
           tag message)
         - a fix for a memory leak in scatterlist traversal caused by a
           preallocation update in 3.17
         - an ipv6 fix for cxgbi"
      
      [ The scatterlist fix also came in separately through the block layer tree ]
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        MAINTAINERS: ufs - remove self
        MAINTAINERS: change hpsa and cciss maintainer
        libcxgbi : support ipv6 address host_param
        scsi: set REQ_QUEUE for the blk-mq case
        Revert "block: all blk-mq requests are tagged"
        lib/scatterlist: fix memory leak with scsi-mq
      ad2be379
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 12267166
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Nothing too astounding or major: radeon, i915, vmwgfx, armada and
        exynos.
      
        Biggest ones:
         - vmwgfx has one big locking regression fix
         - i915 has come displayport fixes
         - radeon has some stability and a memory alloc failure
         - armada and exynos have some vblank fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
        drm/exynos: correct connector->dpms field before resuming
        drm/exynos: enable vblank after DPMS on
        drm/exynos: init kms poll at the end of initialization
        drm/exynos: propagate plane initialization errors
        drm/exynos: vidi: fix build warning
        drm/exynos: remove explicit encoder/connector de-initialization
        drm/exynos: init vblank with real number of crtcs
        drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
        drm/vmwgfx: Fix hash key computation
        drm/vmwgfx: fix lock breakage
        drm/i915/dp: only use training pattern 3 on platforms that support it
        drm/radeon: remove some buggy dead code
        drm/i915: Ignore VBT backlight check on Macbook 2, 1
        drm/radeon: remove invalid pci id
        drm/radeon: dpm fixes for asrock systems
        radeon: clean up coding style differences in radeon_get_bios()
        drm/radeon: Use drm_malloc_ab instead of kmalloc_array
        drm/radeon/dpm: disable ulv support on SI
        drm/i915: Fix GMBUSFREQ on vlv/chv
        drm/i915: Ignore long hpds on eDP ports
        ...
      12267166
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 3c43de0f
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       - add the new bpf syscall to ARM.
       - drop a redundant return statement in __iommu_alloc_remap()
       - fix a performance issue noticed by Thomas Petazzoni with
         kmap_atomic().
       - fix an issue with the L2 cache OF parsing code which caused it to
         incorrectly print warnings on each boot, and make the warning text
         more consistent with the rest of the code
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()
        ARM: 8183/1: l2c: Improve l2c310_of_parse() error message
        ARM: 8181/1: Drop extra return statement
        ARM: 8182/1: l2c: Make l2x0_cache_size_of_parse() return 'int'
        ARM: enable bpf syscall
      3c43de0f
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 7501a533
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "A small set of x86 fixes.  The most serious is an SRCU lockdep fix.
      
        A bit late - needed some time to test the SRCU fix, which only came in
        on Friday"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: vmx: defer load of APIC access page address during reset
        KVM: nVMX: Disable preemption while reading from shadow VMCS
        KVM: x86: Fix far-jump to non-canonical check
        KVM: emulator: fix execution close to the segment limit
        KVM: emulator: fix error code for __linearize
      7501a533
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-fixes' of... · 66338fee
      Dave Airlie authored
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
      
      This pull-request includes some bug fixes and code cleanups.
      Especially, this fixes the bind failure issue occurred when it tries
      to re-bind Exynos drm driver after unbound, and the modetest failure
      issue incurred by not having a pair to vblank on and off requests.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: correct connector->dpms field before resuming
        drm/exynos: enable vblank after DPMS on
        drm/exynos: init kms poll at the end of initialization
        drm/exynos: propagate plane initialization errors
        drm/exynos: vidi: fix build warning
        drm/exynos: remove explicit encoder/connector de-initialization
        drm/exynos: init vblank with real number of crtcs
      66338fee
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 7e05b807
      Linus Torvalds authored
      Pull VFS fixes from Al Viro:
       "A bunch of assorted fixes, most of them followups to overlayfs merge"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ovl: initialize ->is_cursor
        Return short read or 0 at end of a raw device, not EIO
        isofs: don't bother with ->d_op for normal case
        isofs_cmp(): we'll never see a dentry for . or ..
        overlayfs: fix lockdep misannotation
        ovl: fix check for cursor
        overlayfs: barriers for opening upper-layer directory
        rcu: Provide counterpart to rcu_dereference() for non-RCU situations
        staging: android: logger: Fix log corruption regression
      7e05b807
    • Linus Torvalds's avatar
      irda: stop calling sk_prot->disconnect() on connection failure · 4cb8c359
      Linus Torvalds authored
      The sk_prot is irda's own set of protocol handlers, so irda should
      statically know what that function is anyway, without using an indirect
      pointer.  And as it happens, we know *exactly* what that pointer is
      statically: it's NULL, because irda doesn't define a disconnect
      operation.
      
      So calling that function is doubly wrong, and will just cause an oops.
      Reported-by: default avatarMartin Lang <mlg.hessigheim@gmail.com>
      Cc: Samuel Ortiz <samuel@sortiz.org>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4cb8c359
    • Andrzej Hajda's avatar
      drm/exynos: correct connector->dpms field before resuming · 74cfe07a
      Andrzej Hajda authored
      During system suspend after connector switch off its dpms field
      is set to connector previous dpms state. To properly resume dpms field
      should be set to its actual state (off) before resuming to previous dpms state.
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      74cfe07a
    • Andrzej Hajda's avatar
      drm/exynos: enable vblank after DPMS on · d6948b2f
      Andrzej Hajda authored
      Before DPMS off driver disables vblank.
      It should be balanced by vblank enable after DPMS on.
      The patch fixes issue with page_flip ioctl not being able
      to acquire vblank counter introduced by patch:
      drm: Always reject drm_vblank_get() after drm_vblank_off()
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      d6948b2f
    • Andrzej Hajda's avatar
      drm/exynos: init kms poll at the end of initialization · 3cb6830a
      Andrzej Hajda authored
      HPD events can be generated by components even if drm_dev is not fully
      initialized, to skip such events kms poll initialization should
      be performed at the end of load callback followed directly by forced
      connection detection.
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      3cb6830a
    • Andrzej Hajda's avatar
      drm/exynos: propagate plane initialization errors · 64f7aed8
      Andrzej Hajda authored
      In case of error during plane initialization load callback
      incorrectly return success, this patch fixes it.
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      64f7aed8
    • Inki Dae's avatar
      drm/exynos: vidi: fix build warning · 9887e2d9
      Inki Dae authored
      encoder object isn't used anymore so remove it.
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      9887e2d9
    • Andrzej Hajda's avatar
      drm/exynos: remove explicit encoder/connector de-initialization · d9aaf757
      Andrzej Hajda authored
      All KMS objects are destroyed by drm_mode_config_cleanup in proper order
      so component drivers should not care about it.
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      d9aaf757