[qcom-next] Add OF_LIVE device tree fixup infrastructure

arch/arm/dts/lemans-evk-u-boot.dtsi

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2026, Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/ {
+	/* Will be removed when bootloader updates later */
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x0 0x80000000 0x0 0x3ee00000>,
+		      <0x0 0xc0000000 0x0 0x0fd00000>,
+		      <0xD 0x00000000 0x2 0x54100000>,
+		      <0xA 0x80000000 0x1 0x80000000>,
+		      <0x9 0x00000000 0x1 0x80000000>,
+		      <0x1 0x00000000 0x3 0x00000000>,
+		      <0x0 0xd0000000 0x0 0x01900000>,
+		      <0x0 0xd3500000 0x0 0x2cb00000>;
+	};
+};

arch/arm/dts/qcs615-ride-u-boot.dtsi

@@ -11,4 +11,30 @@
 		      <0x0 0xc0000000 0x0 0xc0000000>,
 		      <0x1 0x80000000 0x1 0x00000000>;
 	};
+
+	reboot-mode {
+		compatible = "nvmem-reboot-mode";
+		nvmem-cells = <&reboot_reason>;
+		nvmem-cell-names = "reboot-mode";
+
+		mode-bootloader = <0x02>;
+		mode-recovery   = <0x01>;
+	};
+};
+
+&pm8150_0 {
+	/* Virtual NVMEM node for PON-based reboot reason storage */
+	nvram@800 {
+		compatible = "qcom,spmi-sdam";
+		reg = <0x800>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x00 0x800 0x100>;
+
+		/* Reboot reason cell at PON_SOFT_RB_SPARE (0x88F) */
+		reboot_reason: reboot-reason@8f {
+			reg = <0x8f 0x1>;
+			bits = <1 7>;
+		};
+	};
 };

arch/arm/mach-snapdragon/Makefile

@@ -4,4 +4,7 @@
 
 obj-y += board.o
 obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += capsule_update.o
+obj-$(CONFIG_OF_LIVE) += qcom_fixup_boardinfo.o
+obj-$(CONFIG_OF_LIVE) += qcom_fixup_ddrinfo.o
+obj-$(CONFIG_OF_LIVE) += qcom_fixup_subsetparts.o
 obj-$(CONFIG_OF_LIVE) += of_fixup.o

arch/arm/mach-snapdragon/chipinfo_def.h

@@ -0,0 +1,90 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Type and enum definitions for the Chip Info driver
+ *
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ *
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum chip_info_result {
+	CHIPINFO_SUCCESS = 0,
+	CHIPINFO_ERROR = -1,
+	CHIPINFO_ERROR_INVALID_PARAMETER = -2,
+	CHIPINFO_ERROR_INSUFFICIENT_MEMORY = -3,
+	CHIPINFO_ERROR_NOT_FOUND = -4,
+	CHIPINFO_ERROR_INTERNAL = -5,
+	CHIPINFO_ERROR_NOT_ALLOWED = -6,
+	CHIPINFO_ERROR_NOT_SUPPORTED = -7,
+	CHIPINFO_ERROR_NOT_INITIALIZED = -8,
+	CHIPINFO_ERROR_OUT_OF_RANGE_PARAMETER = -9,
+	CHIPINFO_ERROR_INVALID_ADDRESS = -10,
+	CHIPINFO_ERROR_INSUFFICIENT_BUFFER_LENGTH = -11,
+};
+
+/**
+ * Supported parts by the chipinfo_get_disabled_features API.
+ * New parts should be appended to this enum (i.e. not inserted)
+ * to preserve backwards compatibility.
+ *
+ * For targets that have multiple instances of a specific part,
+ * a new part with a _N suffix should be added. On these targets,
+ * part enums without the _N suffix are for the 0th instance,
+ * e.g. CHIPINFO_PART_DISPLAY is for MDSS_0 on Makena.
+ */
+enum chip_info_Part_type {
+	CHIPINFO_PART_UNKNOWN = 0,
+	CHIPINFO_PART_GPU = 1,
+	CHIPINFO_PART_VIDEO = 2,
+	CHIPINFO_PART_CAMERA = 3,
+	CHIPINFO_PART_DISPLAY = 4,
+	CHIPINFO_PART_AUDIO = 5,
+	CHIPINFO_PART_MODEM = 6,
+	CHIPINFO_PART_WLAN = 7,
+	CHIPINFO_PART_COMP = 8, // For both CDSP and NSP
+	CHIPINFO_PART_SENSORS = 9,
+	CHIPINFO_PART_NPU = 10,
+	CHIPINFO_PART_SPSS = 11,
+	CHIPINFO_PART_NAV = 12,
+	CHIPINFO_PART_COMPUTE_1 = 13,
+	CHIPINFO_PART_DISPLAY_1 = 14,
+	CHIPINFO_PART_NSP = 15,
+	CHIPINFO_PART_EVA = 16,
+	CHIPINFO_PART_PCIE = 17,
+	CHIPINFO_PART_CPU = 18,
+	CHIPINFO_PART_DDR = 19,
+
+	CHIPINFO_NUM_PARTS,
+	CHIPINFO_PART_32BITS = 0x7FFFFFFF
+};
+
+/**
+ * SKU_IDs logical mapping.
+ * See ChipInfo_GetSKU for more details.
+ */
+enum chip_info_skuid_type {
+	CHIPINFO_SKU_UNKNOWN = 0,
+
+	CHIPINFO_SKU_AA = 0x01,
+	CHIPINFO_SKU_AB = 0x02,
+	CHIPINFO_SKU_AC = 0x03,
+	CHIPINFO_SKU_AD = 0x04,
+	CHIPINFO_SKU_AE = 0x05,
+	CHIPINFO_SKU_AF = 0x06,
+	// Reserved for future use
+
+	CHIPINFO_SKU_Y0 = 0xf1,
+	CHIPINFO_SKU_Y1 = 0xf2,
+	CHIPINFO_SKU_Y2 = 0xf3,
+	CHIPINFO_SKU_Y3 = 0xf4,
+	CHIPINFO_SKU_Y4 = 0xf5,
+	CHIPINFO_SKU_Y5 = 0xf6,
+	CHIPINFO_SKU_Y6 = 0xf7,
+	CHIPINFO_SKU_Y7 = 0xf8,
+	// Reserved for future use
+
+};
+

