summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2013-09-03Merge tag 'hwmon-for-linus' of ↵Linus Torvalds35-1350/+1565
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon updates from Guenter Roeck: - new driver for HTU21D (humidity sensor) - add support for Fam16h (Kabini) to k10temp - add support for NCT6102D/6106D and NCT6791D to nct6775 driver - add support for ADS1115 to ads1015 driver - add support for hibernate to w83627ehf and nct6775 drivers - some minor cleanups * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (htu21) Add Measurement Specialties HTU21D support hwmon: Change my email address. hwmon: (k10temp) Add support for Fam16h (Kabini) hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0 hwmon: (ads1015) Add support for ADS1115 hwmon: (w83627ehf) Add support for hibernate hwmon: (nct6775) Add support for hibernate hwmon: use dev_get_platdata() hwmon: (nct6775) Fix size of data->temp array hwmon: (nct6775) Avoid using device platform data outside probe function hwmon: (nct6775) Add support for NCT6791D hwmon: (nct6775) Add support for beep attributes hwmon: (nct6775) Add support for critical low/high temperature limits on NCT6106 hwmon: (nct6775) Add support for NCT6102D/6106D hwmon: (nct6775) Support two SuperIO chips in the same system hwmon: (nct6775) Allocate attributes dynamically from templates hwmon: (coretemp) Atom CPUs don't support TjMax; no warning needed
2013-09-03Merge tag 'regulator-v3.12' of ↵Linus Torvalds58-1088/+3518
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator Pull regulator updates from Mark Brown: "Not much exciting going on with the regulator API this time around, lots of driver fixes and enhancements - the main thing is the addition of a new API to help make the stubbing code do the right thing for missing regulator mappings. Highlights: - A new regulator_get_optional() API call for regulators that can be absent in normal operation. This currently does nothing but will be used to improve the stubbing code for unspecified regulators, helping avoid some of the issues we've seen with adding new regulator support. - Helpers for devices with multiple linear ranges of voltages in the same regulator. - Moved the helpers into a separate file since core.c is getting rather large. - New drivers for Dialog DA9210 and DA9063, Freescale pfuze100 and Marvell 88pm800" * tag 'regulator-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (70 commits) regulator: da9063: Statize da9063_ldo_lim_event regulator: lp872x: Make REGULATOR_LP872X depend on I2C rather than I2C=y regulator: tps65217: Convert to use linear ranges regulator: da9063: Use IS_ERR to check return value of regulator_register() regulator: da9063: Optimize da9063_set_current_limit implementation regulator: build: Allow most regulators to be built as modules regulator: Add devm_regulator_get_exclusive() regulator: da9063: Add Dialog DA9063 voltage regulators support. regulator: ti-abb: simplify platform_get_resource_byname/devm_ioremap_resource hwmon: (sht15) Use devm_regulator_get_optional() regulator: core: Use bool for exclusivitity flag regulator: 88pm800: forever loop in pm800_regulator_probe() cpufreq: cpufreq-cpu0: Use devm_regulator_get_optional() regulator: da9210: Remove redundant MODULE_ALIAS regulator: 88pm800: Fix checking whether num_regulator is valid regulator: s2mps11: Fix setting ramp_delay regulator: s2mps11: Fix wrong arguments for regmap_update_bits() call regulator: palmas: Update the DT binding doc for smps10 out1 and out2 regulator: palmas: model SMPS10 as two regulators regulator: core: Move list_voltage_{linear,linear_range,table} to helpers.c ...
2013-09-03Merge tag 'spi-v3.12' of ↵Linus Torvalds51-1338/+3565
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi Pull spi updates from Mark Brown: "Business as usual for SPI - some new drivers, lots of fixes and updates to existing drivers plus some new framework features. Notable changes are: - Support for dual and quad data lines, commonly used by flash chips to improve performance, from Wang Yuhang. - Factored out a common pattern for runtime PM implementation into the core saving a bunch of code. - A particularly nice set of updates to the ep93xx driver from H Hartley Sweeten, modernising it and reducing the code size a lot. - New drivers for Blackfin v3, EFM32, Freescale DSPI and TI QSPI" * tag 'spi-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (133 commits) spi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one() spi: quad: fix the name of DT property spi: core: Fix spi_register_master error handling spi: efm32: Fix build error spi: altera: Use DIV_ROUND_UP to calculate hw->bytes_per_word spi: rspi: Add spi_master_get() call to prevent use after free spi: quad: Make DT properties optional spi: quad: Fix missing return spi: Use dev_get_drvdata at appropriate places spi: use dev_get_platdata() spi: nuc900: Fix mode_bits setting spi: simplify devm_request_mem_region/devm_ioremap spi: altera: Simplify altera_spi_txrx implementation for noirq case spi: spi-rspi: fix inconsistent spin_lock_irqsave spi/qspi: Add compatible string for am4372. spi/qspi: Fix device table entry spi/sirf: fix the misunderstanding about len of spi_transfer spi/qspi: Add dual/quad spi read support spi: sirf: fix error return code in spi_sirfsoc_probe() spi: bcm2835: Add spi_master_get() call to prevent use after free ...
2013-09-03Merge tag 'regmap-v3.12' of ↵Linus Torvalds6-131/+194
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap Pull regmap updates from Mark Brown: "A quiet release for regmap, some cleanups, fixes and: - Improved node coalescing for rbtree, reducing memory usage and improving performance during syncs. - Support for registering multiple register patches. - A quirk for handling interrupts that need to be clear when masked in regmap-irq" * tag 'regmap-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: rbtree: Make cache_present bitmap per node regmap: rbtree: Reduce number of nodes, take 2 regmap: rbtree: Simplify adjacent node look-up regmap: debugfs: Fix continued read from registers file regcache-rbtree: Fix reg_stride != 1 regmap: Allow multiple patches to be registered regmap: regcache: allow read-only regs to be cached regmap: fix regcache_reg_present() for empty cache regmap: core: allow a virtual range to cover its own data window regmap: irq: document mask/wake_invert flags regmap: irq: make flags bool and put them in a bitfield regmap: irq: Allow to acknowledge masked interrupts during initialization regmap: Provide __acquires/__releases annotations
2013-09-02Merge tag 'scsi-fixes' of ↵Linus Torvalds2-4/+4
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI fix from James Bottomley: "This is a bug fix for the pm80xx driver. It turns out that when the new hardware support was added in 3.10 the IO command size was kept at the old hard coded value. This means that the driver attaches to some new cards and then simply hangs the system" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: [SCSI] pm80xx: fix Adaptec 71605H hang
2013-09-02Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds1-1/+1
Pull slave-dma fix from Vinod Koul: "A fix for resolving TI_EDMA driver's build error in allmodconfig to have filter function built in"" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dma/Kconfig: TI_EDMA needs to be boolean
2013-09-01Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-nextMark Brown1-20/+19
2013-09-01Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-nextMark Brown1-10/+0
2013-09-01Merge remote-tracking branch 'regulator/topic/sec' into regulator-nextMark Brown1-45/+200
2013-09-01Merge remote-tracking branch 'regulator/topic/ramp' into regulator-nextMark Brown2-6/+13
2013-09-01Merge remote-tracking branch 'regulator/topic/pfuze100' into regulator-nextMark Brown3-0/+454
2013-09-01Merge remote-tracking branch 'regulator/topic/palmas' into regulator-nextMark Brown1-6/+24
2013-09-01Merge remote-tracking branch 'regulator/topic/optional' into regulator-nextMark Brown7-7/+96
2013-09-01Merge remote-tracking branch 'regulator/topic/max8660' into regulator-nextMark Brown38-52/+140
2013-09-01Merge remote-tracking branch 'regulator/topic/lp8755' into regulator-nextMark Brown1-0/+1
2013-09-01Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-nextMark Brown1-4/+5
2013-09-01Merge remote-tracking branch 'regulator/topic/linear-range' into regulator-nextMark Brown1-145/+37
2013-09-01Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-nextMark Brown1-6/+6
2013-09-01Merge remote-tracking branch 'regulator/topic/helpers' into regulator-nextMark Brown4-463/+458
2013-09-01Merge remote-tracking branch 'regulator/topic/da9063' into regulator-nextMark Brown5-0/+1440
2013-09-01Merge remote-tracking branch 'regulator/topic/core' into regulator-nextMark Brown1-18/+26
2013-09-01Merge remote-tracking branch 'regulator/topic/as3711' into regulator-nextMark Brown1-132/+31
2013-09-01Merge remote-tracking branch 'regulator/topic/88pm800' into regulator-nextMark Brown7-275/+669
2013-09-01Merge remote-tracking branch 'spi/topic/txx9' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/topcliff' into spi-nextMark Brown1-0/+2
2013-09-01Merge remote-tracking branch 'spi/topic/tel62x0' into spi-nextMark Brown1-2/+1
2013-09-01Merge remote-tracking branch 'spi/topic/tegra' into spi-nextMark Brown1-7/+1
2013-09-01Merge remote-tracking branch 'spi/topic/sirf' into spi-nextMark Brown2-47/+182
2013-09-01Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-nextMark Brown1-18/+0
2013-09-01Merge remote-tracking branch 'spi/topic/sh-hspi' into spi-nextMark Brown1-2/+0
2013-09-01Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-nextMark Brown1-69/+43
2013-09-01Merge remote-tracking branch 'spi/topic/rspi' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/quad' into spi-nextMark Brown1-40/+37
2013-09-01Merge remote-tracking branch 'spi/topic/qspi' into spi-nextMark Brown14-134/+710
2013-09-01Merge remote-tracking branch 'spi/topic/pxa' into spi-nextMark Brown1-1/+8
2013-09-01Merge remote-tracking branch 'spi/topic/pl022' into spi-nextMark Brown1-2/+2
2013-09-01Merge remote-tracking branch 'spi/topic/pdata' into spi-nextMark Brown30-160/+125
2013-09-01Merge remote-tracking branch 'spi/topic/orion' into spi-nextMark Brown1-17/+5
2013-09-01Merge remote-tracking branch 'spi/topic/omap-100k' into spi-nextMark Brown1-198/+78
2013-09-01Merge remote-tracking branch 'spi/topic/octeon' into spi-nextMark Brown1-44/+5
2013-09-01Merge remote-tracking branch 'spi/topic/nuc900' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/mxs' into spi-nextMark Brown1-15/+13
2013-09-01Merge remote-tracking branch 'spi/topic/msglen' into spi-nextMark Brown1-0/+1
2013-09-01Merge remote-tracking branch 'spi/topic/mpc512x' into spi-nextMark Brown1-18/+30
2013-09-01Merge remote-tracking branch 'spi/topic/ioremap' into spi-nextMark Brown2-14/+2
2013-09-01Merge remote-tracking branch 'spi/topic/imx' into spi-nextMark Brown1-50/+26
2013-09-01Merge remote-tracking branch 'spi/topic/ep93xx' into spi-nextMark Brown1-272/+81
2013-09-01Merge remote-tracking branch 'spi/topic/efm32' into spi-nextMark Brown3-0/+524
2013-09-01Merge remote-tracking branch 'spi/topic/dspi' into spi-nextMark Brown3-0/+565
2013-09-01Merge remote-tracking branch 'spi/topic/davinci' into spi-nextMark Brown1-1/+1