1. 29 1月, 2015 1 次提交
  2. 28 1月, 2015 14 次提交
  3. 26 1月, 2015 18 次提交
  4. 21 1月, 2015 4 次提交
    • M
      staging: nvec: specify a platform-device base id · 3ec69881
      Marc Dietrich 提交于
      commit 6e3f62f0 (mfd: core: Fix platform-device id generation) modified
      the computation of the mfd cell id. Negative numbers forbit the specification
      of cell ids as we do. Fix this for now by specifying a base of 0 instead. In
      the long run, this may be changed to automatic cell ids (base -2).
      Reported-by: NMisha Komarovskiy <zombah@gmail.com>
      Signed-off-by: NMarc Dietrich <marvin24@gmx.de>
      Signed-off-by: NGreg Kroah-Hartman <greg@kroah.com>
      3ec69881
    • G
      Merge tag 'iio-for-3.20a_take2' of... · 6e49557b
      Greg Kroah-Hartman 提交于
      Merge tag 'iio-for-3.20a_take2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-testing
      
      Jonathan writes:
      
      First round of IIO new drivers, cleanups and functionality for the 3.20 cycle take 2
      
      Updated pull request with Daniel's fix on top for the power management
      Kconfig changes that had snuck in since last update of the IIO tree
      worked it's way through from mainline.
      
      Original pull message
      
      New device support
      * jsa1212 proxmity / ambient light sensor
      * SM08500 supported added to the kxcjk-1013 accelerometer driver
      * KMX61 Accelerometer/Magnetometer.  This took a somewhat rocky path
        being first merged, then reverted for a rewrite after a discussion of
        how to support additional functionality and finally being merged prior
        to some last reviews coming in, with resultant follow up patches.
      * Freescale mma9551l driver (minor follow up warning supression patch).
      * Semtech SX9500 proximity device driver.
      * ak8975 gains support for ak09911 and ak09912 and drop the standalone driver
        for the ak09911.
      
      New functionality
       * Dummy driver gains some virtual registers making it more flexible.
       * IIO_ACTIVITY channel types, with modifiers running, walking etc.  This is
         to support on chip motion clasifiers.  As such it is in the form of a
         confidence percentage.  The only devices so far only do binary decisions
         but this gives us room when other devices give more nuanced clasification.
       * IIO_EV_DIR_NONE type for events where there is no obvious direction.
         First case is step detection.
       * IIO_STEPS channel type for pedometers.
       * ENABLE mask element used to control turning on counting types such as
         the pedometer that need a 'start point'.
       * INSTANCE event type to support things that happen once.
       * info element for height calibration (used in various motion estimation
         algorithms). Note heigh tof use
       * dummy driver demonstration of the use of all the new bits above.
       * event monitor support for the new events.
       * inv_mpu6050 gains an i2c mux to allow bypassing the device to access
         additional devices connected on the other side of it.  Note that in
         Windows these are handled by firmware on the device and not exposed
         directly.
       * inv_mpu6050 gains ACPI enumeration.
       * inkern interface gains iio_write_channel_raw to allow in kernel users
         of DAC functionality via a simple wrapper.
       * Document input current readings in the ABI docs.
       * Add an error message when we get an out of range error in device tree
         processing for the in kernel interfaces.  Basically a device tree debugging
         aid.
       * Add a sanity check that a scan index for a channel is unique during
         registration.  There to help catch bugs as this should never happen
         in a bug free driver.
      
      Cleanups and fixlets
      
       A rework of buffer registration from Lars - a precursor to some other
       upcoming new stuff (a few patches from others rolled in here as well).
       * Ensure all drivers register the same channels for the device and buffer.
       * Move buffer registration into the core rather than using the old
         two step approach.  Now we have simple ways of using a unified set channels
         for both without requiring channels be exposed by both interface, this
         removes a fair bit of boilerplate.
       * Stop sca3000 and ad5933 (both in staging) enabling buffer channels by
         default. It has long be convention in IIO to startup with no channels
         enabled and leave it up to userspace to say what goes in the buffer.
         Getting rid of these allows us to drop export of iio_scan_mask_set.
       * Drop get_bytes_per_datum from iio_buffer_access_funcs as not been used
         for a while.
       * Allocate standard buffer attributes in the core rather than in every
         driver with a buffer.
       * Make the length attribute read only when a driver is not able to set
         the length.
       * Drop the get_length callback for buffers as it is already available in
         struct iio_buffer.
       * Drop an unused arguement form iio_kfifo_allocate and add devm allocator
         for it.
       * some kconfig entries gain anotation with the resulting module name.
       * Fix a resulting compile issue in dummy driver due to a stub taking
         wrong parameters as a result of the above rework.
       * Fix an off by 2 error in copying the core assigned buffer attributes.
      
      Other cleanups,
       * Trivial space before comma fixups.
       * ak8975 fixlets - none critical.  Rework to allow more device support.
       * Drop unnecessary sizeof(u8) calls.
       * bmp280 - refactor the compensation code to reduce copy operations and
         code length.  A second patch futher optimized this and performed some
         other minor cleanups.
       * kxcjk-1013 - various power control cleanups to avoid unnecessary enable
         / disable of device.  Make sure it is only controlled at all if CONFIG_PM
         is enabled.  Also som cleanups of error paths.
       * Small cleanups in adf4530 driver - pointless message and unnecessary braces.
       * Clarifiy the proximity ABI docs to make it clear it should get bigger
         as we move futher away.
       * Drop a misleading comment form industrialio-core.c
       * Trivial white space cleanups.
       * sca3000 looses an unused debug function.
       * Fix char unsigned ordering in ad8366
       * Increase the sleep time in ad9523 to make it predictable (value didn't
         really matter so make it more than 20 msecs)
       * mxs-lradc touchscreen property cleanups in device tree are fixed to ensure
         the meet all the 'interesting' documentation.
       * A couple of cleanups for the staging ad5933 driver to avoid unnecessary
         conversion to a processed temperature vlaue in kernel and remove
         platform data form the state structure as not needed after probe.
       * Fix a wrong scale factor in the docs.
      
      Misc
       * Add IIO include files to the maintainers entry.
      6e49557b
    • N
      staging: fbtft: remove ARCH_BCM2708 optimization · e6008857
      Noralf Trønnes 提交于
      ARCH_BCM2708 is not present in mainline so remove optimization.
      Signed-off-by: NNoralf Trønnes <notro@tronnes.org>
      Reported-by: NPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      e6008857
    • D
      iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM · df1fad80
      Daniel Baluta 提交于
      After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
      selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
      depending on CONFIG_PM_RUNTIME may now be changed to depend on
      CONFIG_PM.
      
      Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
      drivers/iio/imu/kmx61.c
      Signed-off-by: NDaniel Baluta <daniel.baluta@intel.com>
      Signed-off-by: NJonathan Cameron <jic23@kernel.org>
      df1fad80
  5. 19 1月, 2015 1 次提交
  6. 18 1月, 2015 2 次提交
    • L
      Linux 3.19-rc5 · ec6f34e5
      Linus Torvalds 提交于
      ec6f34e5
    • L
      Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d0ac5d8e
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "We've been sitting on our fixes branch for a while, so this batch is
        unfortunately on the large side.
      
        A lot of these are tweaks and fixes to device trees, fixing various
        bugs around clocks, reg ranges, etc.  There's also a few defconfig
        updates (which are on the late side, no more of those).
      
        All in all the diffstat is bigger than ideal at this time, but nothing
        in here seems particularly risky"
      
      * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
        reset: sunxi: fix spinlock initialization
        ARM: dts: disable CCI on exynos5420 based arndale-octa
        drivers: bus: check cci device tree node status
        ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288
        ARM: nomadik: fix up leftover device tree pins
        ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
        ARM: at91/dt: sam9263: Add missing clocks to lcdc node
        ARM: at91: sama5d3: dt: correct the sound route
        ARM: at91/dt: sama5d4: fix the timer reg length
        ARM: exynos_defconfig: Enable LM90 driver
        ARM: exynos_defconfig: Enable options for display panel support
        arm: dts: Use pmu_system_controller phandle for dp phy
        ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances
        ARM: dts: berlin: correct BG2Q's SM GPIO location.
        ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
        ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
        ARM: dts: Revert disabling of smc91x for n900
        ARM: dts: imx51-babbage: Fix ULPI PHY reset modelling
        ARM: dts: dra7-evm: fix qspi device tree partition size
        ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT
        ...
      d0ac5d8e