Re: [PATCH 2/6] mach-snapdragon: use EVT_OF_LIVE_INIT to apply DT fixups

[Neil Armstrong]

On 09/04/2025 19:17, Caleb Connolly wrote:

This will now apply fixups prior to devices being bound, which makes it
possible to enable/disable devices and adjust more properties that might
be read before devices probe.

Signed-off-by: Caleb Connolly <caleb.conno...@linaro.org>
---
  arch/arm/mach-snapdragon/board.c     |  1 -
  arch/arm/mach-snapdragon/of_fixup.c  |  7 ++++++-
  arch/arm/mach-snapdragon/qcom-priv.h | 14 --------------
  3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
index 
deae4d323789eab75d5fe735159b4cd820c02c45..3ab75f0fce02ecffd476ebe2aa606b1a9024bbec
 100644
--- a/arch/arm/mach-snapdragon/board.c
+++ b/arch/arm/mach-snapdragon/board.c
@@ -305,9 +305,8 @@ void __weak qcom_board_init(void)

int board_init(void)

  {
        show_psci_version();
-       qcom_of_fixup_nodes();
        qcom_board_init();
        return 0;
  }

diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c

index 
1ea0c18c2f2789a8aa054cd95bb9e4308d6b3384..d4e24059212c552de7fa7555d2ab8a1ea4fc4cb2
 100644
--- a/arch/arm/mach-snapdragon/of_fixup.c
+++ b/arch/arm/mach-snapdragon/of_fixup.c
@@ -21,8 +21,9 @@

#include <dt-bindings/input/linux-event-codes.h>

  #include <dm/of_access.h>
  #include <dm/of.h>
+#include <event.h>
  #include <fdt_support.h>
  #include <linux/errno.h>
  #include <stdlib.h>
  #include <time.h>
@@ -149,14 +150,18 @@ static void fixup_power_domains(void)
                func(__VA_ARGS__); \
                debug(#func " took %lluus\n", timer_get_us() - start); \
        } while (0)

-void qcom_of_fixup_nodes(void)

+static int qcom_of_fixup_nodes(void)
  {
        time_call(fixup_usb_nodes);
        time_call(fixup_power_domains);
+
+       return 0;
  }

+EVENT_SPY_SIMPLE(EVT_OF_LIVE_INIT, qcom_of_fixup_nodes);

+
  int ft_board_setup(void *blob, struct bd_info __maybe_unused *bd)
  {
        struct fdt_header *fdt = blob;
        int node;
diff --git a/arch/arm/mach-snapdragon/qcom-priv.h 
b/arch/arm/mach-snapdragon/qcom-priv.h
index 
74d39197b89f4e769299b06214c26ee829ecdce0..4f398e2ba374f27811afd2ccf6e72037d0f9ee7f
 100644
--- a/arch/arm/mach-snapdragon/qcom-priv.h
+++ b/arch/arm/mach-snapdragon/qcom-priv.h
@@ -8,19 +8,5 @@ void qcom_configure_capsule_updates(void);
  #else
  void qcom_configure_capsule_updates(void) {}
  #endif /* EFI_HAVE_CAPSULE_SUPPORT */

-#if CONFIG_IS_ENABLED(OF_LIVE)

-/**
- * qcom_of_fixup_nodes() - Fixup Qualcomm DT nodes
- *
- * Adjusts nodes in the live tree to improve compatibility with U-Boot.
- */
-void qcom_of_fixup_nodes(void);
-#else
-static inline void qcom_of_fixup_nodes(void)
-{
-       log_debug("Unable to dynamically fixup USB nodes, please enable 
CONFIG_OF_LIVE\n");
-}
-#endif /* OF_LIVE */
-
  #endif /* __QCOM_PRIV_H__ */

Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org>