arch/arm/mach-snapdragon/of_fixup.c

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <tee/optee.h>
 #include <time.h>
+#include "qcom_fixup_handlers.h"
 
 /**
  * find_ssphy_node() - Find the super-speed PHY node referenced by DWC3
@@ -283,5 +284,88 @@ EVENT_SPY_FULL(EVT_OF_LIVE_BUILT, qcom_of_fixup_nodes);
 
 int ft_board_setup(void __maybe_unused *blob, struct bd_info __maybe_unused *bd)
 {
+	struct fdt_header *fdt = blob;
+
+	boardinfo_fixup_handler(fdt);
+	ddrinfo_fixup_handler(fdt);
+	subsetparts_fixup_handler(fdt);
+
 	return 0;
 }
+
+int fixup_dt_node(void *fdt_ptr, int node_offset,
+		  const char *property_name,
+		  void *property_value,
+		  enum fdt_fixup_type type)
+{
+	int ret;
+
+	if ((!fdt_ptr || node_offset < 0) ||
+	    (!property_value && type != ADD_SUBNODE))
+		return -1;
+
+	switch (type) {
+	case APPEND_PROP_U32:
+		fdt_set_totalsize(fdt_ptr,
+				  (fdt_totalsize(fdt_ptr)
+				  + sizeof(struct fdt_property)
+				  + strlen(property_name) + 3
+				  + sizeof(u32)));
+		ret = fdt_appendprop_u32(fdt_ptr, node_offset,
+					 property_name,
+					 *(u32 *)property_value);
+		break;
+	case APPEND_PROP_U64:
+		fdt_set_totalsize(fdt_ptr,
+				  (fdt_totalsize(fdt_ptr)
+				  + sizeof(struct fdt_property)
+				  + strlen(property_name) + 3
+				  + sizeof(u64)));
+		ret = fdt_appendprop_u64(fdt_ptr, node_offset,
+					 property_name,
+					 *(u64 *)property_value);
+		break;
+	case SET_PROP_U32:
+		fdt_set_totalsize(fdt_ptr,
+				  (fdt_totalsize(fdt_ptr)
+				  + sizeof(struct fdt_property)
+				  + strlen(property_name) + 3
+				  + sizeof(u32)));
+		ret = fdt_setprop_u32(fdt_ptr, node_offset,
+				      property_name,
+				      *(u32 *)property_value);
+		break;
+	case SET_PROP_U64:
+		fdt_set_totalsize(fdt_ptr,
+				  (fdt_totalsize(fdt_ptr)
+				  + sizeof(struct fdt_property)
+				  + strlen(property_name) + 3
+				  + sizeof(u64)));
+		ret = fdt_setprop_u64(fdt_ptr, node_offset,
+				      property_name,
+				      *(u64 *)property_value);
+		break;
+	case SET_PROP_STRING:
+		fdt_set_totalsize(fdt_ptr,
+				  (fdt_totalsize(fdt_ptr)
+				  + sizeof(struct fdt_property)
+				  + strlen(property_name) + 3
+				  + strlen((char *)property_value)));
+		ret = fdt_setprop_string(fdt_ptr, node_offset,
+					 property_name,
+					 (char *)property_value);
+		break;
+	case ADD_SUBNODE:
+		fdt_set_totalsize(fdt_ptr,
+				  (fdt_totalsize(fdt_ptr)
+				  + sizeof(struct fdt_property)
+				  + strlen(property_name) + 3));
+		ret = fdt_add_subnode(fdt_ptr, node_offset,
+				      property_name);
+		break;
+	default:
+		ret = -1;
+	}
+
+	return ret;
+}