Commit 20668408 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-fix-v6.9-rc2' of...

Merge tag 'regulator-fix-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "One simple regualtor fix, fixing module autoloading on tps65132"

* tag 'regulator-fix-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: tps65132: Add of_match table
parents a6bec447 a469158e
...@@ -267,10 +267,17 @@ static const struct i2c_device_id tps65132_id[] = { ...@@ -267,10 +267,17 @@ static const struct i2c_device_id tps65132_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, tps65132_id); MODULE_DEVICE_TABLE(i2c, tps65132_id);
static const struct of_device_id __maybe_unused tps65132_of_match[] = {
{ .compatible = "ti,tps65132" },
{},
};
MODULE_DEVICE_TABLE(of, tps65132_of_match);
static struct i2c_driver tps65132_i2c_driver = { static struct i2c_driver tps65132_i2c_driver = {
.driver = { .driver = {
.name = "tps65132", .name = "tps65132",
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = of_match_ptr(tps65132_of_match),
}, },
.probe = tps65132_probe, .probe = tps65132_probe,
.id_table = tps65132_id, .id_table = tps65132_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment