From: Peng Fan peng.fan@nxp.com
Move i.MX8ULP MU registers structure to driver to avoid add a copy for i.MX9 Add compatible string for iMX93
Signed-off-by: Peng Fan peng.fan@nxp.com --- arch/arm/include/asm/arch-imx8ulp/imx-regs.h | 25 ------------------- drivers/misc/sentinel/s4mu.c | 26 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/arch/arm/include/asm/arch-imx8ulp/imx-regs.h b/arch/arm/include/asm/arch-imx8ulp/imx-regs.h index 723bab584c3..4720c771096 100644 --- a/arch/arm/include/asm/arch-imx8ulp/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8ulp/imx-regs.h @@ -65,31 +65,6 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h>
-struct mu_type { - u32 ver; - u32 par; - u32 cr; - u32 sr; - u32 reserved0[60]; - u32 fcr; - u32 fsr; - u32 reserved1[2]; - u32 gier; - u32 gcr; - u32 gsr; - u32 reserved2; - u32 tcr; - u32 tsr; - u32 rcr; - u32 rsr; - u32 reserved3[52]; - u32 tr[16]; - u32 reserved4[16]; - u32 rr[16]; - u32 reserved5[14]; - u32 mu_attr; -}; - struct usbphy_regs { u32 usbphy_pwd; /* 0x000 */ u32 usbphy_pwd_set; /* 0x004 */ diff --git a/drivers/misc/sentinel/s4mu.c b/drivers/misc/sentinel/s4mu.c index 121a81060a6..6f0221ac23c 100644 --- a/drivers/misc/sentinel/s4mu.c +++ b/drivers/misc/sentinel/s4mu.c @@ -16,6 +16,31 @@
DECLARE_GLOBAL_DATA_PTR;
+struct mu_type { + u32 ver; + u32 par; + u32 cr; + u32 sr; + u32 reserved0[60]; + u32 fcr; + u32 fsr; + u32 reserved1[2]; + u32 gier; + u32 gcr; + u32 gsr; + u32 reserved2; + u32 tcr; + u32 tsr; + u32 rcr; + u32 rsr; + u32 reserved3[52]; + u32 tr[16]; + u32 reserved4[16]; + u32 rr[16]; + u32 reserved5[14]; + u32 mu_attr; +}; + struct imx8ulp_mu { struct mu_type *base; }; @@ -219,6 +244,7 @@ static struct misc_ops imx8ulp_mu_ops = {
static const struct udevice_id imx8ulp_mu_ids[] = { { .compatible = "fsl,imx8ulp-mu" }, + { .compatible = "fsl,imx93-mu-s4" }, { } };