From 2bb1388d68c00c8f88a469276365832c02d4483b Mon Sep 17 00:00:00 2001 From: Jarried Lin Date: Tue, 20 Aug 2024 17:58:00 +0800 Subject: [PATCH] soc/mediatek/common: Move GPIO definition to the common directory To reduce duplicate gpio_base.h in each SoC folder, move gpio_base.h to mediatek/common folder. TEST=Build pass BUG=b:317009620 Change-Id: I815df8a3083cf04b821165ec834ca98ee71a0c78 Signed-off-by: Jarried Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/83988 Tested-by: build bot (Jenkins) Reviewed-by: Yidi Lin Reviewed-by: Yu-Ping Wu --- .../include/soc/gpio_base.h | 4 ++-- .../mediatek/mt8173/include/soc/gpio_base.h | 11 --------- .../mediatek/mt8183/include/soc/gpio_base.h | 18 -------------- .../mediatek/mt8186/include/soc/gpio_base.h | 24 ------------------- .../mediatek/mt8188/include/soc/gpio_base.h | 24 ------------------- .../mediatek/mt8192/include/soc/gpio_base.h | 19 --------------- 6 files changed, 2 insertions(+), 98 deletions(-) rename src/soc/mediatek/{mt8195 => common}/include/soc/gpio_base.h (73%) delete mode 100644 src/soc/mediatek/mt8173/include/soc/gpio_base.h delete mode 100644 src/soc/mediatek/mt8183/include/soc/gpio_base.h delete mode 100644 src/soc/mediatek/mt8186/include/soc/gpio_base.h delete mode 100644 src/soc/mediatek/mt8188/include/soc/gpio_base.h delete mode 100644 src/soc/mediatek/mt8192/include/soc/gpio_base.h diff --git a/src/soc/mediatek/mt8195/include/soc/gpio_base.h b/src/soc/mediatek/common/include/soc/gpio_base.h similarity index 73% rename from src/soc/mediatek/mt8195/include/soc/gpio_base.h rename to src/soc/mediatek/common/include/soc/gpio_base.h index 164b99b50f..558e088a56 100644 --- a/src/soc/mediatek/mt8195/include/soc/gpio_base.h +++ b/src/soc/mediatek/common/include/soc/gpio_base.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only OR MIT */ -#ifndef SOC_MEDIATEK_MT8195_GPIO_BASE_H -#define SOC_MEDIATEK_MT8195_GPIO_BASE_H +#ifndef SOC_MEDIATEK_COMMON_GPIO_BASE_H +#define SOC_MEDIATEK_COMMON_GPIO_BASE_H #include diff --git a/src/soc/mediatek/mt8173/include/soc/gpio_base.h b/src/soc/mediatek/mt8173/include/soc/gpio_base.h deleted file mode 100644 index a26437a49a..0000000000 --- a/src/soc/mediatek/mt8173/include/soc/gpio_base.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef SOC_MEDIATEK_MT8173_GPIO_BASE_H -#define SOC_MEDIATEK_MT8173_GPIO_BASE_H - -#include - -typedef struct { - u32 id; -} gpio_t; - -#endif diff --git a/src/soc/mediatek/mt8183/include/soc/gpio_base.h b/src/soc/mediatek/mt8183/include/soc/gpio_base.h deleted file mode 100644 index d9b0718d4b..0000000000 --- a/src/soc/mediatek/mt8183/include/soc/gpio_base.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef SOC_MEDIATEK_MT8183_GPIO_BASE_H -#define SOC_MEDIATEK_MT8183_GPIO_BASE_H - -#include - -typedef union { - u32 raw; - struct { - u32 id : 8; - u32 flag : 3; - u32 bit : 5; - u32 base : 8; - u32 offset : 8; - }; -} gpio_t; - -#endif diff --git a/src/soc/mediatek/mt8186/include/soc/gpio_base.h b/src/soc/mediatek/mt8186/include/soc/gpio_base.h deleted file mode 100644 index 7f6480a0f1..0000000000 --- a/src/soc/mediatek/mt8186/include/soc/gpio_base.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* - * This file is created based on MT8186 Functional Specification - * Chapter number: 5.1 - */ - -#ifndef SOC_MEDIATEK_MT8186_GPIO_BASE_H -#define SOC_MEDIATEK_MT8186_GPIO_BASE_H - -#include - -typedef union { - u32 raw; - struct { - u32 id : 8; - u32 flag : 3; - u32 bit : 5; - u32 base : 8; - u32 offset : 8; - }; -} gpio_t; - -#endif diff --git a/src/soc/mediatek/mt8188/include/soc/gpio_base.h b/src/soc/mediatek/mt8188/include/soc/gpio_base.h deleted file mode 100644 index dabff3593f..0000000000 --- a/src/soc/mediatek/mt8188/include/soc/gpio_base.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ - -/* - * This file is created based on MT8188 Functional Specification - * Chapter number: 5.2 - */ - -#ifndef SOC_MEDIATEK_MT8188_GPIO_BASE_H -#define SOC_MEDIATEK_MT8188_GPIO_BASE_H - -#include - -typedef union { - u32 raw; - struct { - u32 id : 8; - u32 flag : 3; - u32 bit : 5; - u32 base : 8; - u32 offset : 8; - }; -} gpio_t; - -#endif diff --git a/src/soc/mediatek/mt8192/include/soc/gpio_base.h b/src/soc/mediatek/mt8192/include/soc/gpio_base.h deleted file mode 100644 index 61e1318824..0000000000 --- a/src/soc/mediatek/mt8192/include/soc/gpio_base.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef SOC_MEDIATEK_MT8192_GPIO_BASE_H -#define SOC_MEDIATEK_MT8192_GPIO_BASE_H - -#include - -typedef union { - u32 raw; - struct { - u32 id : 8; - u32 flag : 3; - u32 bit : 5; - u32 base : 8; - u32 offset : 8; - }; -} gpio_t; - -#endif