Commit 6505114e82e7 for kernel

commit 6505114e82e7541414b176b5da4a3c015a1214ea
Merge: 61cf95881087 cb2c3b5e113f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jun 17 11:28:10 2026 -0700

    Merge tag 'soc-arm-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

    Pull arm SoC code updates from Arnd Bergmann:
     "The largest addition here is the revived support for the ZTE ZX SoC
      platform, though this mostly documentation.

      The other changes are code cleanups that deal with continued
      conversion of the GPIO library away from GPIO numbers to descriptors
      and a few minor bugfixes"

    * tag 'soc-arm-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
      MAINTAINERS: Add Axiado reviewer and Maintainers
      ARM: remove the last few uses of do_bad_IRQ()
      ARM: imx31: Fix IIM mapping leak in revision check
      ARM: imx3: Fix CCM node reference leak
      ARM: orion5x: update board check in mss2_pci_init() to use the DT
      arm: mvebu_v5_defconfig: remove stale MACH_LINKSTATION_LSCHL reference
      ARM: mvebu: simplify of_node_put calls
      ARM: mvebu: drop unnecessary NULL check
      arm: boot: ep93xx: don't rely on machine_is_*() for removed board files
      ARM: zte: clean up zx297520v3 doc. warnings
      arm64: Kconfig: drop unneeded dependency on OF_GPIO for ARCH_MVEBU
      firmware: imx: sm-misc: Make scmi_imx_misc_ctrl_nb variable static
      ARM: zte: Add zx297520v3 platform support
      ARM: pxa: pxa27x: attach software node to its target GPIO controller
      ARM: pxa: pxa25x: attach software node to its target GPIO controller
      ARM: pxa: spitz: attach software nodes to their target GPIO controllers
      ARM: pxa: statify platform device definitions in spitz board file
      ARM: omap2: simplify allocation for omap_device
      ARM: select legacy gpiolib interfaces where used
      ARM: s3c: use gpio lookup table for LEDs

diff --cc drivers/firmware/imx/sm-misc.c
index 16b5ff833d21,8d95a901734a..ac9af824c2d4
--- a/drivers/firmware/imx/sm-misc.c
+++ b/drivers/firmware/imx/sm-misc.c
@@@ -16,31 -16,8 +16,31 @@@

  static const struct scmi_imx_misc_proto_ops *imx_misc_ctrl_ops;
  static struct scmi_protocol_handle *ph;
- struct notifier_block scmi_imx_misc_ctrl_nb;
+ static struct notifier_block scmi_imx_misc_ctrl_nb;

 +static const char * const rst_imx95[] = {
 +	"cm33_lockup", "cm33_swreq", "cm7_lockup", "cm7_swreq", "fccu",
 +	"jtag_sw", "ele", "tempsense", "wdog1", "wdog2", "wdog3", "wdog4",
 +	"wdog5", "jtag", "cm33_exc", "bbm", "sw", "sm_err", "fusa_sreco",
 +	"pmic", "unused", "unused", "unused", "unused", "unused", "unused",
 +	"unused", "unused", "unused", "unused", "unused", "por",
 +};
 +
 +static const char * const rst_imx94[] = {
 +	"cm33_lockup", "cm33_swreq", "cm70_lockup", "cm70_swreq", "fccu",
 +	"jtag_sw", "ele", "tempsense", "wdog1", "wdog2", "wdog3", "wdog4",
 +	"wdog5", "jtag", "wdog6", "wdog7", "wdog8", "wo_netc", "cm33s_lockup",
 +	"cm33s_swreq", "cm71_lockup", "cm71_swreq", "cm33_exc", "bbm", "sw",
 +	"sm_err", "fusa_sreco", "pmic", "unused", "unused", "unused", "por",
 +};
 +
 +static const struct of_device_id allowlist[] = {
 +	{ .compatible = "fsl,imx952", .data = rst_imx95 },
 +	{ .compatible = "fsl,imx95", .data = rst_imx95 },
 +	{ .compatible = "fsl,imx94", .data = rst_imx94 },
 +	{ /* Sentinel */ }
 +};
 +
  int scmi_imx_misc_ctrl_set(u32 id, u32 val)
  {
  	if (!ph)