From a8c9674c420f164024cc3e2f7b310ca336d2b5e0 Mon Sep 17 00:00:00 2001
From: Rex-BC Chen <rex-bc.chen@mediatek.com>
Date: Mon, 25 Jul 2022 16:02:21 +0800
Subject: [PATCH] soc/mediatek: Move struct mtk_auxadc_regs to auxadc_common.h

The AUXADC register definitions are the same for all MediaTek SoCs, so
we move struct mtk_auxadc_regs to auxadc_common.h.

TEST=build pass.
BUG=b:233720142

Signed-off-by: Bo-Chen Chen <rex-bc.chen@mediatek.com>
Change-Id: I48978a93137a7de42f8ea2873be3130cb8f534f3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66123
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
---
 src/soc/mediatek/common/include/soc/auxadc_common.h | 11 +++++++++++
 src/soc/mediatek/mt8183/include/soc/auxadc.h        | 11 -----------
 src/soc/mediatek/mt8186/include/soc/auxadc.h        | 11 -----------
 src/soc/mediatek/mt8192/include/soc/auxadc.h        | 11 -----------
 src/soc/mediatek/mt8195/include/soc/auxadc.h        | 11 -----------
 5 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/src/soc/mediatek/common/include/soc/auxadc_common.h b/src/soc/mediatek/common/include/soc/auxadc_common.h
index de2408fef1..b59af5c63a 100644
--- a/src/soc/mediatek/common/include/soc/auxadc_common.h
+++ b/src/soc/mediatek/common/include/soc/auxadc_common.h
@@ -3,6 +3,17 @@
 #ifndef _MTK_ADC_COMMON_H
 #define _MTK_ADC_COMMON_H
 
+struct mtk_auxadc_regs {
+	uint32_t con0;
+	uint32_t con1;
+	uint32_t con1_set;
+	uint32_t con1_clr;
+	uint32_t con2;
+	uint32_t data[16];
+	uint32_t reserved[16];
+	uint32_t misc;
+};
+
 /* Return voltage in uVolt */
 unsigned int auxadc_get_voltage_uv(unsigned int channel);
 #endif
diff --git a/src/soc/mediatek/mt8183/include/soc/auxadc.h b/src/soc/mediatek/mt8183/include/soc/auxadc.h
index 0e07de073c..326261af32 100644
--- a/src/soc/mediatek/mt8183/include/soc/auxadc.h
+++ b/src/soc/mediatek/mt8183/include/soc/auxadc.h
@@ -7,17 +7,6 @@
 #include <soc/infracfg.h>
 #include <stdint.h>
 
-typedef struct mtk_auxadc_regs {
-	uint32_t con0;
-	uint32_t con1;
-	uint32_t con1_set;
-	uint32_t con1_clr;
-	uint32_t con2;
-	uint32_t data[16];
-	uint32_t reserved[16];
-	uint32_t misc;
-} mtk_auxadc_regs;
-
 static struct mt8183_infracfg_regs *const mtk_infracfg = mt8183_infracfg;
 
 #endif
diff --git a/src/soc/mediatek/mt8186/include/soc/auxadc.h b/src/soc/mediatek/mt8186/include/soc/auxadc.h
index 13a52e3f9d..d5f41a6b7c 100644
--- a/src/soc/mediatek/mt8186/include/soc/auxadc.h
+++ b/src/soc/mediatek/mt8186/include/soc/auxadc.h
@@ -12,17 +12,6 @@
 #include <soc/infracfg.h>
 #include <stdint.h>
 
-typedef struct mtk_auxadc_regs {
-	uint32_t con0;
-	uint32_t con1;
-	uint32_t con1_set;
-	uint32_t con1_clr;
-	uint32_t con2;
-	uint32_t data[16];
-	uint32_t reserved[16];
-	uint32_t misc;
-} mtk_auxadc_regs;
-
 static struct mt8186_infracfg_ao_regs *const mtk_infracfg = mt8186_infracfg_ao;
 
 #endif
diff --git a/src/soc/mediatek/mt8192/include/soc/auxadc.h b/src/soc/mediatek/mt8192/include/soc/auxadc.h
index 3289a22ccf..94702bd141 100644
--- a/src/soc/mediatek/mt8192/include/soc/auxadc.h
+++ b/src/soc/mediatek/mt8192/include/soc/auxadc.h
@@ -7,17 +7,6 @@
 #include <soc/infracfg.h>
 #include <stdint.h>
 
-typedef struct mtk_auxadc_regs {
-	uint32_t con0;
-	uint32_t con1;
-	uint32_t con1_set;
-	uint32_t con1_clr;
-	uint32_t con2;
-	uint32_t data[16];
-	uint32_t reserved[16];
-	uint32_t misc;
-} mtk_auxadc_regs;
-
 static struct mt8192_infracfg_regs *const mtk_infracfg = mt8192_infracfg;
 
 #endif
diff --git a/src/soc/mediatek/mt8195/include/soc/auxadc.h b/src/soc/mediatek/mt8195/include/soc/auxadc.h
index 63c8c7cd1c..6e79ee303b 100644
--- a/src/soc/mediatek/mt8195/include/soc/auxadc.h
+++ b/src/soc/mediatek/mt8195/include/soc/auxadc.h
@@ -7,17 +7,6 @@
 #include <soc/infracfg.h>
 #include <stdint.h>
 
-typedef struct mtk_auxadc_regs {
-	uint32_t con0;
-	uint32_t con1;
-	uint32_t con1_set;
-	uint32_t con1_clr;
-	uint32_t con2;
-	uint32_t data[16];
-	uint32_t reserved[16];
-	uint32_t misc;
-} mtk_auxadc_regs;
-
 static struct mt8195_infracfg_ao_regs *const mtk_infracfg = mt8195_infracfg_ao;
 
 #endif