brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-28 07:30:26 +09:00
Code Issues Projects Releases Wiki Activity

ARM: uniphier: use FIELD_GET() to get access to revision register fields

Browse Source 
Define register fields as macros, and use FIELD_GET().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2020-07-30 18:28:08 +09:00
parent 26f0c8600e
commit 351b74cb6d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-uniphier/sg-regs.h
View File

@ -10,6 +10,8 @@
#ifndef UNIPHIER_SG_REGS_H
#define UNIPHIER_SG_REGS_H
#include <linux/bitops.h>
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
#ifdef CONFIG_ARCH_UNIPHIER_V8_MULTI
@ -24,6 +26,9 @@ extern void __iomem *sg_base;
/* Revision */
#define SG_REVISION 0x0000
#define SG_REVISION_TYPE_MASK GENMASK(23, 16)
#define SG_REVISION_MODEL_MASK GENMASK(10, 8)
#define SG_REVISION_REV_MASK GENMASK(4, 0)
/* Memory Configuration */
#define SG_MEMCONF 0x0400

21
arch/arm/mach-uniphier/soc-info.c
View File

@ -4,31 +4,30 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <linux/bitfield.h>
#include <linux/io.h>
#include <linux/types.h>
#include "sg-regs.h"
#include "soc-info.h"
static unsigned int __uniphier_get_revision_field(unsigned int mask,
unsigned int shift)
{
u32 revision = readl(sg_base + SG_REVISION);
return (revision >> shift) & mask;
}
unsigned int uniphier_get_soc_id(void)
{
return __uniphier_get_revision_field(0xff, 16);
u32 rev = readl(sg_base + SG_REVISION);
return FIELD_GET(SG_REVISION_TYPE_MASK, rev);
}
unsigned int uniphier_get_soc_model(void)
{
return __uniphier_get_revision_field(0x7, 8);
u32 rev = readl(sg_base + SG_REVISION);
return FIELD_GET(SG_REVISION_MODEL_MASK, rev);
}
unsigned int uniphier_get_soc_revision(void)
{
return __uniphier_get_revision_field(0x1f, 0);
u32 rev = readl(sg_base + SG_REVISION);
return FIELD_GET(SG_REVISION_REV_MASK, rev);
}