dm: Rename DM_FLAG_REMOVE_WITH_PD_ON

This flag has the word 'REMOVE' in it which means it conflicts with
the DM_REMOVE flags. Rename it to DM_FLAG_LEAVE_PD_ON which seems to
indicate its purpose well enough.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 7e8f3afb2d60db1c126586552a1236c0ba583562..7874d53c843552db9b4c5d1700d872d968bbe7c0 100644 (file)
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -200,7 +200,7 @@ int device_remove(struct udevice *dev, uint flags)
 
        if (!(flags & DM_REMOVE_NO_PD) &&
            !(drv->flags &
-             (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_REMOVE_WITH_PD_ON)) &&
+             (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_LEAVE_PD_ON)) &&
            dev != gd->cur_serial_dev)
                dev_power_domain_off(dev);
 

diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index ca6933a6c54f019dae44f37777f342d91ca0c50c..558f9ba766c79f50cbd484937a30cc3ca99f08d7 100644 (file)
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -212,5 +212,5 @@ U_BOOT_DRIVER(meson_vpu) = {
        .probe = meson_vpu_probe,
        .bind = meson_vpu_bind,
        .priv_auto      = sizeof(struct meson_vpu_priv),
-       .flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
+       .flags  = DM_FLAG_PRE_RELOC | DM_FLAG_LEAVE_PD_ON,
 };

diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index f64a39f657921bb3f2987a08093ac6d5f926cd7e..8335b20ae8439acfd2d50ae8eafebc1909a166b8 100644 (file)
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -119,5 +119,5 @@ U_BOOT_DRIVER(rti_wdt) = {
        .ops = &rti_wdt_ops,
        .probe = rti_wdt_probe,
        .priv_auto      = sizeof(struct rti_wdt_priv),
-       .flags = DM_FLAG_REMOVE_WITH_PD_ON,
+       .flags = DM_FLAG_LEAVE_PD_ON,
 };

diff --git a/include/dm/device.h b/include/dm/device.h
index e665558444b5a562e341932646d6857aeb850fa2..8f38cf163317aed674b2118a2c0a8f86f88580f5 100644 (file)
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -71,7 +71,7 @@ struct driver_info;
  * Device is removed without switching off its power domain. This might
  * be required, i. e. for serial console (debug) output when booting OS.
  */
-#define DM_FLAG_REMOVE_WITH_PD_ON      (1 << 13)
+#define DM_FLAG_LEAVE_PD_ON            (1 << 13)
 
 /*
  * One or multiple of these flags are passed to device_remove() so that