Doug / smarc-fsl-linux-kernel

14 Feb, 2012

1 commit

10 Jan, 2012

1 commit

  • 12e555089   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging ... Browse Code »

    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
    net/hyperv: Add support for jumbo frame up to 64KB
    net/hyperv: Add NETVSP protocol version negotiation
    net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
    staging/rtl8192e: Register against lib80211
    staging/rtl8192e: Convert to lib80211_crypt_info
    staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
    staging/rtl8192e: Add lib80211.h to rtllib.h
    staging/mei: add watchdog device registration wrappers
    drm/omap: GEM, deal with cache
    staging: vt6656: int.c, int.h: Change return of function to void
    staging: usbip: removed unused definitions from header
    staging: usbip: removed dead code from receive function
    staging:iio: Drop {mark,unmark}_in_use callbacks
    staging:iio: Drop buffer mark_param_change callback
    staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
    staging:iio: Drop buffer busy flag
    staging:iio: Make sure a device is only opened once at a time
    staging:iio: Disallow modifying buffer size when buffer is enabled
    staging:iio: Disallow changing scan elements in all buffered modes
    staging:iio: Use iio_buffer_enabled instead of open coding it
    ...

    Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
    module_init due to using module_i2c_driver() helper, next to removal of
    MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).

    Linus Torvalds
     

27 Nov, 2011

3 commits

  • c8a9f8056   staging:iio:treewide only use shared to decide on interfaces ... Browse Code »

    Internally the fact that say scale is shared across channels is
    actually of remarkably little interest. Hence lets not store it.
    Numerous devices have weird combinations of channels sharing
    scale anyway so it is not as though this was really telling
    us much. Note however that we do still use the shared sysfs
    attrs thus massively reducing the number of attrs in complex
    drivers.

    Side effect is that certain drivers that were abusing this
    (mostly my work) needed to do a few more checks on what the
    channel they are being queried on actually is.

    This is also helpful for in kernel interfaces where we
    just want to query the scale and don't care whether it
    is shared with other channels or not.

    Signed-off-by: Jonathan Cameron
    Acked-by: Lars-Peter Clausen
    Signed-off-by: Greg Kroah-Hartman

    Jonathan Cameron
     
  • 924f8a21d   staging:iio: Do not use bitmasks for channel info addresses ... Browse Code »

    Currently the iio framework uses bitmasks for the address field of channel info
    attributes. This is for historical reasons and no longer required since it will
    only ever query a single info attribute at once. This patch changes the code to
    use the non-shifted iio_chan_info_enum values for the info attribute address.

    Signed-off-by: Lars-Peter Clausen
    Signed-off-by: Jonathan Cameron
    Signed-off-by: Greg Kroah-Hartman

    Lars-Peter Clausen
     
  • af5046af1   staging:iio: header reorganization ... Browse Code »

    Issue brought up by Lars-Peter Clausen. This is a varient of what
    he suggested.

    io/iio.h for driver stuff (has to include types.h)
    Sub files for the bits drivers may or may not use
    iio/sysfs.h
    iio/buffer.h (contents of current buffer_generic.h)
    (obviously anything offering events will need events.h as well)
    iio/types.h for the enums that matter to both
    iio_chan_type, iio_modifier
    iio/events.h for the event code stuff
    IIO_EVENT_CODE and friends. + everything in chrdev.h So this
    is the stuff that userspace cares about.
    Also include iio_event_type, iio_event_direction

    Thus iio drivers include iio.h + as required
    events.h
    sysfs.h
    buffer.h

    in kernel users (once that interface is merged) will need inkern.h
    which will pull in types.h

    Userspace will need just events.h (which pulls in types.h) to get
    everything they need to know about. Buffer userspace access doesn't
    currently need any core defines. All information about the data
    format is passed through sysfs.

    Signed-off-by: Jonathan Cameron
    Signed-off-by: Greg Kroah-Hartman

    Jonathan Cameron
     

18 Nov, 2011

1 commit

20 Oct, 2011

2 commits