1. 01 Jul, 2015 8 commits
  2. 25 Jun, 2015 6 commits
    • Kevin Hilman's avatar
      Merge tag 'armsoc-defconfig' into test-merge · 1a429fce
      Kevin Hilman authored
      ARM: SoC: defconfig updates for v4.2
      
      We keep collecting defconfig updates in a separate branch mostly to encourage
      people to handle them separately and avoid conflicts between different topics.
      
      Most of these are enablement of new SoCs, boards or drivers that have
      come in, or minor config refreshes due to reorderings in Kconfig
      files, etc. I.e. mostly minor churn of various kinds.
      
      Conflicts: None
      
      # gpg: Signature made Wed Jun 24 21:32:27 2015 PDT using RSA key ID D3FBC665
      # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
      # gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
      # gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
      1a429fce
    • Kevin Hilman's avatar
      Merge tag 'armsoc-drivers' into test-merge · 32270e80
      Kevin Hilman authored
      ARM: SoC: driver updates for v4.2
      
      Some of these are for drivers/soc, where we're now putting
      SoC-specific drivers these days. Some are for other driver subsystems
      where we have received acks from the appropriate maintainers.
      
      Some highlights:
      
      - simple-mfd: document DT bindings and misc updates
      - migrate mach-berlin to simple-mfd for clock, pinctrl and reset
      - memory: support for Tegra132 SoC
      - memory: introduce tegra EMC driver for scaling memory frequency
      - misc. updates for ARM CCI and CCN busses
      
       Conflicts:
      	arch/arm64/boot/dts/arm/juno-motherboard.dtsi
      
       Trivial add/add conflict with our dt branch.
       Resolution: take both sides.
      
      # gpg: Signature made Wed Jun 24 21:32:17 2015 PDT using RSA key ID D3FBC665
      # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
      # gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
      # gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
      
      # Conflicts:
      #	arch/arm64/boot/dts/arm/juno-motherboard.dtsi
      32270e80
    • Kevin Hilman's avatar
      Merge tag 'armsoc-dt' into test-merge · 39e79b87
      Kevin Hilman authored
      ARM: SoC: DT updates for v4.2
      
      As usual, quite a few device-tree updates in ARM land.  There was ome
      minor churn in DTs due to relicensing under a dual-license, and lots
      of little additions of new peripherals, features etc, but nothing
      really exciting to call to your attention.  Some higlights, focsuing
      on support for new SoCs and boards:
      
      - AT91: new boards: Overkiz,  Acme Systems' Arietta G25
      - tegra: HDA support
      - bcm: new platforms: Buffalo WXR-1900DHP, SmartRG SR400ac, ASUS RT-AC87U
      - mvebu: new platforms: Compulab CM-A510, Armada 385-based Linksys
        boards, DLink DNS-327L
      - OMAP: new platforms: Baltos IR5221, LogicPD Torpedo, Toby-Churchill SL50
      - ARM: added support for Juno r1 board
      - sunxi: A33 SoC support; new boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G
      - imx: i.MX7D SoC support; new boards: Armadeus Systems APF6,
        Gateworks GW5510, and aristainetos2 boards
      - hisilicon: hi6220 SoC support; new boards: 96boards hikey
      
      Conflicts: None
      
      # gpg: Signature made Wed Jun 24 21:32:14 2015 PDT using RSA key ID D3FBC665
      # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
      # gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
      # gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
      39e79b87
    • Kevin Hilman's avatar
      Merge tag 'armsoc-soc' into test-merge · 03fa6267
      Kevin Hilman authored
      ARM: SoC: platform support for v4.2
      
      Our SoC branch usually contains expanded support for new SoCs and
      other core platform code. Some highlights from this round:
      
      - sunxi: SMP support for A23 SoC
      - socpga: big-endian support
      - pxa: conversion to common clock framework
      - bcm: SMP support for BCM63138
      - imx: support new I.MX7D SoC
      - zte: basic support for ZX296702 SoC
      
       Conflicts:
      	arch/arm/mach-socfpga/core.h
      
      Trivial remove/remove conflict with our cleanup branch.
      Resolution: remove both sides
      
      # gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665
      # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
      # gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
      # gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
      
      # Conflicts:
      #	arch/arm/mach-socfpga/core.h
      03fa6267
    • Kevin Hilman's avatar
      Merge tag 'armsoc-cleanup' into test-merge · 8d2977bf
      Kevin Hilman authored
      ARM: SoC cleanups for v4.2
      
      A relatively small setup of cleanups this time around, and similar to last time
      the bulk of it is removal of legacy board support:
      
      - OMAP: removal of legacy (non-DT) booting for several platforms
      - i.MX: remove some legacy board files
      
      Conflicts: None
      
      # gpg: Signature made Wed Jun 24 21:32:09 2015 PDT using RSA key ID D3FBC665
      # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
      # gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
      # gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
      8d2977bf
    • Arnd Bergmann's avatar
      ARM: hisi: revert changes from hisi/hip04-dt branch · 58c17967
      Arnd Bergmann authored
      This backs out all changes that were added in the hip04-dt
      branch after various boot problems were discovered in UEFI booting.
      Reported-by: default avatarTyler Baker <tyler.baker@linaro.org>
      Cc: Wei Xu <xuwei5@hisilicon.com>
      [khilman: minor changelog updates]
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      58c17967
  3. 24 Jun, 2015 1 commit
  4. 22 Jun, 2015 1 commit
  5. 21 Jun, 2015 1 commit
  6. 20 Jun, 2015 1 commit
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 8f4ce072
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "A smattering of fixes,
      
        mgag200:
            don't accept modes that aren't aligned properly as hw can't do it
      
        i915:
            two regression fixes
      
        radeon:
            one query to allow userspace fixes
            one oops fixer for older hw with new options enabled"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: don't probe MST on hw we don't support it on
        drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query
        drm/mgag200: Reject non-character-cell-aligned mode widths
        Revert "drm/i915: Don't skip request retirement if the active list is empty"
        drm/i915: Always reset vma->ggtt_view.pages cache on unbinding
      8f4ce072
  7. 19 Jun, 2015 11 commits
  8. 18 Jun, 2015 7 commits
  9. 17 Jun, 2015 4 commits
    • Thomas Petazzoni's avatar
      ARM: mvebu: fix suspend to RAM on big-endian configurations · 2f5bc307
      Thomas Petazzoni authored
      The current Armada XP suspend to RAM implementation, as added in
      commit 27432825 ("ARM: mvebu: Armada XP GP specific
      suspend/resume code") does not handle big-endian configurations
      properly: the small bit of assembly code putting the DRAM in
      self-refresh and toggling the GPIOs to turn off power forgets to
      convert the values to little-endian.
      
      This commit fixes that by making sure the two values we will write to
      the DRAM controller register and GPIO register are already in
      little-endian before entering the critical assembly code.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: <stable@vger.kernel.org> # v3.19+
      Fixes: 27432825 ("ARM: mvebu: Armada XP GP specific suspend/resume code")
      2f5bc307
    • Thomas Petazzoni's avatar
      ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename · 8c19a731
      Thomas Petazzoni authored
      Following the merge of "pinctrl: mvebu: armada-xp: rename spi to spi0"
      by Linus Walleij, we need to adjust the Armada XP Device Tree
      accordingly, by adjusting the pinctrl configuration for SPI pins.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      8c19a731
    • Wolfram Sang's avatar
      i2c: slave: fix the example how to instantiate from userspace · 83666102
      Wolfram Sang authored
      I copied the wrong shell code into the documentation. Sorry to all who
      tried to get sense out of this current example :/ Slight rewording while
      we are here.
      Reported-by: default avatarTim Bakker <bakkert@mymail.vcu.edu>
      Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Cc: stable@kernel.org
      83666102
    • Steven Rostedt's avatar
      tracing: Have filter check for balanced ops · 2cf30dc1
      Steven Rostedt authored
      When the following filter is used it causes a warning to trigger:
      
       # cd /sys/kernel/debug/tracing
       # echo "((dev==1)blocks==2)" > events/ext4/ext4_truncate_exit/filter
      -bash: echo: write error: Invalid argument
       # cat events/ext4/ext4_truncate_exit/filter
      ((dev==1)blocks==2)
      ^
      parse_error: No error
      
       ------------[ cut here ]------------
       WARNING: CPU: 2 PID: 1223 at kernel/trace/trace_events_filter.c:1640 replace_preds+0x3c5/0x990()
       Modules linked in: bnep lockd grace bluetooth  ...
       CPU: 3 PID: 1223 Comm: bash Tainted: G        W       4.1.0-rc3-test+ #450
       Hardware name: Hewlett-Packard HP Compaq Pro 6300 SFF/339A, BIOS K01 v02.05 05/07/2012
        0000000000000668 ffff8800c106bc98 ffffffff816ed4f9 ffff88011ead0cf0
        0000000000000000 ffff8800c106bcd8 ffffffff8107fb07 ffffffff8136b46c
        ffff8800c7d81d48 ffff8800d4c2bc00 ffff8800d4d4f920 00000000ffffffea
       Call Trace:
        [<ffffffff816ed4f9>] dump_stack+0x4c/0x6e
        [<ffffffff8107fb07>] warn_slowpath_common+0x97/0xe0
        [<ffffffff8136b46c>] ? _kstrtoull+0x2c/0x80
        [<ffffffff8107fb6a>] warn_slowpath_null+0x1a/0x20
        [<ffffffff81159065>] replace_preds+0x3c5/0x990
        [<ffffffff811596b2>] create_filter+0x82/0xb0
        [<ffffffff81159944>] apply_event_filter+0xd4/0x180
        [<ffffffff81152bbf>] event_filter_write+0x8f/0x120
        [<ffffffff811db2a8>] __vfs_write+0x28/0xe0
        [<ffffffff811dda43>] ? __sb_start_write+0x53/0xf0
        [<ffffffff812e51e0>] ? security_file_permission+0x30/0xc0
        [<ffffffff811dc408>] vfs_write+0xb8/0x1b0
        [<ffffffff811dc72f>] SyS_write+0x4f/0xb0
        [<ffffffff816f5217>] system_call_fastpath+0x12/0x6a
       ---[ end trace e11028bd95818dcd ]---
      
      Worse yet, reading the error message (the filter again) it says that
      there was no error, when there clearly was. The issue is that the
      code that checks the input does not check for balanced ops. That is,
      having an op between a closed parenthesis and the next token.
      
      This would only cause a warning, and fail out before doing any real
      harm, but it should still not caues a warning, and the error reported
      should work:
      
       # cd /sys/kernel/debug/tracing
       # echo "((dev==1)blocks==2)" > events/ext4/ext4_truncate_exit/filter
      -bash: echo: write error: Invalid argument
       # cat events/ext4/ext4_truncate_exit/filter
      ((dev==1)blocks==2)
      ^
      parse_error: Meaningless filter expression
      
      And give no kernel warning.
      
      Link: http://lkml.kernel.org/r/20150615175025.7e809215@gandalf.local.home
      
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
      Cc: stable@vger.kernel.org # 2.6.31+
      Reported-by: default avatarVince Weaver <vincent.weaver@maine.edu>
      Tested-by: default avatarVince Weaver <vincent.weaver@maine.edu>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      2cf30dc1