1. 15 Aug, 2015 18 commits
  2. 12 Aug, 2015 6 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-4.3b-2' of... · 1c46ae0a
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-4.3b-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      Jonathan writes:
      Second set of new device support, features and cleanup for the 4.3 cycle.
      Take 2 also includes a fix set that was too late for the 4.2 cycle.
      As we had a lot of tools and docs work in this set, I have broken those
      out into their own categories in this description.
      Fixes from the pull request '4th set of IIO fixes for the 4.2 cycle'.
      * Poll functions for both event chardev and the buffer one were returning
        negative error codes (via a positive value).
      * A recent change to lsiio adding some error handling that was wrong and
        stopped the tool working.
      * bmg160 was missing some dependencies in Kconfig
      * berlin2-adc had a misshandled register (wrote a value rather than a bitmap)
      New device support
      * TI opt3001 light sensor
      * TXC PA12 ALS and proximity sensor.
      * mcp3301 ADC support (in mcp320x driver)
      * ST lsm303agr accelerometer and magnetometer drivers (plus some st-sensors
        common support to allow different WHOAMI register addresses, devices with
        fixed scale and allow interrupt equiped magnetometers).
      * ADIS16305, ADIS16367, ADIS16445IMUs (in the adis16400 driver)
      * ADIS16266 gyro (in the adis16260 driver)
      * ADIS16137 gyro (in the adis16136 driver)
      New functionality
      * mmc35240 DT bindings.
      * Inverse unit conversion macros to aid handing of values written to sysfs
      Core cleanup
      * Forward declaration of struct iio_trigger to avoid a compile warning.
      Driver cleanup / fixes
      * mxs-lradc
        - Clarify which parts are supported.
        - Fix spelling erorrs.
        - Missing/extra includes
        - reorder includes
        - add datasheet name listings for all usable channels (to allow them
          to be bound by name from consumer drivers)
      * acpi-als - add some function prefixes as per general iio style.
      * bmc150_magn - replace a magic value with the existing define.
      * vf610 - determine possible sample frequencies taking into account the
        electrical characteristics (defining a minimum sample time)
      * dht11
        - whitespace
        - additional docs
        - avoid mulitple assignments in one line
        - Use the new funciton ktime_get_resolution_ns to cleanup a nasty trick
          previously used for timing.
      * Fix all drivers that consider 0 a valid IRQ for historical reasons.
      * Export I2C module alias info where previously missing (to allow autoprobing)
      * Export OF module alias info where previously missing.
      * mmc35240 - switch some variables into arrays to improve readability.
      * mlx90614 - define some magic numbers for readability.
      * bmc150_magn
        - expand area locked by a mutex to cover all the use of the
        - use descriptive naming for a mask instead of a magic value.
      * berin2-adc
        - pass up an error code rather that a generic error
        - constify the iio_chan_spec
        - some other little tidy ups.
      * stk8312
        - fix a dependency on triggered buffers in kconfig
        - add a check for invalid attribute values
        - improve error handling by returning error codes where possible and
          return immediately where relevant
        - rework macro defs to use GENMASK etc
        - change some variable types to reduce unnecessary casting
        - clean up code style
        - drop a local buffer copy for bulk reads and use the one in data->buffer
      * adis16400 - the adis16448 gyroscope scale was wrong.
      * adis16480 - some more wrong scales for various parts.
      * adis16300 - has an undocumented product id and serial number registers so
        use them.
      * iio_simple_dummy - fix some wrong code indentation.
      * bmc150-accel - use the chip ID to detect the chip present rather than
        verifying the expected part was there.  This was in response to a wrong
        ACPI entry on the WinBook TW100.
      * mma8452
        - fix _get_hp_filter_index
        - drop a double include
        - pass up an error code rather than rewriting it
        - range check input values to attribute writes
        - register defs tidy up using GENMASK and reordering them to be easier to
        - various coding style cleanups
        - put the Kconfig entry in the write place (alphabetically).
      Tools related
      * Tools cleanup - drop an explicity NULL comparison, some unnecessary braces,
        use the ARRAY_SIZE macro, send error messages to stderr instead of dropping
        them in the middle of normal output.
      * Fix tools to allow that scale and offset attributes are optional.
      * More tools fixes including allowing true 32bit data (previously an overflow
        prevented more than 31bits)
      * Drop a stray header guard that ended up in a c file.
      * Make calc_digits static as it isn't exported or in the header.
      * Set ci_array pointer to NULL after free as a protection against non safe
        usage of the tools core code.  Also convert a double pointer to a single
        one as the extra level of indirection was unnecessary.
      * DocBook introduction by Daniel Baluta.  Glad we are beginning to
        draw together some more introductory docs to suplement the various
        tools / examples.
      * Drop bytes_per_datum sysfs attribute docs as it no longer exists.
      * A whole load of missing / fixing of kernel-doc for the core of IIO.
      * Document the trigger name sysfs attribute in the ABI docs.
      * Minor typos in the ABI docs related to power down modes.
    • Cristina Opriceana's avatar
      iio: event: Remove negative error code from iio_event_poll · 41d903c0
      Cristina Opriceana authored
      Negative return values are not supported by iio_event_poll since
      its return type is unsigned int.
      Fixes: f18e7a06
       ("iio: Return -ENODEV for file operations if the device has been unregistered")
      Signed-off-by: default avatarCristina Opriceana <cristina.opriceana@gmail.com>
      Cc: <Stable@vger.kernel.org>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
    • Cristina Opriceana's avatar
      iio: industrialio-buffer: Fix iio_buffer_poll return value · 1bdc0293
      Cristina Opriceana authored
      Change return value to 0 if no device is bound since
      unsigned int cannot support negative error codes.
      Fixes: f18e7a06
       ("iio: Return -ENODEV for file operations if the
      device has been unregistered")
      Signed-off-by: default avatarCristina Opriceana <cristina.opriceana@gmail.com>
      Cc: <Stable@vger.kernel.org>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
    • Linus Walleij's avatar
      iio: lsiio: fix error code handling error · af255cd5
      Linus Walleij authored
      commit acf50b35
      "tools:iio:lsiio: add error handling"
      introduced error handling of errors returned from
      read_sysfs_string(), but with a simple if (retval),
      missing the fact that these functions return a positive
      value if the read was successful.
      As a result lsiio regresses and does not show any
      devices on my filesystem. Fix this by checking for
      only negative error codes.
      Cc: Hartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Acked-by: default avatarHartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
    • Markus Pargmann's avatar
      iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required · 06d2f6ca
      Markus Pargmann authored
      This patch adds selects for IIO_BUFFER and IIO_TRIGGERED_BUFFER. Without
      IIO_BUFFER, the driver does not compile.
      Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
      Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
      Cc: <Stable@vger.kernel.org>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
    • Hartmut Knaack's avatar
      iio:adc:berlin2-adc: Fix register definition · 57cb0676
      Hartmut Knaack authored
      Active channel number is stored in BERLIN2_SM_CTRL as value, instead of a
      bit map.
      The masks for channel interrupts and data ready are a 16 bits wide bit
      map each, instead of just 4 bits.
      Also correct the data mask for the temperature sensor, which was
      Reported-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
      Signed-off-by: default avatarHartmut Knaack <knaack.h@gmx.de>
      Acked-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
  3. 11 Aug, 2015 1 commit
  4. 10 Aug, 2015 1 commit
  5. 09 Aug, 2015 5 commits
    • Linus Torvalds's avatar
      Linux 4.2-rc6 · f7644cbf
      Linus Torvalds authored
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · a230e95c
      Linus Torvalds authored
      Pull input subsystem fixes from Dmitry Torokhov:
       "Just small ALPS and Elan touchpads, and other driver fixups"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: elantech - add special check for fw_version 0x470f01 touchpad
        Input: twl4030-vibra - fix ERROR: Bad of_node_put() warning
        Input: alps - only Dell laptops have separate button bits for v2 dualpoint sticks
        Input: axp20x-pek - add module alias
        Input: turbografx - fix potential out of bound access
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3fbdc379
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Another round of MIPS fixes for 4.2.  No area does particularly stand
        out but we have a two unpleasant ones:
         - Kernel ptes are marked with a global bit which allows the kernel to
           share kernel TLB entries between all processes.  For this to work
           both entries of an adjacent even/odd pte pair need to have the
           global bit set.  There has been a subtle race in setting the other
           entry's global bit since ~ 2000 but it take particularly
           pathological workloads that essentially do mostly vmalloc/vfree to
           trigger this.
           This pull request fixes the 64-bit case but leaves the case of 32
           bit CPUs with 64 bit ptes unsolved for now.  The unfixed cases
           affect hardware that is not available in the field yet.
         - Instruction emulation requires loading instructions from user space
           but the current fast but simplistic approach will fail on pages
           that are PROT_EXEC but !PROT_READ.  For this reason we temporarily
           do not permit this permission and will map pages with PROT_EXEC |
        The remainder of this pull request is more or less across the field
        and the short log explains them well"
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Make set_pte() SMP safe.
        MIPS: Replace add and sub instructions in relocate_kernel.S with addiu
        MIPS: Flush RPS on kernel entry with EVA
        Revert "MIPS: BCM63xx: Provide a plat_post_dma_flush hook"
        MIPS: BMIPS: Delete unused Kconfig symbol
        MIPS: Export get_c0_perfcount_int()
        MIPS: show_stack: Fix stack trace with EVA
        MIPS: do_mcheck: Fix kernel code dump with EVA
        MIPS: SMP: Don't increment irq_count multiple times for call function IPIs
        MIPS: Partially disable RIXI support.
        MIPS: Handle page faults of executable but unreadable pages correctly.
        MIPS: Malta: Don't reinitialise RTC
        MIPS: unaligned: Fix build error on big endian R6 kernels
        MIPS: Fix sched_getaffinity with MT FPAFF enabled
        MIPS: Fix build with CONFIG_OF=y for non OF-enabled targets
        CPUFREQ: Loongson2: Fix broken build due to incorrect include.
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · af0b3152
      Linus Torvalds authored
      Pull btrfs fix from Chris Mason:
       "We have a btrfs quota regression fix.
        I merged this one on Thursday and have run it through tests against
        current master.
        Normally I wouldn't have sent this while you were finalizing rc6, but
        I'm feeding mosquitoes in the adirondacks next week, so I wanted to
        get this one out before leaving.  I'll leave longer tests running and
        check on things during the week, but I don't expect any problems"
      * 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: qgroup: Fix a regression in qgroup reserved space.
    • Linus Torvalds's avatar
      Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · bae1577e
      Linus Torvalds authored
      Pull thermal management fixes from Zhang Rui:
         - fix an error that "weight_attr" sysfs attribute is not removed
           while unbinding.  From: Viresh Kumar.
         - fix power allocator governor tracing to return the real request.
           From Javi Merino.
         - remove redundant owner assignment of hisi platform thermal driver.
           From Krzysztof Kozlowski.
         - a couple of small fixes of Exynos thermal driver.  From Krzysztof
           Kozlowski and Chanwoo Choi"
      * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: Drop owner assignment from platform_driver
        thermal: exynos: Remove unused code related to platform_data on probe()
        thermal: exynos: Add the dependency of CONFIG_THERMAL_OF instead of CONFIG_OF
        thermal: exynos: Disable the regulator on probe failure
        thermal: power_allocator: trace the real requested power
        thermal: remove dangling 'weight_attr' device file
  6. 08 Aug, 2015 9 commits