Commit 963bf161 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-fix-v6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fixes from Mark Brown:
 "One documentation fix and a fix for a problem with the slimbus regmap
  which was uncovered by some changes in one of the drivers"

* tag 'regmap-fix-v6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: irq: Correct documentation of wake_invert flag
  regmap: slimbus: fix bus_context pointer in regmap init calls
parents e3e0141d 48cbf505

drivers/base/regmap/regmap-slimbus.c

+2 −4
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ struct regmap *__regmap_init_slimbus(struct slim_device *slimbus, 
	if (IS_ERR(bus))

		return ERR_CAST(bus);



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

			     lock_key, lock_name);

	return __regmap_init(&slimbus->dev, bus, slimbus, config, lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(__regmap_init_slimbus);
@@ -63,8 +62,7 @@ struct regmap *__devm_regmap_init_slimbus(struct slim_device *slimbus, 
	if (IS_ERR(bus))

		return ERR_CAST(bus);



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

				  lock_key, lock_name);

	return __devm_regmap_init(&slimbus->dev, bus, slimbus, config, lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(__devm_regmap_init_slimbus);

include/linux/regmap.h

+1 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ struct regmap_irq_chip_data; 
 * @status_invert: Inverted status register: cleared bits are active interrupts.

 * @status_is_level: Status register is actuall signal level: Xor status

 *		     register with previous value to get active interrupts.

 * @wake_invert: Inverted wake register: cleared bits are wake enabled.

 * @wake_invert: Inverted wake register: cleared bits are wake disabled.

 * @type_in_mask: Use the mask registers for controlling irq type. Use this if

 *		  the hardware provides separate bits for rising/falling edge

 *		  or low/high level interrupts and they should be combined into