Commit 1481fd71 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'tegra-for-5.9-soc' of...

Merge tag 'tegra-for-5.9-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

soc/tegra: Changes for v5.9-rc1

This adds missing SoC IDs for Tegra186 and Tegra194 and fixes a typo in
a warning message.

* tag 'tegra-for-5.9-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: fuse: Fix typo in APB MISC warning
  soc/tegra: fuse: Add Tegra186 and Tegra194 SoC IDs

Link: https://lore.kernel.org/r/20200717161300.1661002-4-thierry.reding@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c7d0ff93 eb8bb7ab
...@@ -27,7 +27,7 @@ static u32 chipid; ...@@ -27,7 +27,7 @@ static u32 chipid;
u32 tegra_read_chipid(void) u32 tegra_read_chipid(void)
{ {
WARN(!chipid, "Tegra ABP MISC not yet available\n"); WARN(!chipid, "Tegra APB MISC not yet available\n");
return chipid; return chipid;
} }
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#define TEGRA124 0x40 #define TEGRA124 0x40
#define TEGRA132 0x13 #define TEGRA132 0x13
#define TEGRA210 0x21 #define TEGRA210 0x21
#define TEGRA186 0x18
#define TEGRA194 0x19
#define TEGRA_FUSE_SKU_CALIB_0 0xf0 #define TEGRA_FUSE_SKU_CALIB_0 0xf0
#define TEGRA30_FUSE_SATA_CALIB 0x124 #define TEGRA30_FUSE_SATA_CALIB 0x124
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment