diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-01 13:31:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-01 13:31:17 -0500 |
commit | f6cff79f1d122f78a4b35bf4b2f0112afcd89ea4 (patch) | |
tree | cf3a38576f9adbb3860982c25f72aebed2bb541a /include/linux/regmap.h | |
parent | 47fcc0360cfb3fe82e4daddacad3c1cd80b0b75d (diff) | |
parent | 9ff6576e124b1227c27c1da43fe5f8ee908263e0 (diff) |
Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH:
"Here is the big pull request for char/misc drivers for 4.16-rc1.
There's a lot of stuff in here. Three new driver subsystems were added
for various types of hardware busses:
- siox
- slimbus
- soundwire
as well as a new vboxguest subsystem for the VirtualBox hypervisor
drivers.
There's also big updates from the FPGA subsystem, lots of Android
binder fixes, the usual handful of hyper-v updates, and lots of other
smaller driver updates.
All of these have been in linux-next for a long time, with no reported
issues"
* tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (155 commits)
char: lp: use true or false for boolean values
android: binder: use VM_ALLOC to get vm area
android: binder: Use true and false for boolean values
lkdtm: fix handle_irq_event symbol for INT_HW_IRQ_EN
EISA: Delete error message for a failed memory allocation in eisa_probe()
EISA: Whitespace cleanup
misc: remove AVR32 dependencies
virt: vbox: Add error mapping for VERR_INVALID_NAME and VERR_NO_MORE_FILES
soundwire: Fix a signedness bug
uio_hv_generic: fix new type mismatch warnings
uio_hv_generic: fix type mismatch warnings
auxdisplay: img-ascii-lcd: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
uio_hv_generic: add rescind support
uio_hv_generic: check that host supports monitor page
uio_hv_generic: create send and receive buffers
uio: document uio_hv_generic regions
doc: fix documentation about uio_hv_generic
vmbus: add monitor_id and subchannel_id to sysfs per channel
vmbus: fix ABI documentation
uio_hv_generic: use ISR callback method
...
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r-- | include/linux/regmap.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 20268b7d5001..6a3aeba40e9e 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -24,6 +24,7 @@ struct module; | |||
24 | struct device; | 24 | struct device; |
25 | struct i2c_client; | 25 | struct i2c_client; |
26 | struct irq_domain; | 26 | struct irq_domain; |
27 | struct slim_device; | ||
27 | struct spi_device; | 28 | struct spi_device; |
28 | struct spmi_device; | 29 | struct spmi_device; |
29 | struct regmap; | 30 | struct regmap; |
@@ -511,6 +512,10 @@ struct regmap *__regmap_init_i2c(struct i2c_client *i2c, | |||
511 | const struct regmap_config *config, | 512 | const struct regmap_config *config, |
512 | struct lock_class_key *lock_key, | 513 | struct lock_class_key *lock_key, |
513 | const char *lock_name); | 514 | const char *lock_name); |
515 | struct regmap *__regmap_init_slimbus(struct slim_device *slimbus, | ||
516 | const struct regmap_config *config, | ||
517 | struct lock_class_key *lock_key, | ||
518 | const char *lock_name); | ||
514 | struct regmap *__regmap_init_spi(struct spi_device *dev, | 519 | struct regmap *__regmap_init_spi(struct spi_device *dev, |
515 | const struct regmap_config *config, | 520 | const struct regmap_config *config, |
516 | struct lock_class_key *lock_key, | 521 | struct lock_class_key *lock_key, |
@@ -636,6 +641,19 @@ int regmap_attach_dev(struct device *dev, struct regmap *map, | |||
636 | i2c, config) | 641 | i2c, config) |
637 | 642 | ||
638 | /** | 643 | /** |
644 | * regmap_init_slimbus() - Initialise register map | ||
645 | * | ||
646 | * @slimbus: Device that will be interacted with | ||
647 | * @config: Configuration for register map | ||
648 | * | ||
649 | * The return value will be an ERR_PTR() on error or a valid pointer to | ||
650 | * a struct regmap. | ||
651 | */ | ||
652 | #define regmap_init_slimbus(slimbus, config) \ | ||
653 | __regmap_lockdep_wrapper(__regmap_init_slimbus, #config, \ | ||
654 | slimbus, config) | ||
655 | |||
656 | /** | ||
639 | * regmap_init_spi() - Initialise register map | 657 | * regmap_init_spi() - Initialise register map |
640 | * | 658 | * |
641 | * @dev: Device that will be interacted with | 659 | * @dev: Device that will be interacted with |