Commit 651df419 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 0d362c7f 60489936

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -27920,6 +27920,7 @@ F: drivers/regulator/ 
F:	rust/kernel/regulator.rs

F:	include/dt-bindings/regulator/

F:	include/linux/regulator/

F:	include/uapi/regulator/

K:	regulator_get_optional









VOLTAGE AND CURRENT REGULATOR IRQ HELPERS

























drivers/regulator/fp9931.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -391,6 +391,7 @@ static const struct regulator_desc regulators[] = {







	{









		.name = "v3p3",









		.of_match = of_match_ptr("v3p3"),









		.regulators_node = of_match_ptr("regulators"),









		.id = 0,









		.ops = &fp9931_v3p3ops,









		.type = REGULATOR_VOLTAGE,








@@ -403,6 +404,7 @@ static const struct regulator_desc regulators[] = {







	{









		.name = "vposneg",









		.of_match = of_match_ptr("vposneg"),









		.regulators_node = of_match_ptr("regulators"),









		.id = 1,









		.ops = &fp9931_vposneg_ops,









		.type = REGULATOR_VOLTAGE,








@@ -415,6 +417,7 @@ static const struct regulator_desc regulators[] = {







	{









		.name = "vcom",









		.of_match = of_match_ptr("vcom"),









		.regulators_node = of_match_ptr("regulators"),









		.id = 2,









		.ops = &fp9931_vcom_ops,









		.type = REGULATOR_VOLTAGE,
































include/uapi/regulator/regulator.h



+1
−5






























Original line number
Diff line number
Diff line







@@ -8,11 +8,7 @@







#ifndef _UAPI_REGULATOR_H









#define _UAPI_REGULATOR_H



















#ifdef __KERNEL__









#include <linux/types.h>









#else









#include <stdint.h>









#endif



















/*









 * Regulator notifier events.








@@ -62,7 +58,7 @@

















struct reg_genl_event {









	char reg_name[32];









	uint64_t event;









	__u64 event;









};



















/* attributes of reg_genl_family */