lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 145/265] soc: imx8m: Correct i.MX8MP UID fuse offset
    Date
    From: Anson Huang <Anson.Huang@nxp.com>

    [ Upstream commit c95c9693b112f312b59c5d100fd09a1349970fab ]

    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")
    Fixes: 18f662a73862 ("soc: imx: Add i.MX8MP SoC driver support")
    Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
    Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 719e1f189ebf2..ada0d8804d84c 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

    @@ -88,6 +90,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;

    np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-ocotp");
    if (!np)
    @@ -96,9 +100,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.25.1
    \
     
     \ /
      Last update: 2020-06-30 00:02    [W:4.154 / U:0.740 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site