amlogic: Fix prefixes in the efuse driver
authorCarlo Caione <ccaione@baylibre.com>
Sun, 25 Aug 2019 16:26:27 +0000 (17:26 +0100)
committerCarlo Caione <ccaione@baylibre.com>
Thu, 5 Sep 2019 09:39:30 +0000 (10:39 +0100)
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 <ccaione@baylibre.com>
Change-Id: I97691b0bbd55170d8216d301a3fc04feb8c2af2e

plat/amlogic/common/aml_efuse.c
plat/amlogic/common/aml_sip_svc.c
plat/amlogic/common/include/aml_private.h

index 41248021312f4cd18677d0b4e3e98fb5867f9291..9ab4ba297a3e8e772f5ec4b4b4e418cf7f055cfa 100644 (file)
@@ -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;
 }
index a212e6324c7d10a04e2af90f40d1b1fa3f331551..b358997840da991a97995fc6adfdd5c7beca72ce 100644 (file)
@@ -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);
index c06004f8dbace62605e264bc7750b48274253de8..952b5c43c57180b286ce13e5f2eb06f332f3eae8 100644 (file)
@@ -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 */