diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-17 21:17:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-17 21:17:20 +0200 |
| commit | 1481fd71398f6537fbcc26aa5a4aa360679822b8 (patch) | |
| tree | eabeaa89b30db1953c6793061db32d86aa6d8b69 | |
| parent | c7d0ff9323630b8bf6b3b317b53f3f04b9f8f4f2 (diff) | |
| parent | eb8bb7abbb0b22238b844578970f14fa982fc2b0 (diff) | |
| download | linux-1481fd71398f6537fbcc26aa5a4aa360679822b8.tar.gz linux-1481fd71398f6537fbcc26aa5a4aa360679822b8.tar.bz2 linux-1481fd71398f6537fbcc26aa5a4aa360679822b8.zip | |
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.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 | ||||
| -rw-r--r-- | include/soc/tegra/fuse.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c index 3cdd69d1bd4d..8e416ad91ee2 100644 --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c @@ -27,7 +27,7 @@ static u32 chipid; 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; } diff --git a/include/soc/tegra/fuse.h b/include/soc/tegra/fuse.h index 252ea20fe4c1..1097feca41ed 100644 --- a/include/soc/tegra/fuse.h +++ b/include/soc/tegra/fuse.h @@ -12,6 +12,8 @@ #define TEGRA124 0x40 #define TEGRA132 0x13 #define TEGRA210 0x21 +#define TEGRA186 0x18 +#define TEGRA194 0x19 #define TEGRA_FUSE_SKU_CALIB_0 0xf0 #define TEGRA30_FUSE_SATA_CALIB 0x124 |