13 Apr, 2014

1 commit

  • …realmz6/blackfin-linux

    Pull blackfin updates from Steven Miao:
    "Code cleanup, some previously ignored patches, and bug fixes"

    * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
    blackfin: cleanup board files
    bf609: clock: drop unused clock bit set/clear functions
    Blackfin: bf537: rename "CONFIG_ADT75"
    Blackfin: bf537: rename "CONFIG_AD7314"
    Blackfin: bf537: rename ad2s120x ->ad2s1200
    blackfin: bf537: fix typo "CONFIG_SND_SOC_ADV80X_MODULE"
    blackfin: dma: current count mmr is read only
    bfin_crc: Move architecture independant crc header file out of the blackfin folder.
    bf54x: drop unuesd HOST status,control,timeout registers bit define macros
    blackfin: portmux: cleanup head file
    Blackfin: remove "config IP_CHECKSUM_L1"
    blackfin: Remove GENERIC_GPIO config option again
    blackfin:Use generic /proc/interrupts implementation
    blackfin: bf60x: fix typo "CONFIG_PM_BFIN_WAKE_PA15_POL"

    Linus Torvalds
     

12 Apr, 2014

10 commits


11 Apr, 2014

4 commits


09 Apr, 2014

1 commit

  • Pull i2c updates from Wolfram Sang:
    "Here is the pull request from the i2c subsystem. It got a little
    delayed because I needed to wait for a dependency to be included
    (commit b424080a9e08: "reset: Add optional resets and stubs"). Plus,
    I had some email problems. All done now, the highlights are:

    - drivers can now deprecate their use of i2c classes. That shouldn't
    be used on embedded platforms anyhow and was often blindly
    copy&pasted. This mechanism gives users time to switch away and
    ultimately boot faster once the use of classes for those drivers is
    gone for good.

    - new drivers for QUP, Cadence, efm32

    - tracepoint support for I2C and SMBus

    - bigger cleanups for the mv64xxx, nomadik, and designware drivers

    And the usual bugfixes, cleanups, feature additions. Most stuff has
    been in linux-next for a while. Just some hot fixes and new drivers
    were added a bit more recently."

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (63 commits)
    i2c: cadence: fix Kconfig dependency
    i2c: Add driver for Cadence I2C controller
    i2c: cadence: Document device tree bindings
    Documentation: i2c: improve section about flags mangling the protocol
    i2c: qup: use proper type fro clk_freq
    i2c: qup: off by ones in qup_i2c_probe()
    i2c: efm32: fix binding doc
    MAINTAINERS: update I2C web resources
    i2c: qup: New bus driver for the Qualcomm QUP I2C controller
    i2c: qup: Add device tree bindings information
    i2c: i2c-xiic: deprecate class based instantiation
    i2c: i2c-sirf: deprecate class based instantiation
    i2c: i2c-mv64xxx: deprecate class based instantiation
    i2c: i2c-designware-platdrv: deprecate class based instantiation
    i2c: i2c-davinci: deprecate class based instantiation
    i2c: i2c-bcm2835: deprecate class based instantiation
    i2c: mv64xxx: Fix reset controller handling
    i2c: omap: fix usage of IS_ERR_VALUE with pm_runtime_get_sync
    i2c: efm32: new bus driver
    i2c: exynos5: remove unnecessary cast of void pointer
    ...

    Linus Torvalds
     

04 Apr, 2014

1 commit

  • Pull tracing updates from Steven Rostedt:
    "Most of the changes were largely clean ups, and some documentation.
    But there were a few features that were added:

    Uprobes now work with event triggers and multi buffers and have
    support under ftrace and perf.

    The big feature is that the function tracer can now be used within the
    multi buffer instances. That is, you can now trace some functions in
    one buffer, others in another buffer, all functions in a third buffer
    and so on. They are basically agnostic from each other. This only
    works for the function tracer and not for the function graph trace,
    although you can have the function graph tracer running in the top
    level buffer (or any tracer for that matter) and have different
    function tracing going on in the sub buffers"

    * tag 'trace-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (45 commits)
    tracing: Add BUG_ON when stack end location is over written
    tracepoint: Remove unused API functions
    Revert "tracing: Move event storage for array from macro to standalone function"
    ftrace: Constify ftrace_text_reserved
    tracepoints: API doc update to tracepoint_probe_register() return value
    tracepoints: API doc update to data argument
    ftrace: Fix compilation warning about control_ops_free
    ftrace/x86: BUG when ftrace recovery fails
    ftrace: Warn on error when modifying ftrace function
    ftrace: Remove freelist from struct dyn_ftrace
    ftrace: Do not pass data to ftrace_dyn_arch_init
    ftrace: Pass retval through return in ftrace_dyn_arch_init()
    ftrace: Inline the code from ftrace_dyn_table_alloc()
    ftrace: Cleanup of global variables ftrace_new_pgs and ftrace_update_cnt
    tracing: Evaluate len expression only once in __dynamic_array macro
    tracing: Correctly expand len expressions from __dynamic_array macro
    tracing/module: Replace include of tracepoint.h with jump_label.h in module.h
    tracing: Fix event header migrate.h to include tracepoint.h
    tracing: Fix event header writeback.h to include tracepoint.h
    tracing: Warn if a tracepoint is not set via debugfs
    ...

    Linus Torvalds
     

