From: Tom Rini <trini@konsulko.com>
Date: Sat, 8 Apr 2023 18:19:08 +0000 (-0400)
Subject: Merge branch 'master_regulator/fixes' of https://source.denx.de/u-boot/custodians... 
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=fa6f458c679f55edd11e8e34f209d4a0e01bf7bc;p=u-boot.git

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
---

fa6f458c679f55edd11e8e34f209d4a0e01bf7bc
diff --cc drivers/video/simple_panel.c
index 81fcafb9f5,092906c82c..6a6473eb0e
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@@ -110,11 -87,9 +110,11 @@@ static int simple_panel_of_to_plat(stru
  static int simple_panel_probe(struct udevice *dev)
  {
  	struct simple_panel_priv *priv = dev_get_priv(dev);
 +	struct mipi_dsi_panel_plat *plat = dev_get_plat(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)