Skip to content

Commit 651df41

Browse files
committed
Merge tag 'regulator-fix-v6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "A couple of fixes from Thomas, making the UAPI headers more robustly correct and ensuring they are covered by checkpatch, and one from Andreas fixing an update for a change to the DT bindings that I missed was requested during bindings review in the newly added fp9931 driver" * tag 'regulator-fix-v6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: fp9931: fix regulator node pointer regulator: Add UAPI headers to MAINTAINERS regulator: uapi: Use UAPI integer type
2 parents 0d362c7 + 6048993 commit 651df41

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27920,6 +27920,7 @@ F: drivers/regulator/
2792027920
F: rust/kernel/regulator.rs
2792127921
F: include/dt-bindings/regulator/
2792227922
F: include/linux/regulator/
27923+
F: include/uapi/regulator/
2792327924
K: regulator_get_optional
2792427925

2792527926
VOLTAGE AND CURRENT REGULATOR IRQ HELPERS

drivers/regulator/fp9931.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ static const struct regulator_desc regulators[] = {
391391
{
392392
.name = "v3p3",
393393
.of_match = of_match_ptr("v3p3"),
394+
.regulators_node = of_match_ptr("regulators"),
394395
.id = 0,
395396
.ops = &fp9931_v3p3ops,
396397
.type = REGULATOR_VOLTAGE,
@@ -403,6 +404,7 @@ static const struct regulator_desc regulators[] = {
403404
{
404405
.name = "vposneg",
405406
.of_match = of_match_ptr("vposneg"),
407+
.regulators_node = of_match_ptr("regulators"),
406408
.id = 1,
407409
.ops = &fp9931_vposneg_ops,
408410
.type = REGULATOR_VOLTAGE,
@@ -415,6 +417,7 @@ static const struct regulator_desc regulators[] = {
415417
{
416418
.name = "vcom",
417419
.of_match = of_match_ptr("vcom"),
420+
.regulators_node = of_match_ptr("regulators"),
418421
.id = 2,
419422
.ops = &fp9931_vcom_ops,
420423
.type = REGULATOR_VOLTAGE,

include/uapi/regulator/regulator.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
#ifndef _UAPI_REGULATOR_H
99
#define _UAPI_REGULATOR_H
1010

11-
#ifdef __KERNEL__
1211
#include <linux/types.h>
13-
#else
14-
#include <stdint.h>
15-
#endif
1612

1713
/*
1814
* Regulator notifier events.
@@ -62,7 +58,7 @@
6258

6359
struct reg_genl_event {
6460
char reg_name[32];
65-
uint64_t event;
61+
__u64 event;
6662
};
6763

6864
/* attributes of reg_genl_family */

0 commit comments

Comments
 (0)