summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Bachinin <EABachinin@salutedevices.com>2025-02-10 20:50:14 +0300
committerNeil Armstrong <neil.armstrong@linaro.org>2025-03-18 15:27:25 +0100
commit4ea3c0ac21c920c3f996128e5b187b1e3cac6445 (patch)
tree1a6f9130ea7aa6738a9f8dd32f4bdc606eb01832
parent0e1fc465fea62ebae91f2f56cb823e8b37ee1077 (diff)
arm: meson: unify type being used for socinfo
socinfo_ API uses u32 type, hence let's use it everywhere for consistency. Signed-off-by: Evgeny Bachinin <EABachinin@salutedevices.com> Link: https://lore.kernel.org/r/20250210-meson_chip_id_all_vers-v1-1-b98f8b6880b8@salutedevices.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
-rw-r--r--arch/arm/mach-meson/board-info.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index b4058f59323..94b066170c4 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -7,6 +7,7 @@
#include <init.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/types.h>
#include <dm.h>
#include <linux/bitfield.h>
#include <regmap.h>
@@ -125,12 +126,12 @@ static const char *socinfo_to_soc_id(u32 socinfo)
return "Unknown";
}
-static unsigned int get_socinfo(void)
+static u32 get_socinfo(void)
{
struct regmap *regmap;
int nodeoffset, ret;
ofnode node;
- unsigned int socinfo;
+ u32 socinfo;
/* find the offset of compatible node */
nodeoffset = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
@@ -162,7 +163,7 @@ static unsigned int get_socinfo(void)
int checkboard(void)
{
- unsigned int socinfo;
+ u32 socinfo;
socinfo = get_socinfo();
if (!socinfo)
@@ -181,7 +182,7 @@ int checkboard(void)
int meson_get_soc_rev(char *buff, size_t buff_len)
{
- unsigned int socinfo;
+ u32 socinfo;
socinfo = get_socinfo();
if (!socinfo)