From 73f6d057666f55799f48e16f13faf47851fd393c Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Sun, 25 Aug 2019 18:09:59 +0100
Subject: [PATCH] amlogic: Fix prefixes in the thermal driver

No need to have a special SoC-specific prefix.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: I0da543e7d92d56604e79440a98027ffd9a2eaa59
---
 plat/amlogic/common/aml_thermal.c         | 2 +-
 plat/amlogic/common/include/aml_private.h | 2 +-
 plat/amlogic/gxbb/gxbb_bl31_setup.c       | 2 +-
 plat/amlogic/gxl/gxl_bl31_setup.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plat/amlogic/common/aml_thermal.c b/plat/amlogic/common/aml_thermal.c
index 268606cd9..0a57f10f4 100644
--- a/plat/amlogic/common/aml_thermal.c
+++ b/plat/amlogic/common/aml_thermal.c
@@ -13,7 +13,7 @@ static int32_t modules_initialized = -1;
 /*******************************************************************************
  * Unknown commands related to something thermal-related
  ******************************************************************************/
-void gxbb_thermal_unknown(void)
+void aml_thermal_unknown(void)
 {
 	uint16_t ret;
 
diff --git a/plat/amlogic/common/include/aml_private.h b/plat/amlogic/common/include/aml_private.h
index 3d7e6ebda..9670c8783 100644
--- a/plat/amlogic/common/include/aml_private.h
+++ b/plat/amlogic/common/include/aml_private.h
@@ -33,7 +33,7 @@ void scpi_unknown_thermal(uint32_t arg0, uint32_t arg1,
 void scpi_upload_scp_fw(uintptr_t addr, size_t size, int send);
 
 /* Peripherals */
-void gxbb_thermal_unknown(void);
+void aml_thermal_unknown(void);
 uint64_t aml_efuse_read(void *dst, uint32_t offset, uint32_t size);
 uint64_t aml_efuse_user_max(void);
 
diff --git a/plat/amlogic/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c
index c474d6967..cff29b392 100644
--- a/plat/amlogic/gxbb/gxbb_bl31_setup.c
+++ b/plat/amlogic/gxbb/gxbb_bl31_setup.c
@@ -142,5 +142,5 @@ void bl31_platform_setup(void)
 	gicv2_pcpu_distif_init();
 	gicv2_cpuif_enable();
 
-	gxbb_thermal_unknown();
+	aml_thermal_unknown();
 }
diff --git a/plat/amlogic/gxl/gxl_bl31_setup.c b/plat/amlogic/gxl/gxl_bl31_setup.c
index d44b9aaa3..fbfb76a0a 100644
--- a/plat/amlogic/gxl/gxl_bl31_setup.c
+++ b/plat/amlogic/gxl/gxl_bl31_setup.c
@@ -158,5 +158,5 @@ void bl31_platform_setup(void)
 
 	gxl_scp_boot();
 
-	gxbb_thermal_unknown();
+	aml_thermal_unknown();
 }
-- 
GitLab