02 Apr, 2014

1 commit

  • Pull pin control bulk changes from Linus Walleij:
    "Pin control bulk changes for the v3.15 series, no new core
    functionality this time, just incremental driver updates:

    - A large refactoring of the MVEBU (Marvell) driver.

    - A large refactoring of the Tegra (nVidia) driver.

    - GPIO interrupt including soft edges support in the STi driver.

    - Misc updates to PFC (Renesas), AT91, ADI2 (Blackfin),
    pinctrl-single, sirf (CSR), msm (Qualcomm), Exynos (Samsung), sunxi
    (AllWinner), i.MX (Freescale), Baytrail"

    * tag 'pinctrl-v3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (72 commits)
    pinctrl: tegra: add some missing Tegra114 entries
    pinctrl: tegra: fix some mistakes in Tegra124
    pinctrl: msm: fix up out-of-order merge conflict
    pinctrl: st: Fix error check for of_irq_to_resource usage
    pinctrl: tegra: consistency cleanup
    pinctrl: tegra: dynamically calculate function list of groups
    pinctrl: tegra: init Tegra20/30 at module_init time
    pinctrl: st: Use ARRAY_SIZE instead of raw value for number of delays
    pinctrl: st: add pinctrl support for the STiH407 SoC
    pinctrl: st: Enhance the controller to manage unavailable registers
    pinctrl: msm: Simplify msm_config_reg() and callers
    pinctrl: msm: Remove impossible WARN_ON()s
    pinctrl: msm: Replace lookup tables with math
    pinctrl: msm: Drop OF_IRQ dependency
    pinctrl: msm: Drop unused includes
    pinctrl: msm: Check for ngpios > MAX_NR_GPIO
    pinctrl: msm: Silence recursive lockdep warning
    pinctrl: mvebu: silence WARN to dev_warn
    pinctrl: msm: drop wake_irqs bitmap
    pinctrl-baytrail: add function mux checking in gpio pin request
    ...

    Linus Torvalds
     

09 Mar, 2014

2 commits


07 Mar, 2014

2 commits

  • As the data parameter is not really used by any ftrace_dyn_arch_init,
    remove that from ftrace_dyn_arch_init. This also removes the addr
    local variable from ftrace_init which is now unused.

    Note the documentation was imprecise as it did not suggest to set
    (*data) to 0.

    Link: http://lkml.kernel.org/r/1393268401-24379-4-git-send-email-jslaby@suse.cz

    Cc: Frederic Weisbecker
    Cc: Ingo Molnar
    Cc: linux-arch@vger.kernel.org
    Signed-off-by: Jiri Slaby
    Signed-off-by: Steven Rostedt

    Jiri Slaby
     
  • No architecture uses the "data" parameter in ftrace_dyn_arch_init() in any
    way, it just sets the value to 0. And this is used as a return value
    in the caller -- ftrace_init, which just checks the retval against
    zero.

    Note there is also "return 0" in every ftrace_dyn_arch_init. So it is
    enough to check the retval and remove all the indirect sets of data on
    all archs.

    Link: http://lkml.kernel.org/r/1393268401-24379-3-git-send-email-jslaby@suse.cz

    Cc: linux-arch@vger.kernel.org
    Signed-off-by: Jiri Slaby
    Signed-off-by: Steven Rostedt

    Jiri Slaby
     

10 Feb, 2014

