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

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

- Add JEDEC JC_42.4 thermal driver
- Add QorIQ/Layerscape TMU support
- Misc dts fix for fsl-lx2160a
- Misc i.MX9 SCMI updates

5 files changed, 241 insertions, 6 deletions

diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 2bd76ffa739..7bb7b420176 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2019, 2024 NXP
+ * Copyright 2019, 2024-2026 NXP
  */
 
 #include <cpu.h>
@@ -28,8 +28,18 @@ struct cpu_imx_plat {
 	u32 mpidr;
 };
 
+__weak const char *get_cpu_variant_type_name(u32 type)
+{
+	return NULL;
+}
+
 static const char *get_imx_type_str(u32 imxtype)
 {
+	const char *name = get_cpu_variant_type_name(imxtype);
+
+	if (name)
+		return name;
+
 	switch (imxtype) {
 	case MXC_CPU_IMX8MM:
 		return "8MMQ";	/* Quad-core version of the imx8mm */
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 91c39aa4dee..33a82ca3bf1 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -27,11 +27,12 @@ config IMX_SCU_THERMAL
 	  trip is crossed
 
 config IMX_TMU
-        bool "Thermal Management Unit driver for NXP i.MX8M and iMX93"
-        depends on ARCH_IMX8M || IMX93
+	bool "Thermal Management Unit driver for NXP i.MX8M / i.MX93 and QorIQ"
+	depends on ARCH_IMX8M || IMX93 || FSL_LAYERSCAPE
         help
-          Support for Temperature sensors on NXP i.MX8M and iMX93.
-          It supports one critical trip point and one passive trip point.
+	  Support for the NXP Thermal Management Unit (TMU) sensors on
+	  i.MX8M, i.MX93 and on QorIQ/Layerscape SoCs (LX2160A,
+	  LS1028A, LS1088A, ...).
 	  The boot is hold to the cool device to throttle CPUs when the
 	  passive trip is crossed
 
@@ -55,4 +56,11 @@ config TI_LM74_THERMAL
 	 Enable thermal support for the Texas Instruments LM74 chip.
 	 The driver supports reading CPU temperature.
 
+config DM_THERMAL_JC42
+	bool "JEDEC JC-42.4/TSE2004av SPD temperature sensor"
+	depends on DM_I2C
+	help
+	  Enable support for the JEDEC JC-42.4 temperature sensor found
+	  on the SPD bus of DDR3 and DDR4 DIMMs (TSE2004av and compatible).
+
 endif # if DM_THERMAL
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index b6f06c00ed9..c9fa7561b45 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_RCAR_GEN3_THERMAL) += rcar_gen3_thermal.o
 obj-$(CONFIG_SANDBOX) += thermal_sandbox.o
 obj-$(CONFIG_TI_DRA7_THERMAL) += ti-bandgap.o
 obj-$(CONFIG_TI_LM74_THERMAL) += ti-lm74.o
+obj-$(CONFIG_DM_THERMAL_JC42) += jc42.o
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 1bde4d07f52..da0825ecd34 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,14 +6,17 @@
 
 #include <config.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#if IS_ENABLED(CONFIG_ARCH_IMX8M) || IS_ENABLED(CONFIG_IMX93)
+#include <asm/arch/clock.h>
+#endif
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/device-internal.h>
 #include <dm/device.h>
 #include <errno.h>
 #include <fuse.h>
+#include <linux/bitops.h>
 #include <linux/delay.h>
 #include <malloc.h>
 #include <thermal.h>
@@ -22,10 +25,12 @@
 #define FLAGS_VER2	0x1
 #define FLAGS_VER3	0x2
 #define FLAGS_VER4	0x4
+#define FLAGS_QORIQ	0x8
 
 #define TMR_DISABLE	0x0
 #define TMR_ME		0x80000000
 #define TMR_ALPF	0x0c000000
+#define QORIQ_TMR_ALPF	(0x3 << 24)	/* QorIQ ALPF lives at bits[25:24] */
 #define TMTMIR_DEFAULT	0x00000002
 #define TIER_DISABLE	0x0
 
@@ -33,7 +38,19 @@
 #define TER_ADC_PD		0x40000000
 #define TER_ALPF		0x3
 
+/* default CPU delay time to cool down if over temperature */
 #define IMX_TMU_POLLING_DELAY_MS	5000
+
+/* TRITSR - QorIQ Immediate Temperature Site Register.
+ *
+ * Per LX2160A Reference Manual, Rev. 1 (10/2021) section 28.3.1.24
+ * the calibrated reading lives in TEMP[8:0] and is reported in
+ * degrees Kelvin (integer). The QorIQ regs_v1 variant has no
+ * fractional 0.5 degC bit, unlike the i.MX regs_v2 / VER4 layouts.
+ */
+#define TRITSR_V		BIT(31)		/* reading valid */
+#define TRITSR_TEMP_MASK	GENMASK(8, 0)	/* degrees Kelvin */
+#define TRITSR_KELVIN_OFFSET	273		/* TEMP[8:0] - 273 = degC */
 /*
  * i.MX TMU Registers
  */
@@ -148,11 +165,37 @@ struct imx_tmu_regs_v3 {
 	u32 trim;
 };
 
+/*
+ * fsl,qoriq-tmu (LX2160A, LS1028A, LS1088A, ...). Same TMU IP family as
+ * the i.MX "regs_v1" layout but: site-enable is a discrete TMSR at 0x08
+ * (TMTMIR moves to 0x0C), and the temperature range registers are
+ * variable-length at 0xF10 (a SoC may use fewer than 16). Calibration is
+ * taken from the DT (fsl,tmu-range / fsl,tmu-calibration) exactly like
+ * the i.MX regs_v1 path, so qoriq reuses imx_tmu_calibration()'s scheme.
+ */
+struct qoriq_tmu_regs {
+	u32 tmr;		/* 0x000 mode */
+	u32 tsr;		/* 0x004 status */
+	u32 tmsr;		/* 0x008 monitor-site enable (bit N = site N) */
+	u32 tmtmir;		/* 0x00C measurement interval */
+	u8 res0[0x10];
+	u32 tier;		/* 0x020 interrupt enable */
+	u32 tidr;		/* 0x024 interrupt detect */
+	u8 res1[0x58];
+	u32 ttcfgr;		/* 0x080 temperature config (cal walk) */
+	u32 tscfgr;		/* 0x084 sensor config (cal walk) */
+	u8 res2[0x78];
+	struct imx_tmu_site_regs site[SITES_MAX]; /* 0x100 */
+	u8 res3[0xd10];
+	u32 ttrcr[16];		/* 0xF10 temperature range control */
+};
+
 union tmu_regs {
 	struct imx_tmu_regs regs_v1;
 	struct imx_tmu_regs_v2 regs_v2;
 	struct imx_tmu_regs_v3 regs_v3;
 	struct imx_tmu_regs_v4 regs_v4;
+	struct qoriq_tmu_regs regs_qoriq;
 };
 
 struct imx_tmu_plat {
@@ -189,6 +232,9 @@ static int read_temperature(struct udevice *dev, int *temp)
 		} else if (drv_data & FLAGS_VER4) {
 			val = readl(&pdata->regs->regs_v4.tritsr0);
 			valid = val & 0x80000000;
+		} else if (drv_data & FLAGS_QORIQ) {
+			val = readl(&pdata->regs->regs_qoriq.site[pdata->id].tritsr);
+			valid = val & TRITSR_V;
 		} else {
 			val = readl(&pdata->regs->regs_v1.site[pdata->id].tritsr);
 			valid = val & 0x80000000;
@@ -213,6 +259,19 @@ static int read_temperature(struct udevice *dev, int *temp)
 
 			/* Convert Kelvin to Celsius */
 			*temp -= 273000;
+		} else if (drv_data & FLAGS_QORIQ) {
+			/*
+			 * LX2160A Reference Manual, Rev. 1 (10/2021)
+			 * section 28.3.1.24: TEMP[8:0] is the calibrated
+			 * reading in degrees Kelvin (integer, no 0.5 degC
+			 * bit on the regs_v1 variant). The calibration
+			 * point examples in the same RM section 28.1.3
+			 * use the same Kelvin/Celsius offset:
+			 *   TTR0CR=0x800000E6 -> 230K (-43 degC)
+			 *   TTR1CR=0x8001017D -> 381K (108 degC)
+			 */
+			*temp = ((val & TRITSR_TEMP_MASK) -
+				 TRITSR_KELVIN_OFFSET) * 1000;
 		} else {
 			*temp = (val & 0xff) * 1000;
 		}
@@ -265,6 +324,35 @@ static int imx_tmu_calibration(struct udevice *dev)
 	if (drv_data & (FLAGS_VER2 | FLAGS_VER3))
 		return 0;
 
+	if (drv_data & FLAGS_QORIQ) {
+		const fdt32_t *ranges;
+		int n;
+
+		ranges = dev_read_prop(dev, "fsl,tmu-range", &len);
+		if (!ranges || len % 4 ||
+		    len / 4 > (int)ARRAY_SIZE(pdata->regs->regs_qoriq.ttrcr)) {
+			dev_err(dev, "TMU: missing/invalid fsl,tmu-range\n");
+			return -ENODEV;
+		}
+		n = len / 4;
+		for (i = 0; i < n; i++)
+			writel(fdt32_to_cpu(ranges[i]),
+			       &pdata->regs->regs_qoriq.ttrcr[i]);
+
+		calibration = dev_read_prop(dev, "fsl,tmu-calibration", &len);
+		if (!calibration || len % 8) {
+			dev_err(dev, "TMU: invalid calibration data.\n");
+			return -ENODEV;
+		}
+		for (i = 0; i < len; i += 8, calibration += 2) {
+			writel(fdt32_to_cpu(*calibration),
+			       &pdata->regs->regs_qoriq.ttcfgr);
+			writel(fdt32_to_cpu(*(calibration + 1)),
+			       &pdata->regs->regs_qoriq.tscfgr);
+		}
+		return 0;
+	}
+
 	if (drv_data & FLAGS_VER4) {
 		calibration = dev_read_prop(dev, "fsl,tmu-calibration", &len);
 		if (!calibration || len % 8 || len > 128) {
@@ -402,6 +490,18 @@ static inline void imx_tmu_mx8mq_init(struct udevice *dev) { }
 
 static void imx_tmu_arch_init(struct udevice *dev)
 {
+	/*
+	 * QorIQ takes its calibration from the DT (fsl,tmu-calibration),
+	 * not from OCOTP fuses, so it has no per-SoC arch init. The #if
+	 * below is still required: the i.MX SoC-ID helpers and fuse API
+	 * (<asm/arch/sys_proto.h>) do not exist in a Layerscape build, so
+	 * the references must be removed at compile time, not merely
+	 * skipped at runtime.
+	 */
+	if (dev_get_driver_data(dev) & FLAGS_QORIQ)
+		return;
+
+#if IS_ENABLED(CONFIG_ARCH_IMX8M) || IS_ENABLED(CONFIG_IMX93)
 	if (is_imx8mm() || is_imx8mn())
 		imx_tmu_mx8mm_mx8mn_init(dev);
 	else if (is_imx8mp())
@@ -412,6 +512,7 @@ static void imx_tmu_arch_init(struct udevice *dev)
 		imx_tmu_mx8mq_init(dev);
 	else
 		dev_err(dev, "Unsupported SoC, TMU calibration not loaded!\n");
+#endif
 }
 
 static void imx_tmu_init(struct udevice *dev)
@@ -443,6 +544,15 @@ static void imx_tmu_init(struct udevice *dev)
 
 		/* Set update_interval */
 		writel(TMTMIR_DEFAULT, &pdata->regs->regs_v4.tmtmir);
+	} else if (drv_data & FLAGS_QORIQ) {
+		/* Disable monitoring */
+		writel(TMR_DISABLE, &pdata->regs->regs_qoriq.tmr);
+
+		/* Disable interrupt, using polling instead */
+		writel(TIER_DISABLE, &pdata->regs->regs_qoriq.tier);
+
+		/* Set update_interval */
+		writel(TMTMIR_DEFAULT, &pdata->regs->regs_qoriq.tmtmir);
 	} else {
 		/* Disable monitoring */
 		writel(TMR_DISABLE, &pdata->regs->regs_v1.tmr);
@@ -511,6 +621,18 @@ static int imx_tmu_enable_msite(struct udevice *dev)
 		/* Enable ME */
 		reg |= TMR_ME;
 		writel(reg, &pdata->regs->regs_v4.tmr);
+	} else if (drv_data & FLAGS_QORIQ) {
+		/* Clear ME, enable every site at once via the discrete TMSR */
+		reg = readl(&pdata->regs->regs_qoriq.tmr);
+		reg &= ~TMR_ME;
+		writel(reg, &pdata->regs->regs_qoriq.tmr);
+
+		writel(GENMASK(SITES_MAX - 1, 0),
+		       &pdata->regs->regs_qoriq.tmsr);
+
+		reg |= QORIQ_TMR_ALPF;
+		reg |= TMR_ME;
+		writel(reg, &pdata->regs->regs_qoriq.tmr);
 	} else {
 		/* Clear the ME before setting MSITE and ALPF*/
 		reg = readl(&pdata->regs->regs_v1.tmr);
@@ -650,6 +772,7 @@ static const struct udevice_id imx_tmu_ids[] = {
 	{ .compatible = "fsl,imx8mm-tmu", .data = FLAGS_VER2, },
 	{ .compatible = "fsl,imx8mp-tmu", .data = FLAGS_VER3, },
 	{ .compatible = "fsl,imx93-tmu", .data = FLAGS_VER4, },
+	{ .compatible = "fsl,qoriq-tmu", .data = FLAGS_QORIQ, },
 	{ }
 };
 
diff --git a/drivers/thermal/jc42.c b/drivers/thermal/jc42.c
new file mode 100644
index 00000000000..6945260e8b0
--- /dev/null
+++ b/drivers/thermal/jc42.c
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2026 Free Mobile - Vincent Jardin
+ *
+ * JEDEC JC-42.4 / TSE2004av Temperature Sensor driver.
+ *
+ * Generic I2C temperature sensor of the Serial Presence Detect (SPD)
+ * bus of DDR3 and DDR4 SO-DIMMs / UDIMMs / RDIMMs per the JEDEC
+ * JC-42.4 standard. The TSE2004av variant adds an integrated SPD
+ * EEPROM, but the thermal register interface is the same and is
+ * what this driver exposes.
+ *
+ * Register layout (subset):
+ *   0x05  Ambient temperature, 16-bit big-endian:
+ *           bit 15    : T_CRIT alarm flag    (read-only)
+ *           bit 14    : T_HIGH alarm flag    (read-only)
+ *           bit 13    : T_LOW alarm flag     (read-only)
+ *           bit 12    : sign (two's-complement within bits[12:0])
+ *           bits[11:0]: magnitude * 16 (LSB = 0.0625 degC = 62.5 mC)
+ *   0x06  Manufacturer ID  (16-bit BE, JEP-106 vendor code)
+ *   0x07  Device ID + Revision (upper byte = ID, lower = revision)
+ *   ...
+ */
+
+#include <dm.h>
+#include <i2c.h>
+#include <thermal.h>
+#include <linux/bitops.h>
+
+#define JC42_REG_TEMP		0x05
+
+#define JC42_TEMP_SIGN		BIT(12)
+#define JC42_TEMP_MAGNITUDE	GENMASK(11, 0)
+
+static int jc42_get_temp(struct udevice *dev, int *temp)
+{
+	u8 buf[2];
+	int ret;
+	int mag;
+
+	ret = dm_i2c_read(dev, JC42_REG_TEMP, buf, sizeof(buf));
+	if (ret)
+		return ret;
+
+	mag = ((buf[0] << 8) | buf[1]) & (JC42_TEMP_SIGN | JC42_TEMP_MAGNITUDE);
+	if (mag & JC42_TEMP_SIGN)
+		mag -= (JC42_TEMP_SIGN << 1);
+
+	/*
+	 * mag is in units of 1/16 degC. Multiply first to keep one
+	 * extra bit of precision before the divide. Worst-case range
+	 * for a 13-bit signed value is +/-4096, so the product fits
+	 * comfortably in an int (~4.1M mC).
+	 */
+	*temp = mag * 1000 / 16;
+
+	return 0;
+}
+
+static const struct dm_thermal_ops jc42_ops = {
+	.get_temp	= jc42_get_temp,
+};
+
+/*
+ * Optional DT label property override: it replace the default DM
+ * device name (the ofnode name, eg "temp@18") so
+ * temperature list or temperature get commands
+ * show a human-meaningful identifier such as "ddr-top" or
+ * "ddr-bottom".
+ * It mirrors the Linux hwmon binding which uses label for the
+ * per-sensor display name.
+ */
+static int jc42_bind(struct udevice *dev)
+{
+	const char *label = dev_read_string(dev, "label");
+
+	if (label && *label)
+		return device_set_name(dev, label);
+	return 0;
+}
+
+static const struct udevice_id jc42_match[] = {
+	{ .compatible = "jedec,jc-42.4-temp" },
+	{ }
+};
+
+U_BOOT_DRIVER(jc42_thermal) = {
+	.name		= "jc42_thermal",
+	.id		= UCLASS_THERMAL,
+	.of_match	= jc42_match,
+	.bind		= jc42_bind,
+	.ops		= &jc42_ops,
+};