Revert "dm: pinctrl: Prevent (re-)configuring pins when already done before relocation"

This reverts commit e3778c39311283edec4bc7c6843d8a13174db8df.

As reported by Alex Kiernan the above optimization introduces a
regression in the below use case where:

1. Device has defined 'u-boot,dm-spl' property (@ eMMC DTS node)

2. The device downloads its MLO/SPL via UART (not eMMC - the eMMC pinmux
pins are NOT probed/configured in MLO/SPL).

3. The loaded via UART MLO/SPL wants to load Linux from eMMC. In this case
the DM core and pinctrl uclass checks 'u-boot,dm-spl' and don't
configure pins (as it thinks that those were initialized in MLO/SPL).

As we are very close to release - please revert this commit.

Reported-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index c8b38d78f6b003904085c5bd37eb0726e4a7ab72..0e3260afd1ee72afa4fa349114334a534e4cedf8 100644 (file)
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -139,9 +139,9 @@ static int pinconfig_post_bind(struct udevice *dev)
        int ret;
 
        dev_for_each_subnode(node, dev) {
-               if (pre_reloc_only ^ ofnode_pre_reloc(node))
+               if (pre_reloc_only &&
+                   !ofnode_pre_reloc(node))
                        continue;
-
                /*
                 * If this node has "compatible" property, this is not
                 * a pin configuration node, but a normal device. skip.