Commit 4b2b3f03 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'aspeed-7.0-fixes-0' of...

Merge tag 'aspeed-7.0-fixes-0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/bmc/linux into arm/fixes

aspeed: first batch of fixes for v7.0

* tag 'aspeed-7.0-fixes-0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/bmc/linux

:
  soc: aspeed: socinfo: Mask table entries for accurate SoC ID matching

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 14a89125 7ec1bd3d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const char *siliconid_to_name(u32 siliconid)
	unsigned int i;

	for (i = 0 ; i < ARRAY_SIZE(rev_table) ; ++i) {
		if (rev_table[i].id == id)
		if ((rev_table[i].id & 0xff00ffff) == id)
			return rev_table[i].name;
	}