Revert "power: regulator: Add vin-supply for GPIO and Fixed regulators"

Rockchip boards may depend on a working MMC regulator in SPL to
successfully load FIT payload from MMC. Typically, these boards only
include the vmmc-supply regulator and not its vin-supply in SPL control
FDT.

The commit f98d812e5353 ("power: regulator: Add vin-supply for GPIO and
Fixed regulators") breaks loading FIT from MMC in SPL on some of these
boards due to now requiring the vin-supply to be included in the SPL
control FDT.

The commit also strangely enables any found vin-supply in
regulator_common_of_to_plat() and not when a regulator is enabled or as
part of regulator_autoset().

Revert the commit to fix FIT loading in SPL on broken boards.

If a board needs to have its vin-supply enabled, two options come to
mind:

- Add regulator-always-on prop to the regulator in the -u-boot.dtsi for
  any board.

- Implement full support for reference counting of regulators and then
  update the regulator-uclass to enable any found vin-supply when a
  regulator is enabled.

This reverts commit f98d812e5353408ef77a46bad1f1cdc793ff8a03.

Reported-by: Dang Huynh <danct12@riseup.net>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>

diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 3ed713ce501909ea5e9953d6fad85d1a05fc4362..685d8735fa5c9a6f98cb6154cd13afcabaeab1ac 100644 (file)
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -44,16 +44,6 @@ int regulator_common_of_to_plat(struct udevice *dev,
                        dev_read_u32_default(dev, "u-boot,off-on-delay-us", 0);
        }
 
-       ret = device_get_supply_regulator(dev, "vin-supply", &plat->vin_supply);
-       if (ret) {
-               debug("Regulator vin regulator not defined: %d\n", ret);
-               if (ret != -ENOENT)
-                       return ret;
-       }
-
-       if (plat->vin_supply)
-               regulator_set_enable_if_allowed(plat->vin_supply, true);
-
        return 0;
 }
 

diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h
index 799c968d0b66193c84cdb629c5ec6516e57bf4bc..d4962899d830b5f5ba0d12d7e3f3bd5c9955e6bd 100644 (file)
--- a/drivers/power/regulator/regulator_common.h
+++ b/drivers/power/regulator/regulator_common.h
@@ -14,7 +14,6 @@ struct regulator_common_plat {
        unsigned int startup_delay_us;
        unsigned int off_on_delay_us;
        unsigned int enable_count;
-       struct udevice *vin_supply;
 };
 
 int regulator_common_of_to_plat(struct udevice *dev,