1. 25 Sep, 2014 6 commits
  2. 24 Sep, 2014 2 commits
    • Olof Johansson's avatar
      Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical · 422d9abf
      Olof Johansson authored
      Merge "mvebu fixes for v3.17" from Jason Cooper:
      
       - kirkwood
          - final driver cleanup of ARCH_KIRKWOOD removal
          - fix DT based DSA
      
       - mvebu
          - use BCH ECC for the RN2120 and RN104/2 nand chips
      
      * tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
        ARM: Kirkwood: Fix DT based DSA.
        ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
        ARM: mvebu: Netgear RN104: Use Hardware BCH ECC
        cpufreq: Remove ARCH_KIRKWOOD dependency
        watchdog: Remove ARCH_KIRKWOOD dependency
        rtc: Remove ARCH_KIRKWOOD dependency
        leds: Remove ARCH_KIRKWOOD dependency
        thermal: Remove ARCH_KIRKWOOD dependency
        ata: Remove ARCH_KIRKWOOD dependency
        cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
      422d9abf
    • Olof Johansson's avatar
      Merge tag 'fixes-v3.18-not-urgent' of... · 2fee8c1d
      Olof Johansson authored
      Merge tag 'fixes-v3.18-not-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
      
      Merge "non-urgent omap fixes for v3.18 merge window" from Tony Lindgren:
      
      Fixes for omaps that were not considered urgent enough
      for the -rc cycle:
      
      - Fixes for .dts files to differentiate panda and beaglebone versions
      - Powerdomain fixes from Nishant Menon mostly for newer omaps
      - Fixes for __initconst and of_device_ids const usage
      
      * tag 'fixes-v3.18-not-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: make of_device_ids const
        ARM: omap2: make arrays containing machine compatible strings const
        ARM: OMAP4+: PM: Use only valid low power state for CPU hotplug
        ARM: OMAP4+: PM: use only valid low power state for suspend
        ARM: OMAP4+: PM: Make logic state programmable
        ARM: OMAP2+: powerdomain: introduce logic for finding valid power domain
        ARM: OMAP2+: powerdomain: pwrdm_for_each_clkdm iterate only valid clkdms
        ARM: OMAP5: powerdomain data: fix powerdomain powerstate
        ARM: OMAP: DRA7: powerdomain data: fix powerdomain powerstate
        ARM: dts: am335x-bone*: Fix model name and update compatibility information
        ARM: dts: omap4-panda: Fix model and SoC family details
        + Linux 3.17-rc3
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      2fee8c1d
  3. 14 Sep, 2014 1 commit
  4. 13 Sep, 2014 1 commit
    • Andrew Lunn's avatar
      ARM: Kirkwood: Fix DT based DSA. · 4f5e01e9
      Andrew Lunn authored
      During the conversion of boards to use DT to instantiate Distributed
      Switch Architecture, nobody volunteered to test. As to be expected,
      the conversion was flawed. Testers and access to hardware has now
      become available, and this patch hopefully fixes the problems.
      
      dsa,mii-bus must be a phandle to the top level mdio node, not the port
      specific subnode of the mdio device.
      
      dsa,ethernet must be a phandle to the port subnode within the ethernet
      DT node, not the ethernet node.
      
      Don't pinctrl hog the card detect gpio for mvsdio.
      
      Rename the .dts files to make it clearer which file is for the Z0
      stepping and which for the A0 or later stepping.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Cc: seugene@marvell.com
      Tested-by: default avatarEugene Sanivsky <seugene@marvell.com>
      Fixes: e2eaa339: ("ARM: Kirkwood: convert rd88f6281-setup.c to DT.")
      Fixes: e7c8f380: ("ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT")
      Cc: <stable@vger.kernel.org> #v3.15+
      Link: https://lkml.kernel.org/r/1409592941-22244-1-git-send-email-andrew@lunn.chSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      4f5e01e9
  5. 11 Sep, 2014 2 commits
  6. 10 Sep, 2014 1 commit
    • Roland Stigge's avatar
      ARM: LPC32xx: Fix reset function · 01100c02
      Roland Stigge authored
      In the recent change to the reset function API (commit
      7b6d864b), the mode argument changed from a
      char to an enum. lpc23xx_restart() only handles REBOOT_SOFT and REBOOT_HARD,
      but the new kernel code emits REBOOT_COLD (0) on reboots now which leads to
      lpc32xx simply not rebooting (but halting).
      
      This patch fixes this by just resetting unconditionally as on other platforms
      (e.g. mach-bcm2835).
      
      Pulling lpc32xx_watchdog_reset() into lpc23xx_restart() since the while() in
      lpc23xx_restart() is part of the procedure anyway and lpc32xx_watchdog_reset()
      isn't used anywhere else anymore.
      Signed-off-by: default avatarRoland Stigge <stigge@antcom.de>
      01100c02
  7. 09 Sep, 2014 9 commits
  8. 08 Sep, 2014 8 commits
  9. 05 Sep, 2014 2 commits
  10. 04 Sep, 2014 2 commits
  11. 03 Sep, 2014 2 commits
  12. 01 Sep, 2014 4 commits
    • Linus Torvalds's avatar
      Linux 3.17-rc3 · 69e273c0
      Linus Torvalds authored
      69e273c0
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linux · 05bdb8c9
      Linus Torvalds authored
      Pull Xtensa updates from Chris Zankel:
       "Xtensa improvements for 3.17:
         - support highmem on cores with aliasing data cache.  Enable highmem
           on kc705 by default
         - simplify addition of new core variants (no need to modify Kconfig /
           Makefiles)
         - improve robustness of unaligned access handler and its interaction
           with window overflow/underflow exception handlers
         - deprecate atomic and spill registers syscalls
         - clean up Kconfig: remove orphan MATH_EMULATION, sort 'select'
           statements
         - wire up renameat2 syscall.
      
        Various fixes:
         - fix address checks in dma_{alloc,free}_coherent (runtime BUG)
         - fix access to THREAD_RA/THREAD_SP/THREAD_DS (debug build breakage)
         - fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
           (runtime unrecoverable exception)
         - fix a6 and a7 handling in fast_syscall_xtensa (runtime userspace
           register clobbering)
         - fix kernel/user jump out of fast_unaligned (potential runtime
           unrecoverabl exception)
         - replace termios IOCTL code definitions with constants (userspace
           build breakage)"
      
      * tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linux: (25 commits)
        xtensa: deprecate fast_xtensa and fast_spill_registers syscalls
        xtensa: don't allow overflow/underflow on unaligned stack
        xtensa: fix a6 and a7 handling in fast_syscall_xtensa
        xtensa: allow single-stepping through unaligned load/store
        xtensa: move invalid unaligned instruction handler closer to its users
        xtensa: make fast_unaligned store restartable
        xtensa: add double exception fixup handler for fast_unaligned
        xtensa: fix kernel/user jump out of fast_unaligned
        xtensa: configure kc705 for highmem
        xtensa: support highmem in aliasing cache flushing code
        xtensa: support aliasing cache in kmap
        xtensa: support aliasing cache in k[un]map_atomic
        xtensa: implement clear_user_highpage and copy_user_highpage
        xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
        xtensa: allow fixmap and kmap span more than one page table
        xtensa: make fixmap region addressing grow with index
        xtensa: fix access to THREAD_RA/THREAD_SP/THREAD_DS
        xtensa: add renameat2 syscall
        xtensa: fix address checks in dma_{alloc,free}_coherent
        xtensa: replace IOCTL code definitions with constants
        ...
      05bdb8c9
    • Guenter Roeck's avatar
      unicore32: Fix build error · ca98565a
      Guenter Roeck authored
      unicore32 builds fail with
      
        arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
        arch/unicore32/kernel/signal.c:257: error: ‘usig’ undeclared (first use in this function)
        arch/unicore32/kernel/signal.c:279: error: ‘usig’ undeclared (first use in this function)
        arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
        arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’
        arch/unicore32/kernel/signal.c: In function ‘do_signal’:
        arch/unicore32/kernel/signal.c:376: error: implicit declaration of function ‘get_signsl’
        make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
        make: *** [arch/unicore32/kernel/signal.o] Error 2
      
      Bisect points to commit 649671c9 ("unicore32: Use get_signal()
      signal_setup_done()").
      
      This code never even compiled.  Reverting the patch does not work, since
      previously used functions no longer exist, so try to fix it up.  Compile
      tested only.
      
      Fixes: 649671c9 ("unicore32: Use get_signal() signal_setup_done()")
      Cc: Richard Weinberger <richard@nod.at>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ca98565a
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 94559a4a
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Various assorted fixes:
      
         - a couple of patches from Mark Rutland to resolve an errata with
           Cortex-A15 CPUs.
         - fix cpuidle for the CPU part ID changes in the last merge window
         - add support for a relocation which ARM binutils is generating in
           some circumstances"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number
        ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex
        ARM: 8128/1: abort: don't clear the exclusive monitors
        ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations
      94559a4a