Merge branch 'master_regulator/fixes' of https://source.denx.de/u-boot/custodians/u-boot-sh

- Fix usage of CONFIG_IS_ENABLED and DM_REGULATOR

6 files changed, 11 insertions, 11 deletions

diff --git a/drivers/misc/usb251xb.c b/drivers/misc/usb251xb.c
index a78ad1843a..92e92ba5e6 100644
--- a/drivers/misc/usb251xb.c
+++ b/drivers/misc/usb251xb.c
@@ -334,7 +334,7 @@ static int usb251xb_probe(struct udevice *dev)
 	struct usb251xb *hub = dev_get_priv(dev);
 	int err;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR) && hub->vdd) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR) && hub->vdd) {
 		err = regulator_set_enable(hub->vdd, true);
 		if (err)
 			return err;
@@ -391,7 +391,7 @@ static int usb251xb_of_to_plat(struct udevice *dev)
 		return err;
 	}
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		err = device_get_supply_regulator(dev, "vdd-supply",
 						  &hub->vdd);
 		if (err && err != -ENOENT) {
diff --git a/drivers/mmc/npcm_sdhci.c b/drivers/mmc/npcm_sdhci.c
index 7eb17cce0b..d63521d685 100644
--- a/drivers/mmc/npcm_sdhci.c
+++ b/drivers/mmc/npcm_sdhci.c
@@ -36,7 +36,7 @@ static int npcm_sdhci_probe(struct udevice *dev)
 			return ret;
 	}
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		device_get_supply_regulator(dev, "vqmmc-supply", &vqmmc_supply);
 		vqmmc_uv = dev_read_u32_default(dev, "vqmmc-microvolt", 0);
 		/* Set IO voltage */
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 95738e34bf..848f174b6e 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -300,7 +300,7 @@ static int otm8009a_panel_of_to_plat(struct udevice *dev)
 	struct otm8009a_panel_priv *priv = dev_get_priv(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		ret =  device_get_supply_regulator(dev, "power-supply",
 						   &priv->reg);
 		if (ret && ret != -ENOENT) {
@@ -326,7 +326,7 @@ static int otm8009a_panel_probe(struct udevice *dev)
 	struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) {
 		dev_dbg(dev, "enable regulator '%s'\n", priv->reg->name);
 		ret = regulator_set_enable(priv->reg, true);
 		if (ret)
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 373668d28b..f1fce55a2c 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -266,7 +266,7 @@ static int rm68200_panel_of_to_plat(struct udevice *dev)
 	struct rm68200_panel_priv *priv = dev_get_priv(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		ret =  device_get_supply_regulator(dev, "power-supply",
 						   &priv->reg);
 		if (ret && ret != -ENOENT) {
@@ -299,7 +299,7 @@ static int rm68200_panel_probe(struct udevice *dev)
 	struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) {
 		ret = regulator_set_enable(priv->reg, true);
 		if (ret)
 			return ret;
diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
index 81fcafb9f5..6a6473eb0e 100644
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@ -76,7 +76,7 @@ static int simple_panel_of_to_plat(struct udevice *dev)
 	struct simple_panel_priv *priv = dev_get_priv(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		ret = uclass_get_device_by_phandle(UCLASS_REGULATOR, dev,
 						   "power-supply", &priv->reg);
 		if (ret) {
@@ -114,7 +114,7 @@ static int simple_panel_probe(struct udevice *dev)
 	const u32 dsi_data = dev_get_driver_data(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) {
 		debug("%s: Enable regulator '%s'\n", __func__, priv->reg->name);
 		ret = regulator_set_enable(priv->reg, true);
 		if (ret)
diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c
index 7ad0af73f0..273672db02 100644
--- a/drivers/video/tdo-tl070wsh30.c
+++ b/drivers/video/tdo-tl070wsh30.c
@@ -75,7 +75,7 @@ static int tl070wsh30_panel_of_to_plat(struct udevice *dev)
 	struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		ret =  device_get_supply_regulator(dev, "power-supply",
 						   &priv->reg);
 		if (ret && ret != -ENOENT) {
@@ -108,7 +108,7 @@ static int tl070wsh30_panel_probe(struct udevice *dev)
 	struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
 	int ret;
 
-	if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
+	if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) {
 		ret = regulator_set_enable(priv->reg, true);
 		if (ret)
 			return ret;