Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-5
+2
-4
drivers/base/regmap/regmap-slimbus.c
+2
-4
drivers/base/regmap/regmap-slimbus.c
···
48
48
if (IS_ERR(bus))
49
49
return ERR_CAST(bus);
50
50
51
-
return __regmap_init(&slimbus->dev, bus, &slimbus->dev, config,
52
-
lock_key, lock_name);
51
+
return __regmap_init(&slimbus->dev, bus, slimbus, config, lock_key, lock_name);
53
52
}
54
53
EXPORT_SYMBOL_GPL(__regmap_init_slimbus);
55
54
···
62
63
if (IS_ERR(bus))
63
64
return ERR_CAST(bus);
64
65
65
-
return __devm_regmap_init(&slimbus->dev, bus, &slimbus, config,
66
-
lock_key, lock_name);
66
+
return __devm_regmap_init(&slimbus->dev, bus, slimbus, config, lock_key, lock_name);
67
67
}
68
68
EXPORT_SYMBOL_GPL(__devm_regmap_init_slimbus);
69
69
+1
-1
include/linux/regmap.h
+1
-1
include/linux/regmap.h
···
1643
1643
* @status_invert: Inverted status register: cleared bits are active interrupts.
1644
1644
* @status_is_level: Status register is actuall signal level: Xor status
1645
1645
* register with previous value to get active interrupts.
1646
-
* @wake_invert: Inverted wake register: cleared bits are wake enabled.
1646
+
* @wake_invert: Inverted wake register: cleared bits are wake disabled.
1647
1647
* @type_in_mask: Use the mask registers for controlling irq type. Use this if
1648
1648
* the hardware provides separate bits for rising/falling edge
1649
1649
* or low/high level interrupts and they should be combined into