Yidi Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85859?usp=email )
Change subject: soc/mediatek: Rename DP related header files ......................................................................
soc/mediatek: Rename DP related header files
Add `_common` postfix to the header files located in common/dp/include/soc/. The patch helps MT8196 managing its own DP register difition and macros in its include/soc folder.
BUG=b:382363408 TEST=emerge-geralt coreboot && emerge-cherry coreboot
Change-Id: I4ebfa2aa0dde759275c9826c605f3285c777f58d Signed-off-by: Yidi Lin yidilin@chromium.org --- R src/soc/mediatek/common/dp/include/soc/dp_intf_common.h R src/soc/mediatek/common/dp/include/soc/dptx_common.h R src/soc/mediatek/common/dp/include/soc/dptx_hal_common.h R src/soc/mediatek/common/dp/include/soc/dptx_reg_common.h A src/soc/mediatek/mt8188/include/soc/dp_intf.h A src/soc/mediatek/mt8188/include/soc/dptx.h A src/soc/mediatek/mt8188/include/soc/dptx_hal.h A src/soc/mediatek/mt8188/include/soc/dptx_reg.h A src/soc/mediatek/mt8195/include/soc/dp_intf.h A src/soc/mediatek/mt8195/include/soc/dptx.h A src/soc/mediatek/mt8195/include/soc/dptx_hal.h A src/soc/mediatek/mt8195/include/soc/dptx_reg.h 12 files changed, 60 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/85859/1
diff --git a/src/soc/mediatek/common/dp/include/soc/dp_intf.h b/src/soc/mediatek/common/dp/include/soc/dp_intf_common.h similarity index 97% rename from src/soc/mediatek/common/dp/include/soc/dp_intf.h rename to src/soc/mediatek/common/dp/include/soc/dp_intf_common.h index 240a7e2..fceeb6d 100644 --- a/src/soc/mediatek/common/dp/include/soc/dp_intf.h +++ b/src/soc/mediatek/common/dp/include/soc/dp_intf_common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef SOC_MEDIATEK_COMMON_DP_DP_INTF_H -#define SOC_MEDIATEK_COMMON_DP_DP_INTF_H +#ifndef SOC_MEDIATEK_COMMON_DP_DP_INTF_COMMON_H +#define SOC_MEDIATEK_COMMON_DP_DP_INTF_COMMON_H
#include <edid.h> #include <types.h> @@ -264,4 +264,4 @@
void dp_intf_config(const struct edid *edid);
-#endif /* SOC_MEDIATEK_COMMON_DP_DP_INTF_H */ +#endif /* SOC_MEDIATEK_COMMON_DP_DP_INTF_COMMON_H */ diff --git a/src/soc/mediatek/common/dp/include/soc/dptx.h b/src/soc/mediatek/common/dp/include/soc/dptx_common.h similarity index 89% rename from src/soc/mediatek/common/dp/include/soc/dptx.h rename to src/soc/mediatek/common/dp/include/soc/dptx_common.h index b473301..99b2ac2 100644 --- a/src/soc/mediatek/common/dp/include/soc/dptx.h +++ b/src/soc/mediatek/common/dp/include/soc/dptx_common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef SOC_MEDIATEK_COMMON_DP_DPTX_H -#define SOC_MEDIATEK_COMMON_DP_DPTX_H +#ifndef SOC_MEDIATEK_COMMON_DP_DPTX_COMMON_H +#define SOC_MEDIATEK_COMMON_DP_DPTX_COMMON_H
#define DPTX_TBC_BUF_READSTARTADRTHRD 0x08 #define ENABLE_DPTX_EF_MODE 0x1 @@ -74,4 +74,4 @@
int mtk_edp_init(struct edid *edid);
-#endif /* SOC_MEDIATEK_COMMON_DP_DPTX_H */ +#endif /* SOC_MEDIATEK_COMMON_DP_DPTX_COMMON_H */ diff --git a/src/soc/mediatek/common/dp/include/soc/dptx_hal.h b/src/soc/mediatek/common/dp/include/soc/dptx_hal_common.h similarity index 95% rename from src/soc/mediatek/common/dp/include/soc/dptx_hal.h rename to src/soc/mediatek/common/dp/include/soc/dptx_hal_common.h index d430b6a..778fe46 100644 --- a/src/soc/mediatek/common/dp/include/soc/dptx_hal.h +++ b/src/soc/mediatek/common/dp/include/soc/dptx_hal_common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef SOC_MEDIATEK_COMMON_DP_DPTX_HAL_H -#define SOC_MEDIATEK_COMMON_DP_DPTX_HAL_H +#ifndef SOC_MEDIATEK_COMMON_DP_DPTX_HAL_COMMON_H +#define SOC_MEDIATEK_COMMON_DP_DPTX_HAL_COMMON_H
#define AUX_CMD_I2C_R_MOT0 0x1 #define AUX_CMD_I2C_R 0x5 @@ -100,4 +100,4 @@ void dptx_hal_set_txrate(struct mtk_dp *mtk_dp, int value); void dptx_hal_analog_power_en(struct mtk_dp *mtk_dp, bool enable);
-#endif /* SOC_MEDIATEK_COMMON_DP_DPTX_HAL_H */ +#endif /* SOC_MEDIATEK_COMMON_DP_DPTX_HAL_COMMON_H */ diff --git a/src/soc/mediatek/common/dp/include/soc/dptx_reg.h b/src/soc/mediatek/common/dp/include/soc/dptx_reg_common.h similarity index 99% rename from src/soc/mediatek/common/dp/include/soc/dptx_reg.h rename to src/soc/mediatek/common/dp/include/soc/dptx_reg_common.h index a385eb8..a79c31f 100644 --- a/src/soc/mediatek/common/dp/include/soc/dptx_reg.h +++ b/src/soc/mediatek/common/dp/include/soc/dptx_reg_common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef SOC_MEDIATEK_COMMON_DP_DPTX_REG_H -#define SOC_MEDIATEK_COMMON_DP_DPTX_REG_H +#ifndef SOC_MEDIATEK_COMMON_DP_DPTX_REG_COMMON_H +#define SOC_MEDIATEK_COMMON_DP_DPTX_REG_COMMON_H
#define TOP_OFFSET 0x2000 #define ENC0_OFFSET 0x3000 @@ -4737,4 +4737,4 @@ #define DPCD_69494 0x69494 #define DPCD_69518 0x69518
-#endif /* SOC_MEDIATEK_COMMON_DP_DPTX_REG_H */ +#endif /* SOC_MEDIATEK_COMMON_DP_DPTX_REG_COMMON_H */ diff --git a/src/soc/mediatek/mt8188/include/soc/dp_intf.h b/src/soc/mediatek/mt8188/include/soc/dp_intf.h new file mode 100644 index 0000000..404174e --- /dev/null +++ b/src/soc/mediatek/mt8188/include/soc/dp_intf.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DP_INTF_H__ +#define __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DP_INTF_H__ + +#include <soc/dp_intf_common.h> + +#endif /* __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DP_INTF_H__ */ diff --git a/src/soc/mediatek/mt8188/include/soc/dptx.h b/src/soc/mediatek/mt8188/include/soc/dptx.h new file mode 100644 index 0000000..8ba95b0 --- /dev/null +++ b/src/soc/mediatek/mt8188/include/soc/dptx.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_H__ +#define __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_H__ + +#include <soc/dptx_common.h> + +#endif /* __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_H__ */ diff --git a/src/soc/mediatek/mt8188/include/soc/dptx_hal.h b/src/soc/mediatek/mt8188/include/soc/dptx_hal.h new file mode 100644 index 0000000..4cf1e62 --- /dev/null +++ b/src/soc/mediatek/mt8188/include/soc/dptx_hal.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_HAL_H__ +#define __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_HAL_H__ + +#include <soc/dptx_hal_common.h> + +#endif /* __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_HAL_H__ */ diff --git a/src/soc/mediatek/mt8188/include/soc/dptx_reg.h b/src/soc/mediatek/mt8188/include/soc/dptx_reg.h new file mode 100644 index 0000000..6b768f6 --- /dev/null +++ b/src/soc/mediatek/mt8188/include/soc/dptx_reg.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_REG_H__ +#define __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_REG_H__ + +#include <soc/dptx_reg_common.h> + +#endif /* __SOC_MEDIATEK_MT8188_INCLUDE_SOC_DPTX_REG_H__ */ diff --git a/src/soc/mediatek/mt8195/include/soc/dp_intf.h b/src/soc/mediatek/mt8195/include/soc/dp_intf.h new file mode 100644 index 0000000..822b5fa --- /dev/null +++ b/src/soc/mediatek/mt8195/include/soc/dp_intf.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DP_INTF_H__ +#define __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DP_INTF_H__ + +#include <soc/dp_intf_common.h> + +#endif /* __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DP_INTF_H__ */ diff --git a/src/soc/mediatek/mt8195/include/soc/dptx.h b/src/soc/mediatek/mt8195/include/soc/dptx.h new file mode 100644 index 0000000..60eb917 --- /dev/null +++ b/src/soc/mediatek/mt8195/include/soc/dptx.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_H__ +#define __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_H__ + +#include <soc/dptx_common.h> + +#endif /* __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_H__ */ diff --git a/src/soc/mediatek/mt8195/include/soc/dptx_hal.h b/src/soc/mediatek/mt8195/include/soc/dptx_hal.h new file mode 100644 index 0000000..1409310 --- /dev/null +++ b/src/soc/mediatek/mt8195/include/soc/dptx_hal.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_HAL_H__ +#define __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_HAL_H__ + +#include <soc/dptx_hal_common.h> + +#endif /* __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_HAL_H__ */ diff --git a/src/soc/mediatek/mt8195/include/soc/dptx_reg.h b/src/soc/mediatek/mt8195/include/soc/dptx_reg.h new file mode 100644 index 0000000..edf9a1a --- /dev/null +++ b/src/soc/mediatek/mt8195/include/soc/dptx_reg.h @@ -0,0 +1,6 @@ +#ifndef __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_REG_H__ +#define __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_REG_H__ + +#include <soc/dptx_reg_common.h> + +#endif /* __SOC_MEDIATEK_MT8195_INCLUDE_SOC_DPTX_REG_H__ */
-
Yidi Lin (Code Review)