Messages in this thread Patch in this message | | | From | Aisheng Dong <> | Subject | RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset | Date | Wed, 10 Jun 2020 07:53:53 +0000 |
| |
> From: Anson Huang <Anson.Huang@nxp.com> > Sent: Wednesday, June 10, 2020 6:42 AM > > Correct i.MX8MP UID fuse offset according to fuse map: > > UID_LOW: 0x420 > UID_HIGH: 0x430 > > Fixes: fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc driver")
AFAIK "Fixes:" should point to the original patch which introduced the issue. Not the one changing file name.
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > Changes since V1: > - add fix tag. > --- > drivers/soc/imx/soc-imx8m.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index > 7b0759a..0bc8314 100644 > --- a/drivers/soc/imx/soc-imx8m.c > +++ b/drivers/soc/imx/soc-imx8m.c > @@ -22,6 +22,8 @@ > #define OCOTP_UID_LOW 0x410 > #define OCOTP_UID_HIGH 0x420 > > +#define IMX8MP_OCOTP_UID_OFFSET 0x10 > + > /* Same as ANADIG_DIGPROG_IMX7D */ > #define ANADIG_DIGPROG_IMX8MM 0x800 > > @@ -87,6 +89,8 @@ static void __init imx8mm_soc_uid(void) { > void __iomem *ocotp_base; > struct device_node *np; > + u32 offset = of_machine_is_compatible("fsl,imx8mp") ? > + IMX8MP_OCOTP_UID_OFFSET : 0; >
If (of_machine_is_compatible("fsl,imx8mp")) Octop_base += IMX8MP_OCOTP_UID_OFFSET; Then you may not need the extra changes.
Regards Aisheng
> np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-ocotp"); > if (!np) > @@ -95,9 +99,9 @@ static void __init imx8mm_soc_uid(void) > ocotp_base = of_iomap(np, 0); > WARN_ON(!ocotp_base); > > - soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH); > + soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + offset); > soc_uid <<= 32; > - soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW); > + soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + offset); > > iounmap(ocotp_base); > of_node_put(np); > -- > 2.7.4
| |