Merge tag 'fsl-qoriq-next-2026-07-06' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq into nextnext

CI: https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq/-/pipelines/30622

- ls1028ardb: Move environment variables from header to .env file
- crypto: fsl: Hide CAAM_64BIT symbol behind FSL_CAAM dependency
- gpio: mpc8xxx: Add set_flags/get_flags ops
- power: domain: scmi: Allow failure in getting power domain attribute

3 files changed, 56 insertions, 7 deletions

diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig
index 1398b0033f0..244a9bd905d 100644
--- a/drivers/crypto/fsl/Kconfig
+++ b/drivers/crypto/fsl/Kconfig
@@ -20,6 +20,7 @@ config SYS_FSL_MAX_NUM_OF_SEC
 
 config CAAM_64BIT
 	bool
+	depends on FSL_CAAM
 	default y if PHYS_64BIT && !ARCH_IMX8M && !ARCH_IMX8
 	help
 	  Select Crypto driver for 64 bits CAAM version
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 709d04017d1..40646407369 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -171,6 +171,58 @@ static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)
 	return dir ? GPIOF_OUTPUT : GPIOF_INPUT;
 }
 
+static int mpc8xxx_gpio_set_flags(struct udevice *dev, uint gpio,
+				  ulong flags)
+{
+	u32 mask = gpio_mask(gpio);
+	int ret;
+
+	/* The QorIQ GPIO pad supports open-drain only; open-source has
+	 * no silicon counterpart, so reject it rather than silently
+	 * pretending.
+	 */
+	if (flags & GPIOD_OPEN_SOURCE)
+		return -EOPNOTSUPP;
+
+	/* GPODR is per-pin and meaningful in both directions (it stays
+	 * latched when the pin is re-purposed), so apply it before the
+	 * direction change.
+	 */
+	if (flags & GPIOD_OPEN_DRAIN)
+		mpc8xxx_gpio_open_drain_on(dev, mask);
+	else
+		mpc8xxx_gpio_open_drain_off(dev, mask);
+
+	if (flags & GPIOD_IS_OUT) {
+		ret = mpc8xxx_gpio_direction_output(dev, gpio,
+						    !!(flags & GPIOD_IS_OUT_ACTIVE));
+	} else if (flags & GPIOD_IS_IN) {
+		ret = mpc8xxx_gpio_direction_input(dev, gpio);
+	} else {
+		ret = 0;
+	}
+
+	return ret;
+}
+
+static int mpc8xxx_gpio_get_flags(struct udevice *dev, uint gpio,
+				  ulong *flagsp)
+{
+	u32 mask = gpio_mask(gpio);
+	ulong flags = 0;
+
+	if (mpc8xxx_gpio_get_dir(dev, mask))
+		flags |= GPIOD_IS_OUT;
+	else
+		flags |= GPIOD_IS_IN;
+
+	if (mpc8xxx_gpio_open_drain_val(dev, mask))
+		flags |= GPIOD_OPEN_DRAIN;
+
+	*flagsp = flags;
+	return 0;
+}
+
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 static int mpc8xxx_gpio_of_to_plat(struct udevice *dev)
 {
@@ -255,6 +307,8 @@ static const struct dm_gpio_ops gpio_mpc8xxx_ops = {
 	.get_value		= mpc8xxx_gpio_get_value,
 	.set_value		= mpc8xxx_gpio_set_value,
 	.get_function		= mpc8xxx_gpio_get_function,
+	.set_flags		= mpc8xxx_gpio_set_flags,
+	.get_flags		= mpc8xxx_gpio_get_flags,
 };
 
 static const struct udevice_id mpc8xxx_gpio_ids[] = {
diff --git a/drivers/power/domain/scmi-power-domain.c b/drivers/power/domain/scmi-power-domain.c
index 6dcc259ad8f..a369fe52f2f 100644
--- a/drivers/power/domain/scmi-power-domain.c
+++ b/drivers/power/domain/scmi-power-domain.c
@@ -165,15 +165,9 @@ static int scmi_power_domain_probe(struct udevice *dev)
 	for (i = 0; i < priv->num_pwdoms; i++) {
 		ret = scmi_pwd_attrs(dev, i, &priv->prop[i].attributes,
 				     &priv->prop[i].name);
-		if (ret) {
+		if (ret)
 			dev_err(dev, "failed to get attributes pwd:%d (%d)\n",
 				i, ret);
-			for (i--; i >= 0; i--)
-				free(priv->prop[i].name);
-			free(priv->prop);
-
-			return ret;
-		}
 	}
 
 	return 0;