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

torvalds · torvalds · commit e129940938d8 · 2020-03-30T14:55:58.000-07:00
Pull regma: update from Mark Brown:
 "Only one small documentation fix for regmap this time around"

* tag 'regmap-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: wrong descriptions in regmap_range_cfg
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
@@ -461,8 +461,8 @@ struct regmap_config {
  * @range_max: Address of the highest register in virtual range.
  *
  * @selector_reg: Register with selector field.
- * @selector_mask: Bit shift for selector value.
- * @selector_shift: Bit mask for selector value.
+ * @selector_mask: Bit mask for selector value.
+ * @selector_shift: Bit shift for selector value.
  *
  * @window_start: Address of first (lowest) register in data window.
  * @window_len: Number of registers in data window.

Original file line number	Diff line number	Diff line change
`@@ -461,8 +461,8 @@ struct regmap_config {`
`461`	`461`	`* @range_max: Address of the highest register in virtual range.`
`462`	`462`	`*`
`463`	`463`	`* @selector_reg: Register with selector field.`
`464`		`- * @selector_mask: Bit shift for selector value.`
`465`		`- * @selector_shift: Bit mask for selector value.`
	`464`	`+ * @selector_mask: Bit mask for selector value.`
	`465`	`+ * @selector_shift: Bit shift for selector value.`
`466`	`466`	`*`
`467`	`467`	`* @window_start: Address of first (lowest) register in data window.`
`468`	`468`	`* @window_len: Number of registers in data window.`