Merge "uniphier: prepare uniphier_soc_info() for next SoC" into integration

This commit is contained in:
Sandrine Bailleux 2020-02-26 10:02:36 +00:00 committed by TrustedFirmware Code Review
commit 8d48810f56

View File

@ -4,18 +4,25 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <common/bl_common.h>
#include <lib/mmio.h>
#include "uniphier.h"
#define UNIPHIER_REVISION 0x5f800000
#define UNIPHIER_REVISION 0x5f800000UL
#define UNIPHIER_REVISION_NEW 0x1f800000UL
static unsigned int uniphier_get_revision_field(unsigned int mask,
unsigned int shift)
{
uint32_t revision = mmio_read_32(UNIPHIER_REVISION);
uintptr_t reg;
return (revision >> shift) & mask;
if (BL_CODE_BASE >= 0x80000000UL)
reg = UNIPHIER_REVISION;
else
reg = UNIPHIER_REVISION_NEW;
return (mmio_read_32(reg) >> shift) & mask;
}
unsigned int uniphier_get_soc_type(void)