summaryrefslogtreecommitdiffstats
path: root/drivers/soc/tegra/fuse/tegra-apbmisc.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2017-06-26 17:21:17 +0200
committerThierry Reding <treding@nvidia.com>2017-12-13 12:43:30 +0100
commit1f1607dbd9f6efc22f06e16fc11675dd6323aaab (patch)
treee86c9849e7bfa578264ac3fed41e65d984299d08 /drivers/soc/tegra/fuse/tegra-apbmisc.c
parent83468fe259bf827f350b118f25bce99dc0bdf597 (diff)
downloadtalos-obmc-linux-1f1607dbd9f6efc22f06e16fc11675dd6323aaab.tar.gz
talos-obmc-linux-1f1607dbd9f6efc22f06e16fc11675dd6323aaab.zip
soc/tegra: fuse: Move register mapping check
The tegra_read_chipid() function can be called from places other than tegra_get_chip_id(), so the check for a valid mapping of the MISC registers needs to be moved to tegra_read_chipid() to catch all potential accesses. Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/soc/tegra/fuse/tegra-apbmisc.c')
-rw-r--r--drivers/soc/tegra/fuse/tegra-apbmisc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c
index 5b18f6ffa45c..b1f8b23277b9 100644
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
+++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@ -39,16 +39,16 @@ static bool long_ram_code;
u32 tegra_read_chipid(void)
{
- return readl_relaxed(apbmisc_base + 4);
-}
-
-u8 tegra_get_chip_id(void)
-{
if (!apbmisc_base) {
WARN(1, "Tegra Chip ID not yet available\n");
return 0;
}
+ return readl_relaxed(apbmisc_base + 4);
+}
+
+u8 tegra_get_chip_id(void)
+{
return (tegra_read_chipid() >> 8) & 0xff;
}
OpenPOWER on IntegriCloud