Merge branch 'regulator-5.3' into regulator-next

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/regulator/88pm800-regulator.c
Simple merge

diff --cc drivers/regulator/s2mps11.c
index 5b7ba7c6c4f6f084f06fca5081ead4603c9beb88,e5a74ae4068704abe67abdd28bee8524a56cd211..054baaadfdfddc39c83f7ffd1fa58c6a29f2eb7f
--- 1/drivers/regulator/s2mps11.c
--- 2/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@@ -828,10 -843,11 +850,12 @@@ static void s2mps14_pmic_dt_parse_ext_c
                                0,
                                GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,
                                "s2mps11-regulator");
-               if (IS_ERR(gpio[reg])) {
+               if (PTR_ERR(gpio[reg]) == -ENOENT)
+                       gpio[reg] = NULL;
+               else if (IS_ERR(gpio[reg])) {
                        dev_err(&pdev->dev, "Failed to get control GPIO for %d/%s\n",
                                reg, rdata[reg].name);
 +                      gpio[reg] = NULL;
                        continue;
                }
                if (gpio[reg])

diff --cc include/linux/mfd/samsung/s2mps11.h
Simple merge

diff --cc include/linux/regulator/driver.h
Simple merge