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

Commit 072502a6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next

parents 84fb9015 1ed81114 2de9d600

drivers/base/regmap/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct regmap { 
	/* if set, the HW registers are known to match map->reg_defaults */

	bool no_sync_defaults;



	struct reg_default *patch;

	struct reg_sequence *patch;

	int patch_regs;



	/* if set, converts bulk read to single read */

drivers/base/regmap/regmap-ac97.c

+14 −27
Original line number Diff line number Diff line
@@ -78,37 +78,24 @@ static const struct regmap_bus ac97_regmap_bus = { 
	.reg_read = regmap_ac97_reg_read,

};



/**

 * regmap_init_ac97(): Initialise AC'97 register map

 *

 * @ac97: Device that will be interacted with

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer to

 * a struct regmap.

 */

struct regmap *regmap_init_ac97(struct snd_ac97 *ac97,

				const struct regmap_config *config)

struct regmap *__regmap_init_ac97(struct snd_ac97 *ac97,

				  const struct regmap_config *config,

				  struct lock_class_key *lock_key,

				  const char *lock_name)

{

	return regmap_init(&ac97->dev, &ac97_regmap_bus, ac97, config);

	return __regmap_init(&ac97->dev, &ac97_regmap_bus, ac97, config,

			     lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(regmap_init_ac97);

EXPORT_SYMBOL_GPL(__regmap_init_ac97);



/**

 * devm_regmap_init_ac97(): Initialise AC'97 register map

 *

 * @ac97: Device that will be interacted with

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer

 * to a struct regmap.  The regmap will be automatically freed by the

 * device management code.

 */

struct regmap *devm_regmap_init_ac97(struct snd_ac97 *ac97,

				     const struct regmap_config *config)

struct regmap *__devm_regmap_init_ac97(struct snd_ac97 *ac97,

				       const struct regmap_config *config,

				       struct lock_class_key *lock_key,

				       const char *lock_name)

{

	return devm_regmap_init(&ac97->dev, &ac97_regmap_bus, ac97, config);

	return __devm_regmap_init(&ac97->dev, &ac97_regmap_bus, ac97, config,

				  lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(devm_regmap_init_ac97);

EXPORT_SYMBOL_GPL(__devm_regmap_init_ac97);



MODULE_LICENSE("GPL v2");

drivers/base/regmap/regmap-i2c.c

+14 −27
Original line number Diff line number Diff line
@@ -282,47 +282,34 @@ static const struct regmap_bus *regmap_get_i2c_bus(struct i2c_client *i2c, 
	return ERR_PTR(-ENOTSUPP);

}



/**

 * regmap_init_i2c(): Initialise register map

 *

 * @i2c: Device that will be interacted with

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer to

 * a struct regmap.

 */

struct regmap *regmap_init_i2c(struct i2c_client *i2c,

			       const struct regmap_config *config)

struct regmap *__regmap_init_i2c(struct i2c_client *i2c,

				 const struct regmap_config *config,

				 struct lock_class_key *lock_key,

				 const char *lock_name)

{

	const struct regmap_bus *bus = regmap_get_i2c_bus(i2c, config);



	if (IS_ERR(bus))

		return ERR_CAST(bus);



	return regmap_init(&i2c->dev, bus, &i2c->dev, config);

	return __regmap_init(&i2c->dev, bus, &i2c->dev, config,

			     lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(regmap_init_i2c);

EXPORT_SYMBOL_GPL(__regmap_init_i2c);



/**

 * devm_regmap_init_i2c(): Initialise managed register map

 *

 * @i2c: Device that will be interacted with

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer

 * to a struct regmap.  The regmap will be automatically freed by the

 * device management code.

 */

struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,

				    const struct regmap_config *config)

struct regmap *__devm_regmap_init_i2c(struct i2c_client *i2c,

				      const struct regmap_config *config,

				      struct lock_class_key *lock_key,

				      const char *lock_name)

{

	const struct regmap_bus *bus = regmap_get_i2c_bus(i2c, config);



	if (IS_ERR(bus))

		return ERR_CAST(bus);



	return devm_regmap_init(&i2c->dev, bus, &i2c->dev, config);

	return __devm_regmap_init(&i2c->dev, bus, &i2c->dev, config,

				  lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(devm_regmap_init_i2c);

EXPORT_SYMBOL_GPL(__devm_regmap_init_i2c);



MODULE_LICENSE("GPL");

drivers/base/regmap/regmap-mmio.c

+18 −34
Original line number Diff line number Diff line
@@ -296,20 +296,11 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, 
	return ERR_PTR(ret);

}



/**

 * regmap_init_mmio_clk(): Initialise register map with register clock

 *

 * @dev: Device that will be interacted with

 * @clk_id: register clock consumer ID

 * @regs: Pointer to memory-mapped IO region

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer to

 * a struct regmap.

 */

struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id,

struct regmap *__regmap_init_mmio_clk(struct device *dev, const char *clk_id,

				      void __iomem *regs,

				    const struct regmap_config *config)

				      const struct regmap_config *config,

				      struct lock_class_key *lock_key,

				      const char *lock_name)

{

	struct regmap_mmio_context *ctx;
@@ -317,25 +308,17 @@ struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id, 
	if (IS_ERR(ctx))

		return ERR_CAST(ctx);



	return regmap_init(dev, &regmap_mmio, ctx, config);

	return __regmap_init(dev, &regmap_mmio, ctx, config,

			     lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(regmap_init_mmio_clk);

EXPORT_SYMBOL_GPL(__regmap_init_mmio_clk);



/**

 * devm_regmap_init_mmio_clk(): Initialise managed register map with clock

 *

 * @dev: Device that will be interacted with

 * @clk_id: register clock consumer ID

 * @regs: Pointer to memory-mapped IO region

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer

 * to a struct regmap.  The regmap will be automatically freed by the

 * device management code.

 */

struct regmap *devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id,

struct regmap *__devm_regmap_init_mmio_clk(struct device *dev,

					   const char *clk_id,

					   void __iomem *regs,

					 const struct regmap_config *config)

					   const struct regmap_config *config,

					   struct lock_class_key *lock_key,

					   const char *lock_name)

{

	struct regmap_mmio_context *ctx;
@@ -343,8 +326,9 @@ struct regmap *devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id, 
	if (IS_ERR(ctx))

		return ERR_CAST(ctx);



	return devm_regmap_init(dev, &regmap_mmio, ctx, config);

	return __devm_regmap_init(dev, &regmap_mmio, ctx, config,

				  lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(devm_regmap_init_mmio_clk);

EXPORT_SYMBOL_GPL(__devm_regmap_init_mmio_clk);



MODULE_LICENSE("GPL v2");

drivers/base/regmap/regmap-spi.c

+14 −27
Original line number Diff line number Diff line
@@ -113,37 +113,24 @@ static struct regmap_bus regmap_spi = { 
	.val_format_endian_default = REGMAP_ENDIAN_BIG,

};



/**

 * regmap_init_spi(): Initialise register map

 *

 * @spi: Device that will be interacted with

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer to

 * a struct regmap.

 */

struct regmap *regmap_init_spi(struct spi_device *spi,

			       const struct regmap_config *config)

struct regmap *__regmap_init_spi(struct spi_device *spi,

				 const struct regmap_config *config,

				 struct lock_class_key *lock_key,

				 const char *lock_name)

{

	return regmap_init(&spi->dev, &regmap_spi, &spi->dev, config);

	return __regmap_init(&spi->dev, &regmap_spi, &spi->dev, config,

			     lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(regmap_init_spi);

EXPORT_SYMBOL_GPL(__regmap_init_spi);



/**

 * devm_regmap_init_spi(): Initialise register map

 *

 * @spi: Device that will be interacted with

 * @config: Configuration for register map

 *

 * The return value will be an ERR_PTR() on error or a valid pointer

 * to a struct regmap.  The map will be automatically freed by the

 * device management code.

 */

struct regmap *devm_regmap_init_spi(struct spi_device *spi,

				    const struct regmap_config *config)

struct regmap *__devm_regmap_init_spi(struct spi_device *spi,

				      const struct regmap_config *config,

				      struct lock_class_key *lock_key,

				      const char *lock_name)

{

	return devm_regmap_init(&spi->dev, &regmap_spi, &spi->dev, config);

	return __devm_regmap_init(&spi->dev, &regmap_spi, &spi->dev, config,

				  lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(devm_regmap_init_spi);

EXPORT_SYMBOL_GPL(__devm_regmap_init_spi);



MODULE_LICENSE("GPL");