diff --git a/MAINTAINERS b/MAINTAINERS
index 4dd97ffcad..c60afc93a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -365,6 +365,13 @@ F:	tools/misc/xenhypfs.c
 F:	xen/common/hypfs.c
 F:	xen/include/xen/hypfs.h
 
+IMX8M SUPPORT
+R:	Wig Cheng <onlywig@gmail.com>
+F:	xen/arch/arm/arm64/debug-imx-uart.inc
+F:	xen/arch/arm/include/asm/imx-uart.h
+F:	xen/arch/arm/platforms/imx8m.c
+F:	xen/drivers/char/imx-uart.c
+
 IMX8QM/QXP SUPPORT
 R:	John Ernberg <john.ernberg@actia.se>
 F:	xen/arch/arm/platforms/imx8qm.c
diff --git a/xen/arch/arm/platforms/imx8m.c b/xen/arch/arm/platforms/imx8m.c
index ad76935f5d..669dd517e0 100644
--- a/xen/arch/arm/platforms/imx8m.c
+++ b/xen/arch/arm/platforms/imx8m.c
@@ -111,14 +111,8 @@ static bool imx8m_smc(struct cpu_user_regs *regs)
          * NoC QoS priority setup.  Only i.MX8MQ issues this at boot;
          * i.MX8MP issues no NoC call, but the platform covers both.
          */
-        switch ( subfunction_id )
-        {
-        case IMX_SIP_NOC_SF_PRIORITY:
-            break;
-
-        default:
+        if ( subfunction_id != IMX_SIP_NOC_SF_PRIORITY )
             return false;
-        }
         break;
 
     default: