From 93c795ae9ca57ae5c92031f6beb1286cf64cc865 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sun, 25 Aug 2019 17:26:27 +0100 Subject: [PATCH] amlogic: Fix prefixes in the efuse driver The efuse driver is hardcoding the GXBB prefix. No need to do that since the driver is shared between multiple SoCs. Signed-off-by: Carlo Caione Change-Id: I97691b0bbd55170d8216d301a3fc04feb8c2af2e --- plat/amlogic/common/aml_efuse.c | 4 ++-- plat/amlogic/common/aml_sip_svc.c | 4 ++-- plat/amlogic/common/include/aml_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plat/amlogic/common/aml_efuse.c b/plat/amlogic/common/aml_efuse.c index 412480213..9ab4ba297 100644 --- a/plat/amlogic/common/aml_efuse.c +++ b/plat/amlogic/common/aml_efuse.c @@ -11,7 +11,7 @@ #define EFUSE_BASE 0x140 #define EFUSE_SIZE 0xC0 -uint64_t gxbb_efuse_read(void *dst, uint32_t offset, uint32_t size) +uint64_t aml_efuse_read(void *dst, uint32_t offset, uint32_t size) { if ((uint64_t)(offset + size) > (uint64_t)EFUSE_SIZE) return 0; @@ -19,7 +19,7 @@ uint64_t gxbb_efuse_read(void *dst, uint32_t offset, uint32_t size) return scpi_efuse_read(dst, offset + EFUSE_BASE, size); } -uint64_t gxbb_efuse_user_max(void) +uint64_t aml_efuse_user_max(void) { return EFUSE_SIZE; } diff --git a/plat/amlogic/common/aml_sip_svc.c b/plat/amlogic/common/aml_sip_svc.c index a212e6324..b35899784 100644 --- a/plat/amlogic/common/aml_sip_svc.c +++ b/plat/amlogic/common/aml_sip_svc.c @@ -32,12 +32,12 @@ static uintptr_t gxbb_sip_handler(uint32_t smc_fid, case GXBB_SM_EFUSE_READ: { void *dst = (void *)GXBB_SHARE_MEM_OUTPUT_BASE; - uint64_t ret = gxbb_efuse_read(dst, (uint32_t)x1, x2); + uint64_t ret = aml_efuse_read(dst, (uint32_t)x1, x2); SMC_RET1(handle, ret); } case GXBB_SM_EFUSE_USER_MAX: - SMC_RET1(handle, gxbb_efuse_user_max()); + SMC_RET1(handle, aml_efuse_user_max()); case GXBB_SM_JTAG_ON: scpi_jtag_set_state(GXBB_JTAG_STATE_ON, x1); diff --git a/plat/amlogic/common/include/aml_private.h b/plat/amlogic/common/include/aml_private.h index c06004f8d..952b5c43c 100644 --- a/plat/amlogic/common/include/aml_private.h +++ b/plat/amlogic/common/include/aml_private.h @@ -34,7 +34,7 @@ void scpi_upload_scp_fw(uintptr_t addr, size_t size, int send); /* Peripherals */ void gxbb_thermal_unknown(void); -uint64_t gxbb_efuse_read(void *dst, uint32_t offset, uint32_t size); -uint64_t gxbb_efuse_user_max(void); +uint64_t aml_efuse_read(void *dst, uint32_t offset, uint32_t size); +uint64_t aml_efuse_user_max(void); #endif /* GXBB_PRIVATE_H */