diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-09-19 08:48:46 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-24 08:54:04 +0200 |
| commit | f9fa41641acd5a1659e968f6a8884e74d91edc56 (patch) | |
| tree | f6a2062e5e1a09c730b3184c526948215aa4becc /arch | |
| parent | 672cf2b44d31e2f24aaad243b0969d8806055742 (diff) | |
| download | barebox-f9fa41641acd5a1659e968f6a8884e74d91edc56.tar.gz barebox-f9fa41641acd5a1659e968f6a8884e74d91edc56.tar.xz | |
ARM: i.MX: boot: Make use of FIELD_GET() in imx51_get_boot_source()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/boot.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index f1fc40479d..830ea08f30 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -167,10 +167,10 @@ void imx27_boot_save_loc(void) imx_boot_save_loc(imx27_get_boot_source); } -#define IMX51_SRC_SBMR 0x4 -#define IMX51_SBMR_BT_MEM_TYPE_SHIFT 7 -#define IMX51_SBMR_BT_MEM_CTL_SHIFT 0 -#define IMX51_SBMR_BMOD_SHIFT 14 +#define IMX51_SRC_SBMR 0x4 +#define IMX51_SBMR_BT_MEM_TYPE GENMASK(8, 7) +#define IMX51_SBMR_BT_MEM_CTL GENMASK(1, 0) +#define IMX51_SBMR_BMOD GENMASK(15, 14) void imx51_get_boot_source(enum bootsource *src, int *instance) { @@ -180,12 +180,12 @@ void imx51_get_boot_source(enum bootsource *src, int *instance) reg = readl(src_base + IMX51_SRC_SBMR); - switch ((reg >> IMX51_SBMR_BMOD_SHIFT) & 0x3) { + switch (FIELD_GET(IMX51_SBMR_BMOD, reg)) { case 0: case 2: /* internal boot */ - ctrl = (reg >> IMX51_SBMR_BT_MEM_CTL_SHIFT) & 0x3; - type = (reg >> IMX51_SBMR_BT_MEM_TYPE_SHIFT) & 0x3; + ctrl = FIELD_GET(IMX51_SBMR_BT_MEM_CTL, reg); + type = FIELD_GET(IMX51_SBMR_BT_MEM_TYPE, reg); *src = locations[ctrl][type]; break; |