| From cf586f4801ef6bb409ba36930022bd21017655bc Mon Sep 17 00:00:00 2001 |
| From: Dmitry Osipenko <digetx@gmail.com> |
| Date: Wed, 18 Dec 2019 21:23:03 +0300 |
| Subject: [PATCH] soc/tegra: fuse: Correct straps' address for older Tegra124 |
| device trees |
| |
| commit 2d9ea1934f8ef0dfb862d103389562cc28b4fc03 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c |
| index df76778af601..f8b9c4058926 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.7.4 |
| |
