Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de740386 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap updates from Mark Brown:
 "A couple of new features this time around, nothing that should have
  any impact on most users:

   - Cleanups and optimization of the path for reading back the register
     defaults from the hardware at startup, reducing boot times for
     devices that use this (most don't, either populating on demand or
     providing defaults).
   - A bus implementation for AC'97 devices"

* tag 'regmap-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: ac97: Add generic AC'97 callbacks
  regmap: cache: Sort include headers alphabetically
  regmap: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
  regmap: cache: use kmalloc_array instead of kmalloc
  regmap: cache: speed regcache_hw_init() up.
  regmap: cache: fix errno in regcache_hw_init()
  regmap: cache: cleanup regcache_hw_init()
  regmap: cache: fix errno in regcache_hw_init()
parents 177808cd a63b8783

drivers/base/regmap/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -3,12 +3,15 @@ 
# subsystems should select the appropriate symbols.



config REGMAP

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select IRQ_DOMAIN if REGMAP_IRQ

	bool



config REGMAP_AC97

	tristate



config REGMAP_I2C

	tristate

	depends on I2C

drivers/base/regmap/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_REGMAP) += regmap.o regcache.o

obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o

obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o

obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o

obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o

obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o

obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o

drivers/base/regmap/regcache-flat.c

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/slab.h>

#include <linux/device.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#include "internal.h"

drivers/base/regmap/regcache-lzo.c

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/slab.h>

#include <linux/device.h>

#include <linux/lzo.h>

#include <linux/slab.h>



#include "internal.h"

drivers/base/regmap/regcache-rbtree.c

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/slab.h>

#include <linux/device.h>

#include <linux/debugfs.h>

#include <linux/device.h>

#include <linux/rbtree.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#include "internal.h"