3 commits

  • It is better to keep this structure in the pinctrl-adi2 driver.

    Signed-off-by: Sonic Zhang
    Signed-off-by: Linus Walleij

    Sonic Zhang
     
  • This patch allows each architecture to add its specific assembly optimized
    arch_mcs_spin_lock_contended and arch_mcs_spinlock_uncontended for
    MCS lock and unlock functions.

    Signed-off-by: Tim Chen
    Cc: Scott J Norton
    Cc: Raghavendra K T
    Cc: AswinChandramouleeswaran
    Cc: George Spelvin
    Cc: Rik vanRiel
    Cc: Andrea Arcangeli
    Cc: MichelLespinasse
    Cc: Peter Hurley
    Cc: Andi Kleen
    Cc: Alex Shi
    Cc: Dave Hansen
    Cc: Tim Chen
    Cc: Arnd Bergmann
    Cc: "Figo.zhang"
    Cc: "Paul E.McKenney"
    Cc: "H. Peter Anvin"
    Cc: Davidlohr Bueso
    Cc: Waiman Long
    Cc: Ingo Molnar
    Cc: Will Deacon
    Cc: Andrew Morton
    Cc: Linus Torvalds
    Cc: Matthew R Wilcox
    Signed-off-by: Peter Zijlstra
    Link: http://lkml.kernel.org/r/1390347382.3138.67.camel@schen9-DESK
    Signed-off-by: Ingo Molnar

    Tim Chen
     
  • We perform a clean up of the Kbuid files in each architecture.
    We order the files in each Kbuild in alphabetical order
    by running the below script.

    for i in arch/*/include/asm/Kbuild
    do
    cat $i | gawk '/^generic-y/ {
    i = 3;
    do {
    for (; i ${i}.sorted;
    mv ${i}.sorted $i;
    done

    Signed-off-by: Tim Chen
    Cc: Arnd Bergmann
    Cc: Matthew R Wilcox
    Cc: AswinChandramouleeswaran
    Cc: Dave Hansen
    Cc: "Paul E.McKenney"
    Cc: Scott J Norton
    Cc: Will Deacon
    Cc: "Figo.zhang"
    Cc: Linus Torvalds
    Cc: Rik van Riel
    Cc: Waiman Long
    Cc: Peter Hurley
    Cc: Andrea Arcangeli
    Cc: Tim Chen
    Cc: Alex Shi
    Cc: Raghavendra K T
    Cc: Andi Kleen
    Cc: George Spelvin
    Cc: MichelLespinasse
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Davidlohr Bueso
    Cc: Andrew Morton
    Signed-off-by: Peter Zijlstra
    [ Fixed build bug. ]
    Signed-off-by: Ingo Molnar

    Tim Chen
     

01 Feb, 2014

1 commit

  • Pull media updates from Mauro Carvalho Chehab:
    - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4)
    - a new dvb frontend for ds2103 chipset (m88ds2103)
    - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf)
    - new drivers for R-Car VSP1
    - a new radio driver: radio-raremono
    - a new tuner driver for ts2022 chipset (m88ts2022)
    - the analog part of em28xx is now a separate module that only
    load/runs if the device is not a pure digital TV device
    - added a staging driver for bcm2048 radio devices
    - the omap 2 video driver (omap24xx) was moved to staging. This driver
    is for an old hardware and uses a deprecated Kernel internal API. If
    nobody cares enough to fix it, it would be removed on a couple Kernel
    releases
    - the sn9c102 driver was moved to staging. This driver was replaced by
    gspca, and disabled on some distros, as almost all devices are known
    to work properly with gspca. It should be removed from kernel on a
    couple Kernel releases
    - lots of driver fixes, improvements and cleanups

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (421 commits)
    [media] media: v4l2-dev: fix video device index assignment
    [media] rc-core: reuse device numbers
    [media] em28xx-cards: properly initialize the device bitmap
    [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c
    [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c
    [media] Staging: media: Fix quoted string split across line in as102_fe.c
    [media] media: st-rc: Add reset support
    [media] m2m-deinterlace: fix allocated struct type
    [media] radio-usb-si4713: fix sparse non static symbol warnings
    [media] em28xx-audio: remove needless check before usb_free_coherent()
    [media] au0828: Fix sparse non static symbol warning
    Revert "[media] go7007-usb: only use go->dev after allocated"
    [media] em28xx-audio: provide an error code when URB submit fails
    [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting
    [media] em28xx: fix usb alternate setting for analog and digital video endpoints > 0
    [media] em28xx: make 'em28xx_ctrl_ops' static
    em28xx-alsa: Fix error patch for init/fini
    [media] em28xx-audio: flush work at .fini
    [media] drxk: remove the option to load firmware asynchronously
    [media] em28xx: adjust period size at runtime
    ...

    Linus Torvalds
     

30 Jan, 2014

1 commit

  • …realmz6/blackfin-linux

    Pull blackfin updates from Steven Miao:
    "Some minor changes and bug fixes"

    * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
    From: Eunbong Song <eunb.song@samsung.com>
    Add platfrom device resource for bfin-sport on bf533 stamp
    fix build error for bf527-ezkit_defconfig for old silicon
    blackfin: Support L1 SRAM parity checking feature on bf60x
    blackfin: bf609: update the anomaly list to Nov 2013
    blackfin: delete non-required instances of <linux/init.h>
    From: Paul Walmsley <pwalmsley@nvidia.com>
    06/18] smp, blackfin: kill SMP single function call interrupt
    arch: blackfin: uapi: be sure of "_UAPI" prefix for all guard macros

    Linus Torvalds
     

29 Jan, 2014

10 commits

  • This patch removes CONFIG_MTD_PARTITIONS in config files for blackfin.
    Because CONFIG_MTD_PARTITIONS was removed by commit
    6a8a98b22b10f1560d5f90aded4a54234b9b2724.

    Signed-off-by: Eunbong Song
    Signed-off-by: Steven Miao

    Steven Miao
     
  • Signed-off-by: Aaron Wu
    Signed-off-by: Steven Miao

    Aaron Wu
     
  • Signed-off-by: Aaron Wu

    fix build error for bf527-ezkit_defconfig for old silicon

    Aaron Wu
     
  • Move code for the SEC faults from the IRQ hanlders into IRQ actions.
    refine bfin fault routine handle

    Signed-off-by: Sonic Zhang
    Signed-off-by: Steven Miao

    Sonic Zhang
     
  • Signed-off-by: Sonic Zhang

    Sonic Zhang
     
  • None of these files are actually using any __init type directives
    and hence don't need to include . Most are just a
    left over from __devinit and __cpuinit removal, or simply due to
    code getting copied from one driver to the next.

    Cc: Mike Frysinger
    Cc: uclinux-dist-devel@blackfin.uclinux.org
    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • blackfin: bf60x: clock: return 0 upon error from clk_round_rate()

    clk_round_rate() should return 0 upon an error, rather than returning
    a negative error code. This is because clk_round_rate() is being
    changed to return an unsigned return type rather than a signed type,
    since some clock sources can generate rates higher than (2^31)-1 Hz.

    Signed-off-by: Paul Walmsley
    Signed-off-by: Steven Miao

    Steven Miao
     
  • Commit 9a46ad6d6df3b54 "smp: make smp_call_function_many() use logic
    similar to smp_call_function_single()" has unified the way to handle
    single and multiple cross-CPU function calls. Now only one interrupt
    is needed for architecture specific code to support generic SMP function
    call interfaces, so kill the redundant single function call interrupt.

    Cc: Andrew Morton
    Cc: Shaohua Li
    Cc: Peter Zijlstra
    Cc: Ingo Molnar
    Cc: Steven Rostedt
    Cc: Jiri Kosina
    Cc: Mike Frysinger
    Cc: uclinux-dist-devel@blackfin.uclinux.org
    Signed-off-by: Jiang Liu

    Jiang Liu
     
  • For all uapi headers, need use "_UAPI" prefix for its guard macro
    (which will be stripped by "scripts/headers_installer.sh").

    Also be sure that all files have their guard macros.

    Also be sure that all "#endif" are followed with comments, and no '\t'
    for guard macro

    Signed-off-by: Chen Gang

    Chen Gang
     
  • Pull vfs updates from Al Viro:
    "Assorted stuff; the biggest pile here is Christoph's ACL series. Plus
    assorted cleanups and fixes all over the place...

    There will be another pile later this week"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (43 commits)
    __dentry_path() fixes
    vfs: Remove second variable named error in __dentry_path
    vfs: Is mounted should be testing mnt_ns for NULL or error.
    Fix race when checking i_size on direct i/o read
    hfsplus: remove can_set_xattr
    nfsd: use get_acl and ->set_acl
    fs: remove generic_acl
    nfs: use generic posix ACL infrastructure for v3 Posix ACLs
    gfs2: use generic posix ACL infrastructure
    jfs: use generic posix ACL infrastructure
    xfs: use generic posix ACL infrastructure
    reiserfs: use generic posix ACL infrastructure
    ocfs2: use generic posix ACL infrastructure
    jffs2: use generic posix ACL infrastructure
    hfsplus: use generic posix ACL infrastructure
    f2fs: use generic posix ACL infrastructure
    ext2/3/4: use generic posix ACL infrastructure
    btrfs: use generic posix ACL infrastructure
    fs: make posix_acl_create more useful
    fs: make posix_acl_chmod more useful
    ...

    Linus Torvalds
     

26 Jan, 2014

1 commit

  • Pull networking updates from David Miller:

    1) BPF debugger and asm tool by Daniel Borkmann.

    2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.

    3) Correct reciprocal_divide and update users, from Hannes Frederic
    Sowa and Daniel Borkmann.

    4) Currently we only have a "set" operation for the hw timestamp socket
    ioctl, add a "get" operation to match. From Ben Hutchings.

    5) Add better trace events for debugging driver datapath problems, also
    from Ben Hutchings.

    6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we
    have a small send and a previous packet is already in the qdisc or
    device queue, defer until TX completion or we get more data.

    7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.

    8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel
    Borkmann.

    9) Share IP header compression code between Bluetooth and IEEE802154
    layers, from Jukka Rissanen.

    10) Fix ipv6 router reachability probing, from Jiri Benc.

    11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.

    12) Support tunneling in GRO layer, from Jerry Chu.

    13) Allow bonding to be configured fully using netlink, from Scott
    Feldman.

    14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can
    already get the TCI. From Atzm Watanabe.

    15) New "Heavy Hitter" qdisc, from Terry Lam.

    16) Significantly improve the IPSEC support in pktgen, from Fan Du.

    17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom
    Herbert.

    18) Add Proportional Integral Enhanced packet scheduler, from Vijay
    Subramanian.

    19) Allow openvswitch to mmap'd netlink, from Thomas Graf.

    20) Key TCP metrics blobs also by source address, not just destination
    address. From Christoph Paasch.

    21) Support 10G in generic phylib. From Andy Fleming.

    22) Try to short-circuit GRO flow compares using device provided RX
    hash, if provided. From Tom Herbert.

    The wireless and netfilter folks have been busy little bees too.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)
    net/cxgb4: Fix referencing freed adapter
    ipv6: reallocate addrconf router for ipv6 address when lo device up
    fib_frontend: fix possible NULL pointer dereference
    rtnetlink: remove IFLA_BOND_SLAVE definition
    rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
    qlcnic: update version to 5.3.55
    qlcnic: Enhance logic to calculate msix vectors.
    qlcnic: Refactor interrupt coalescing code for all adapters.
    qlcnic: Update poll controller code path
    qlcnic: Interrupt code cleanup
    qlcnic: Enhance Tx timeout debugging.
    qlcnic: Use bool for rx_mac_learn.
    bonding: fix u64 division
    rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC
    sfc: Use the correct maximum TX DMA ring size for SFC9100
    Add Shradha Shah as the sfc driver maintainer.
    net/vxlan: Share RX skb de-marking and checksum checks with ovs
    tulip: cleanup by using ARRAY_SIZE()
    ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
    net/cxgb4: Don't retrieve stats during recovery
    ...

    Linus Torvalds
     

25 Jan, 2014

1 commit


24 Jan, 2014

1 commit

  • Pull clk framework changes from Mike Turquette:
    "The first half of the clk framework pull request is made up almost
    entirely of new platform/driver support. There are some conversions
    of existing drivers to the common-clock Device Tree binding, and a few
    non-critical fixes to the framework.

    Due to an entirely unnecessary cyclical dependency with the arm-soc
    tree this pull request is broken into two pieces. The second piece
    will be sent out after arm-soc sends you the pull request that merged
    in core support for the HiSilicon 3620 platform. That same pull
    request from arm-soc depends on this pull request to merge in those
    HiSilicon bits without causing build failures"

    [ Just did the ARM SoC merges, so getting ready for the second clk tree
    pull request - Linus ]

    * tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette/linux: (97 commits)
    devicetree: bindings: Document qcom,mmcc
    devicetree: bindings: Document qcom,gcc
    clk: qcom: Add support for MSM8660's global clock controller (GCC)
    clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)
    clk: qcom: Add support for MSM8974's global clock controller (GCC)
    clk: qcom: Add support for MSM8960's multimedia clock controller (MMCC)
    clk: qcom: Add support for MSM8960's global clock controller (GCC)
    clk: qcom: Add reset controller support
    clk: qcom: Add support for branches/gate clocks
    clk: qcom: Add support for root clock generators (RCGs)
    clk: qcom: Add support for phase locked loops (PLLs)
    clk: qcom: Add a regmap type clock struct
    clk: Add set_rate_and_parent() op
    reset: Silence warning in reset-controller.h
    clk: sirf: re-arch to make the codes support both prima2 and atlas6
    clk: composite: pass mux_hw into determine_rate
    clk: shmobile: Fix MSTP clock array initialization
    clk: shmobile: Fix MSTP clock index
    ARM: dts: Add clock provider specific properties to max77686 node
    clk: max77686: Register OF clock provider
    ...

    Linus Torvalds