amlogic: Move thermal code to common directory

As for most of the Amlogic code, this is common between the Amlogic
SoCs. Move the code to the common directory.

Signed-off-by: Carlo Caione <[email protected]>
Change-Id: Id3f0073ff1f0b9ddbe964f80303323ee4a2f27b0

diff --git a/plat/amlogic/common/aml_thermal.c b/plat/amlogic/common/aml_thermal.c
new file mode 100644 (file)
index 0000000..268606c
--- /dev/null
+++ b/plat/amlogic/common/aml_thermal.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdint.h>
+
+#include "aml_private.h"
+
+static int32_t modules_initialized = -1;
+
+/*******************************************************************************
+ * Unknown commands related to something thermal-related
+ ******************************************************************************/
+void gxbb_thermal_unknown(void)
+{
+       uint16_t ret;
+
+       if (modules_initialized == -1) {
+               scpi_efuse_read(&ret, 0, 2);
+               modules_initialized = ret;
+       }
+
+       scpi_unknown_thermal(10, 2,  /* thermal */
+                            13, 1); /* thermalver */
+}

diff --git a/plat/amlogic/gxbb/gxbb_thermal.c b/plat/amlogic/gxbb/gxbb_thermal.c
deleted file mode 100644 (file)
index 268606c..0000000
--- a/plat/amlogic/gxbb/gxbb_thermal.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <stdint.h>
-
-#include "aml_private.h"
-
-static int32_t modules_initialized = -1;
-
-/*******************************************************************************
- * Unknown commands related to something thermal-related
- ******************************************************************************/
-void gxbb_thermal_unknown(void)
-{
-       uint16_t ret;
-
-       if (modules_initialized == -1) {
-               scpi_efuse_read(&ret, 0, 2);
-               modules_initialized = ret;
-       }
-
-       scpi_unknown_thermal(10, 2,  /* thermal */
-                            13, 1); /* thermalver */
-}

diff --git a/plat/amlogic/gxbb/platform.mk b/plat/amlogic/gxbb/platform.mk
index 7da6468df49421c34fb8de68e0aec7206cc71076..4c3df1b71147a0934f7cee8258772afdba082807 100644 (file)
--- a/plat/amlogic/gxbb/platform.mk
+++ b/plat/amlogic/gxbb/platform.mk
@@ -33,7 +33,7 @@ BL31_SOURCES          +=      lib/cpus/aarch64/cortex_a53.S           \
                                ${AML_PLAT_SOC}/gxbb_pm.c               \
                                ${AML_PLAT_COMMON}/aml_scpi.c           \
                                ${AML_PLAT_SOC}/gxbb_sip_svc.c          \
-                               ${AML_PLAT_SOC}/gxbb_thermal.c          \
+                               ${AML_PLAT_COMMON}/aml_thermal.c        \
                                ${GIC_SOURCES}
 
 # Tune compiler for Cortex-A53

diff --git a/plat/amlogic/gxl/gxl_thermal.c b/plat/amlogic/gxl/gxl_thermal.c
deleted file mode 100644 (file)
index 268606c..0000000
--- a/plat/amlogic/gxl/gxl_thermal.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <stdint.h>
-
-#include "aml_private.h"
-
-static int32_t modules_initialized = -1;
-
-/*******************************************************************************
- * Unknown commands related to something thermal-related
- ******************************************************************************/
-void gxbb_thermal_unknown(void)
-{
-       uint16_t ret;
-
-       if (modules_initialized == -1) {
-               scpi_efuse_read(&ret, 0, 2);
-               modules_initialized = ret;
-       }
-
-       scpi_unknown_thermal(10, 2,  /* thermal */
-                            13, 1); /* thermalver */
-}

diff --git a/plat/amlogic/gxl/platform.mk b/plat/amlogic/gxl/platform.mk
index b4f2a90f7199b7111676cb9ccc2104728a2b24d1..11687b5bfc584cfa8e4bfd0c343ae9bd39209d04 100644 (file)
--- a/plat/amlogic/gxl/platform.mk
+++ b/plat/amlogic/gxl/platform.mk
@@ -36,7 +36,7 @@ BL31_SOURCES          +=      lib/cpus/aarch64/cortex_a53.S           \
                                ${AML_PLAT_SOC}/gxl_pm.c                \
                                ${AML_PLAT_COMMON}/aml_scpi.c           \
                                ${AML_PLAT_SOC}/gxl_sip_svc.c           \
-                               ${AML_PLAT_SOC}/gxl_thermal.c           \
+                               ${AML_PLAT_COMMON}/aml_thermal.c        \
                                drivers/amlogic/crypto/sha_dma.c        \
                                ${GIC_SOURCES}