1. 13 Jul, 2015 2 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-for-4.2b' of... · 8c5dfdbb
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-for-4.2b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      Second set of IIO fixes for the 4.2 cycle. Note these depend (mostly) on
      material in the recent merge window, hence their separation from set (a)
      as the fixes-togreg branch predated the merge window.  I am running rather
      later with these than I would have liked hence the large set.
      
      * stk3310 fixes from Hartmut's review that came in post merge
        - fix direction of proximity inline with recent documentation
          clarification.
        - fix missing REGMAP_I2C dependency
        - rework the error handling for raw readings to fix an failure to power
          down in the event of a raw reading failing.
        - fix a bug in the compensation code which was toggling an extra bit in the
          register.
      * mmc35240 - reported samplign frequencies were wrong.
      * ltr501 fixes
        - fix a case of returning the return value of a regmap_read instead of
          the value read.
        - fix missing regmap dependency
      * sx9500 - fix missing default values for ret in a couple of places to handle
        the case of no enabled channels.
      * tmp006 - check that writes to info_mask elements are actually to writable
        ones.  Otherwise, writing to any of them will change the sampling frequency.
      8c5dfdbb
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-for-4.2a' of... · a732cd43
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-for-4.2a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      First set of IIO fixes for the 4.2 cycle.
      
      * Fix a regression in hid sensors suspend time as a result of adding runtime
        pm.  The normal flow of waking up devices in order to go into suspend
        (given the devices are normally suspended when not reading) to a regression
        in suspend time on some laptops (reports of an additional 8 seconds).
        Fix this by checking to see if a user action resulting in the wake up, and
        make it a null operation if it didn't.  Note that for hid sensors, there is
        nothing useful to be done when moving into a full suspend from a runtime
        suspend so they might as well be left alone.
      * rochip_saradc: fix some missing MODULE_* data including the licence so that
        the driver does not taint the kernel incorrectly and can build as a module.
      * twl4030 - mark irq as oneshot as it always should have been.
      * inv-mpu - write formats for attributes not specified, leading to miss
        interpretation of the gyro scale channel when written.
      * Proximity ABI clarification.  This had snuck through as a mess.  Some
        drivers thought proximity went in one direction, some the other.  We went
        with the most common option, documented it and fixed up the drivers going
        the other way.  Fix for sx9500 included in this set.
      * ad624r - fix a wrong shift in the output data.
      * at91_adc - remove a false limit on the value of the STARTUP register
        applied by too small a type for the device tree parameter.
      * cm3323 - clear the bits when setting the integration time (otherwise
        we can only ever set more bits in the relevant field).
      * bmc150-accel - multiple triggers are registered, but on error were not being
        unwound in the opposite order leading to removal of triggers that had not
        yet successfully been registered (count down instead of up when unwinding).
      * tcs3414 - ensure right part of val / val2 pair read so that the integration
        time is not always 0.
      * cc10001_adc - bug in kconfig dependency. Use of OR when AND was intended.
      a732cd43
  2. 07 Jul, 2015 1 commit
  3. 06 Jul, 2015 1 commit
    • Paul Gortmaker's avatar
      staging: make board support depend on OF_IRQ and CLKDEV_LOOKUP · 59b75000
      Paul Gortmaker authored
      Building allmodconfig for arch/cris currently fails with:
      
      drivers/built-in.o: In function `board_staging_register_clock':
      drivers/staging/board/board.c:131: undefined reference to `clk_add_alias'
      make: *** [vmlinux] Error 1
      
      The clk_add_alias lives in drivers/clk/clkdev.c and that file
      is only compiled for CONFIG_CLKDEV_LOOKUP, so it would seem
      we need to add a dependency on that.
      
      Geert also reported seeing this in his build coverage:
      
        There seems to be another missing dependency on OF_IRQ:
      
        drivers/built-in.o: In function `board_staging_gic_fixup_resources':
        (.init.text+0x21c2): undefined reference to `irq_create_of_mapping'
      
      so we might as well fix that at the same time since it is
      on the same line.
      
      Cc: Magnus Damm <damm+renesas@opensource.se>
      Cc: Simon Horman <horms+renesas@verge.net.au>
      Cc: Geert Uytterhoeven <geert+renesas@glider.be>
      Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      59b75000
  4. 05 Jul, 2015 13 commits
  5. 04 Jul, 2015 23 commits