1. 10 Aug, 2014 1 commit
  2. 06 Aug, 2014 14 commits
  3. 05 Aug, 2014 25 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · f4d33337
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       - removal of sn9c102.  This device driver was replaced a long time ago
         by gspca
       - solo6x10 and go7007 webcam drivers moved from staging into
         mainstream.  They were waiting for an API to allow setting the image
         detection matrix
       - SDR drivers moved from staging into mainstream: sdr-msi3101 (renamed
         as msi2500) and rtl2832
       - added SDR driver for airspy
       - added demux driver: si2165
       - rework at several RC subsystem, making the code for RC-5 SZ variant
         to be added at the standard RC5 decoder
       - added decoder for the XMP IR protocol
       - tuner driver moved from staging into mainstream: msi3101 (renamed as
         msi001)
       - added documentation for some additional SDR pixfmt
       - some device tree bindings documented
       - added support for exynos3250 at s5p-jpeg
       - remove the obsolete, unmaintained and broken mx1_camera driver
       - added support for remote controllers at au0828 driver
       - added a RC driver: sunxi-cir
       - several driver fixes, enhancements and cleanups.
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (455 commits)
        [media] cx23885: fix UNSET/TUNER_ABSENT confusion
        [media] coda: fix build error by making reset control optional
        [media] radio-miropcm20: fix sparse NULL pointer warning
        [media] MAINTAINERS: Update go7007 pattern
        [media] MAINTAINERS: Update solo6x10 patterns
        [media] media: atmel-isi: add primary DT support
        [media] media: atmel-isi: convert the pdata from pointer to structure
        [media] media: atmel-isi: add v4l2 async probe support
        [media] rcar_vin: add devicetree support
        [media] media: pxa_camera device-tree support
        [media] media: mt9m111: add device-tree suppport
        [media] soc_camera: add support for dt binding soc_camera drivers
        [media] media: soc_camera: pxa_camera documentation device-tree support
        [media] media: mt9m111: add device-tree documentation
        [media] s5p-mfc: remove unnecessary calling to function video_devdata()
        [media] s5p-jpeg: add chroma subsampling adjustment for Exynos3250
        [media] s5p-jpeg: Prevent erroneous downscaling for Exynos3250 SoC
        [media] s5p-jpeg: Assure proper crop rectangle initialization
        [media] s5p-jpeg: fix g_selection op
        [media] s5p-jpeg: Adjust jpeg_bound_align_image to Exynos3250 needs
        ...
      f4d33337
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 91c2ff77
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "A couple of nice new features this month, the ability to map
        regulators in order to allow voltage control by external coprocessors
        is something people have been asking for for a long time.
      
         - improved support for switch only "regulators", allowing current
           state to be read from the parent regulator but no setting.
      
         - support for obtaining the register access method used to set
           voltages, for use in systems which can offload control of this to a
           coprocessor (typically for DVFS).
      
         - support for Active-Semi AC8846, Dialog DA9211 and Texas Instruments
           TPS65917"
      
      * tag 'regulator-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (58 commits)
        regulator: act8865: fix build when OF is not enabled
        regulator: act8865: add act8846 to DT binding documentation
        regulator: act8865: add support for act8846
        regulator: act8865: prepare support for other act88xx devices
        regulator: act8865: set correct number of regulators in pdata
        regulator: act8865: Remove error variable in act8865_pmic_probe
        regulator: act8865: fix parsing of platform data
        regulator: tps65090: Set voltage for fixed regulators
        regulator: core: Allow to get voltage count and list from parent
        regulator: core: Get voltage from parent if not available
        regulator: Add missing statics and inlines for stub functions
        regulator: lp872x: Don't set constraints within the regulator driver
        regmap: Fix return code for stub regmap_get_device()
        regulator: s2mps11: Update module description and Kconfig to add S2MPU02 support
        regulator: Add helpers for low-level register access
        regmap: Allow regmap_get_device() to be used by modules
        regmap: Add regmap_get_device
        regulator: da9211: Remove unnecessary devm_regulator_unregister() calls
        regulator: Add DT bindings for tps65218 PMIC regulators.
        regulator: da9211: new regulator driver
        ...
      91c2ff77
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 1325b655
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "A quiet release, more bug fixes than anything else.  A few things do
        stand out though:
      
         - updates to several drivers to move towards the standard GPIO chip
           select handling in the core.
         - DMA support for the SH MSIOF driver.
         - support for Rockchip SPI controllers (their first mainline
           submission)"
      
      * tag 'spi-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (64 commits)
        spi: davinci: use spi_device.cs_gpio to store gpio cs per spi device
        spi: davinci: add support to configure gpio cs through dt
        spi/pl022: Explicitly truncate large bitmask
        spi/atmel: Fix pointer to int conversion warnings on 64 bit builds
        spi: davinci: fix to support more than 2 chip selects
        spi: topcliff-pch: don't hardcode PCI slot to get DMA device
        spi: orion: fix incorrect handling of cell-index DT property
        spi: orion: Fix error return code in orion_spi_probe()
        spi/rockchip: fix error return code in rockchip_spi_probe()
        spi/rockchip: remove redundant dev_err call in rockchip_spi_probe()
        spi/rockchip: remove duplicated include from spi-rockchip.c
        ARM: dts: fix the chip select gpios definition in the SPI nodes
        spi: s3c64xx: Update binding documentation
        spi: s3c64xx: use the generic SPI "cs-gpios" property
        spi: s3c64xx: Revert "spi: s3c64xx: Added provision for dedicated cs pin"
        spi: atmel: Use dmaengine_prep_slave_sg() API
        spi: topcliff-pch: Update error messages for dmaengine_prep_slave_sg() API
        spi: sh-msiof: Use correct device for DMA mapping with IOMMU
        spi: sh-msiof: Handle dmaengine_prep_slave_single() failures gracefully
        spi: rspi: Handle dmaengine_prep_slave_sg() failures gracefully
        ...
      1325b655
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · dc7aafba
      Linus Torvalds authored
      Pull iommu updates from Joerg Roedel:
       "This time with:
      
         - support for the generic PCI device alias code in x86 IOMMU drivers
      
         - a new sysfs interface for IOMMUs
      
         - preparations for hotplug support in the Intel IOMMU driver
      
         - change the AMD IOMMUv2 driver to not hold references to core data
           structures like mm_struct or task_struct.  Rely on mmu_notifers
           instead.
      
         - removal of the OMAP IOVMM interface, all users of it are converted
           to DMA-API now
      
         - make the struct iommu_ops const everywhere
      
         - initial PCI support for the ARM SMMU driver
      
         - there is now a generic device tree binding documented for ARM
           IOMMUs
      
         - various fixes and cleanups all over the place
      
        Also included are some changes to the OMAP code, which are acked by
        the maintainer"
      
      * tag 'iommu-updates-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (67 commits)
        devicetree: Add generic IOMMU device tree bindings
        iommu/vt-d: Fix race setting IRQ CPU affinity while freeing IRQ
        iommu/amd: Fix 2 typos in comments
        iommu/amd: Fix device_state reference counting
        iommu/amd: Remove change_pte mmu_notifier call-back
        iommu/amd: Don't set pasid_state->mm to NULL in unbind_pasid
        iommu/exynos: Select ARM_DMA_USE_IOMMU
        iommu/vt-d: Exclude devices using RMRRs from IOMMU API domains
        iommu/omap: Remove platform data da_start and da_end fields
        ARM: omap: Don't set iommu pdata da_start and da_end fields
        iommu/omap: Remove virtual memory manager
        iommu/vt-d: Fix issue in computing domain's iommu_snooping flag
        iommu/vt-d: Introduce helper function iova_size() to improve code readability
        iommu/vt-d: Introduce helper domain_pfn_within_range() to simplify code
        iommu/vt-d: Simplify intel_unmap_sg() and kill duplicated code
        iommu/vt-d: Change iommu_enable/disable_translation to return void
        iommu/vt-d: Simplify include/linux/dmar.h
        iommu/vt-d: Avoid freeing virtual machine domain in free_dmar_iommu()
        iommu/vt-d: Fix possible invalid memory access caused by free_dmar_iommu()
        iommu/vt-d: Allocate dynamic domain id for virtual domains only
        ...
      dc7aafba
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 161d2e0a
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "Notable changes:
      
         - Heiko Schocher provided a driver for TI TMP103.
         - Kamil Debski provided a driver for pwm-controlled fans.
         - Neelesh Gupta provided a driver for power, fan rpm, voltage and
           temperature reporting on powerpc/powernv systems.
         - Scott Kanowitz provided a driver supporting Lattice's POWR1220
           power manager IC.
         - Richard Zhu provided a pmbus front-end driver for TPS40422.
         - Frans Klaver added support for TMP112 to the lm75 driver.
         - Johannes Pointner added support for EPCOS B57330V2103 to the
           ntc_thermistor driver.
         - Guenter Roeck added support for TMP441 and TMP442 to the tmp421
           driver.
         - Axel Lin converted several drivers to the new hwmon API (36 of
           them, if I counted correctly), and cleaned up many of the drivers
           along the way.
      
        There are also a number of patches fixing bugs discovered while
        testing Axel's changes"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (88 commits)
        hwmon: (g762) Use of_property_read_u32 at appropriate place
        hwmon: (sis5595) Prevent overflow problem when writing large limits
        hwmon: (gpio-fan) Prevent overflow problem when writing large limits
        hwmon: (ibmpowernv) Use of_property_read_u32 at appropriate place
        hwmon: (lm85) Convert to devm_hwmon_device_register_with_groups
        hwmon: (lm85) Avoid forward declaration
        hwmon: (lm78) Convert to devm_hwmon_device_register_with_groups
        hwmon: (max6697) Use of_property_read_bool at appropriate places
        hwmon: (pwm-fan) Make SENSORS_PWM_FAN depend on OF
        hwmon: (pwm-fan) Remove duplicate dev_set_drvdata call
        hwmon: (nct6775) Remove num_attr_groups from struct nct6775_data
        hwmon: (nct6775) Update module description and Kconfig for NCT6106D and NCT6791D
        hwmon: (adt7411) Convert to devm_hwmon_device_register_with_groups
        hwmon: (g762) Convert to hwmon_device_register_with_groups
        hwmon: (emc2103) Convert to devm_hwmon_device_register_with_groups
        hwmon: (smsc47m1) Avoid forward declaration
        hwmon: (smsc47m192) Convert to devm_hwmon_device_register_with_groups
        hwmon: (smsc47m192) Avoid forward declaration
        hwmon: (max1668) Make max1668_addr_list array const
        hwmon: (max6639) Make normal_i2c array const
        ...
      161d2e0a
    • Mark Brown's avatar
      Merge branch 'for-next' of... · f955c8ba
      Mark Brown authored
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regulator-next
      f955c8ba
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/topic/tps65217',... · ed4bf4f5
      Mark Brown authored
      Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next
      ed4bf4f5
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/topic/s2mps11',... · f71f2627
      Mark Brown authored
      Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02', 'regulator/topic/s5m8767' and 'regulator/topic/tps65090' into regulator-next
      f71f2627
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/topic/lp8755',... · d5b5d9d4
      Mark Brown authored
      Merge remote-tracking branches 'regulator/topic/lp8755', 'regulator/topic/ltc3589', 'regulator/topic/max8952', 'regulator/topic/mc13xxx' and 'regulator/topic/palmas' into regulator-next
      d5b5d9d4
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/topic/da9211',... · a627506a
      Mark Brown authored
      Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/getreg', 'regulator/topic/gpio' and 'regulator/topic/lp872x' into regulator-next
      a627506a
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/topic/88pm800',... · 862f9f84
      Mark Brown authored
      Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/as3722' and 'regulator/topic/bcm590xx' into regulator-next
      862f9f84
    • Mark Brown's avatar
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/fix/act8865',... · 9950756d
      Mark Brown authored
      Merge remote-tracking branches 'regulator/fix/act8865', 'regulator/fix/arizona' and 'regulator/fix/tps65218' into regulator-linus
      9950756d
    • Mark Brown's avatar
      Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865 · 7cad4c8f
      Mark Brown authored
      Conflicts:
      	drivers/regulator/act8865-regulator.c
      7cad4c8f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · c489d98c
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Included in this update:
      
         - perf updates from Will Deacon:
      
           The main changes are callchain stability fixes from Jean Pihet and
           event mapping and PMU name rework from Mark Rutland
      
           The latter is preparatory work for enabling some code re-use with
           arm64 in the future.
      
         - updates for nommu from Uwe Kleine-König:
      
           Two different fixes for the same problem making some ARM nommu
           configurations not boot since 3.6-rc1.  The problem is that
           user_addr_max returned the biggest available RAM address which
           makes some copy_from_user variants fail to read from XIP memory.
      
         - deprecate legacy OMAP DMA API, in preparation for it's removal.
      
           The popular drivers have been converted over, leaving a very small
           number of rarely used drivers, which hopefully can be converted
           during the next cycle with a bit more visibility (and hopefully
           people popping out of the woodwork to help test)
      
         - more tweaks for BE systems, particularly with the kernel image
           format.  In connection with this, I've cleaned up the way we
           generate the linker script for the decompressor.
      
         - removal of hard-coded assumptions of the kernel stack size, making
           everywhere depend on the value of THREAD_SIZE_ORDER.
      
         - MCPM updates from Nicolas Pitre.
      
         - Make it easier for proper CPU part number checks (which should
           always include the vendor field).
      
         - Assembly code optimisation - use the "bx" instruction when
           returning from a function on ARMv6+ rather than "mov pc, reg".
      
         - Save the last kernel misaligned fault location and report it via
           the procfs alignment file.
      
         - Clean up the way we create the initial stack frame, which is a
           repeated pattern in several different locations.
      
         - Support for 8-byte get_user(), needed for some DRM implementations.
      
         - mcs locking from Will Deacon.
      
         - Save and restore a few more Cortex-A9 registers (for errata
           workarounds)
      
         - Fix various aspects of the SWP emulation, and the ELF hwcap for the
           SWP instruction.
      
         - Update LPAE logic for pte_write and pmd_write to make it more
           correct.
      
         - Support for Broadcom Brahma15 CPU cores.
      
         - ARM assembly crypto updates from Ard Biesheuvel"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (53 commits)
        ARM: add comments to the early page table remap code
        ARM: 8122/1: smp_scu: enable SCU standby support
        ARM: 8121/1: smp_scu: use macro for SCU enable bit
        ARM: 8120/1: crypto: sha512: add ARM NEON implementation
        ARM: 8119/1: crypto: sha1: add ARM NEON implementation
        ARM: 8118/1: crypto: sha1/make use of common SHA-1 structures
        ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>
        ARM: 8111/1: Enable erratum 798181 for Broadcom Brahma-B15
        ARM: 8110/1: do CPU-specific init for Broadcom Brahma15 cores
        ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE
        ARM: 8108/1: mm: Introduce {pte,pmd}_isset and {pte,pmd}_isclear
        ARM: hwcap: disable HWCAP_SWP if the CPU advertises it has exclusives
        ARM: SWP emulation: only initialise on ARMv7 CPUs
        ARM: SWP emulation: always enable when SMP is enabled
        ARM: 8103/1: save/restore Cortex-A9 CP15 registers on suspend/resume
        ARM: 8098/1: mcs lock: implement wfe-based polling for MCS locking
        ARM: 8091/2: add get_user() support for 8 byte types
        ARM: 8097/1: unistd.h: relocate comments back to place
        ARM: 8096/1: Describe required sort order for textofs-y (TEXT_OFFSET)
        ARM: 8090/1: add revision info for PL310 errata 588369 and 727915
        ...
      c489d98c
    • Beniamino Galvani's avatar
      regulator: act8865: fix build when OF is not enabled · 34e0247f
      Beniamino Galvani authored
      act8846_matches and act8865_matches are defined only when OF is
      enabled. Move references to them to the act8865_pdata_from_dt()
      function to avoid a build error when OF is disabled.
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      34e0247f
    • Beniamino Galvani's avatar
      regulator: act8865: add act8846 to DT binding documentation · 0b8eebc0
      Beniamino Galvani authored
      This patch adds a new "active-semi,act8846" compatible string and a
      list of supported regulator names to the devicetree binding
      documentation for Active-Semi PMUs.
      Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      0b8eebc0
    • Beniamino Galvani's avatar
      regulator: act8865: add support for act8846 · ac0c0ea8
      Beniamino Galvani authored
      Add device id and definition of registers and regulators to support
      the act8846 PMU.
      Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Tested-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
      Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      ac0c0ea8
    • Beniamino Galvani's avatar
      regulator: act8865: prepare support for other act88xx devices · 50a03e35
      Beniamino Galvani authored
      This patch prepares support for other devices in the act88xx family of
      PMUs manufactured by Active-Semi.
      
      http://www.active-semi.com/products/power-management-units/act88xx/Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Tested-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
      Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      50a03e35
    • Beniamino Galvani's avatar
      regulator: act8865: set correct number of regulators in pdata · bbb83f38
      Beniamino Galvani authored
      act8865_pdata_from_dt() populates the array pdata->regulators with all
      the regulators and then assigns the field init_data only for the ones
      actually found in the DT.
      
      The patch changes the value assigned to pdata->num_regulators to match
      the size of the array.
      Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Tested-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
      Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      bbb83f38
    • Axel Lin's avatar
      regulator: act8865: Remove error variable in act8865_pmic_probe · 40d3bc19
      Axel Lin authored
      Simply use ret variable instead.
      Also remove unneeded initialize for ret variable.
      Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      40d3bc19
    • Beniamino Galvani's avatar
      regulator: act8865: fix parsing of platform data · 48a1e1b5
      Beniamino Galvani authored
      The driver loops through all available regulators (ACT8865_REG_NUM)
      and accesses pdata->regulators[i].platform_data without checking the
      actual value of num_regulators in platform data, potentially causing a
      invalid memory access.
      
      Fix this and look up the regulator init_data by id in platform data.
      Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Tested-by Wenyou.Yang <wenyou.yang@atmel.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      48a1e1b5
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · f67d251a
      Linus Torvalds authored
      Pull m68knommu fixes from Greg Ungerer:
       "Just a couple of small fixes.  Fix definition of page_to_phys() and
        remove unecesary prototype of kobjsize()"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: Remove unnecessary prototype for kobjsize()
        m68knommu: Correct page_to_phys when PAGE_OFFSET is non-zero.
      f67d251a
    • Russell King's avatar
      Merge branch 'devel-stable' into for-next · f15bdfe4
      Russell King authored
      Conflicts:
      	arch/arm/kernel/perf_event_cpu.c
      f15bdfe4
    • Russell King's avatar
      c89c3a6a