From cd94cc4013f1da68d03bb40d61ecfcbc9305bbd9 Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Sat, 24 Aug 2019 17:48:11 +0100
Subject: [PATCH] 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 <ccaione@baylibre.com>
Change-Id: Id3f0073ff1f0b9ddbe964f80303323ee4a2f27b0
---
.../gxbb_thermal.c => common/aml_thermal.c} | 0
plat/amlogic/gxbb/platform.mk | 2 +-
plat/amlogic/gxl/gxl_thermal.c | 27 -------------------
plat/amlogic/gxl/platform.mk | 2 +-
4 files changed, 2 insertions(+), 29 deletions(-)
rename plat/amlogic/{gxbb/gxbb_thermal.c => common/aml_thermal.c} (100%)
delete mode 100644 plat/amlogic/gxl/gxl_thermal.c
diff --git a/plat/amlogic/gxbb/gxbb_thermal.c b/plat/amlogic/common/aml_thermal.c
similarity index 100%
rename from plat/amlogic/gxbb/gxbb_thermal.c
rename to plat/amlogic/common/aml_thermal.c
diff --git a/plat/amlogic/gxbb/platform.mk b/plat/amlogic/gxbb/platform.mk
index 7da6468df..4c3df1b71 100644
--- 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
index 268606cd9..000000000
--- 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 b4f2a90f7..11687b5bf 100644
--- 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}
--
GitLab