Skip to content

Commit 1481fd7

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents c7d0ff9 + eb8bb7a commit 1481fd7

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

drivers/soc/tegra/fuse/tegra-apbmisc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static u32 chipid;
2727

2828
u32 tegra_read_chipid(void)
2929
{
30-
WARN(!chipid, "Tegra ABP MISC not yet available\n");
30+
WARN(!chipid, "Tegra APB MISC not yet available\n");
3131

3232
return chipid;
3333
}

include/soc/tegra/fuse.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#define TEGRA124 0x40
1313
#define TEGRA132 0x13
1414
#define TEGRA210 0x21
15+
#define TEGRA186 0x18
16+
#define TEGRA194 0x19
1517

1618
#define TEGRA_FUSE_SKU_CALIB_0 0xf0
1719
#define TEGRA30_FUSE_SATA_CALIB 0x124

0 commit comments

Comments
 (0)