lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 317/542] soc/tegra: fuse: Correct straps' address for older Tegra124 device trees
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 2d9ea1934f8ef0dfb862d103389562cc28b4fc03 ]

    Trying to read out Chip ID before APBMISC registers are mapped won't
    succeed, in a result Tegra124 gets a wrong address for the HW straps
    register if machine uses an old outdated device tree.

    Fixes: 297c4f3dcbff ("soc/tegra: fuse: Restrict legacy code to 32-bit ARM")
    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c
    index df76778af601e..f8b9c4058926b 100644
    --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
    +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
    @@ -123,7 +123,7 @@ void __init tegra_init_apbmisc(void)
    apbmisc.flags = IORESOURCE_MEM;

    /* strapping options */
    - if (tegra_get_chip_id() == TEGRA124) {
    + if (of_machine_is_compatible("nvidia,tegra124")) {
    straps.start = 0x7000e864;
    straps.end = 0x7000e867;
    } else {
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:11    [W:2.538 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site