Skip to content

Commit b28be59

Browse files
ckhu-mediatekChun-Kuang Hu
authored andcommitted
phy: mediatek: Move mtk_hdmi_phy driver into drivers/phy/mediatek folder
mtk_hdmi_phy is currently placed inside mediatek drm driver, but it's more suitable to place a phy driver into phy driver folder, so move mtk_hdmi_phy driver into phy driver folder. Signed-off-by: CK Hu <ck.hu@mediatek.com> Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> Acked-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Tested-by: Frank Wunderlich <frank-w@public-files.de>
1 parent a481bf2 commit b28be59

8 files changed

Lines changed: 15 additions & 16 deletions

File tree

drivers/gpu/drm/mediatek/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,3 @@ config DRM_MEDIATEK_HDMI
2727
select PHY_MTK_HDMI
2828
help
2929
DRM/KMS HDMI driver for Mediatek SoCs
30-
31-
config PHY_MTK_HDMI
32-
tristate "MediaTek HDMI-PHY Driver"
33-
depends on ARCH_MEDIATEK && OF
34-
select GENERIC_PHY
35-
help
36-
Support HDMI PHY for Mediatek SoCs.

drivers/gpu/drm/mediatek/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,3 @@ mediatek-drm-hdmi-objs := mtk_cec.o \
2222
mtk_hdmi_ddc.o
2323

2424
obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
25-
26-
phy-mtk-hdmi-drv-objs := mtk_hdmi_phy.o \
27-
mtk_mt2701_hdmi_phy.o \
28-
mtk_mt8173_hdmi_phy.o
29-
30-
obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o

drivers/phy/mediatek/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,10 @@ config PHY_MTK_XSPHY
3535
Enable this to support the SuperSpeedPlus XS-PHY transceiver for
3636
USB3.1 GEN2 controllers on MediaTek chips. The driver supports
3737
multiple USB2.0, USB3.1 GEN2 ports.
38+
39+
config PHY_MTK_HDMI
40+
tristate "MediaTek HDMI-PHY Driver"
41+
depends on ARCH_MEDIATEK && OF
42+
select GENERIC_PHY
43+
help
44+
Support HDMI PHY for Mediatek SoCs.

drivers/phy/mediatek/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@
66
obj-$(CONFIG_PHY_MTK_TPHY) += phy-mtk-tphy.o
77
obj-$(CONFIG_PHY_MTK_UFS) += phy-mtk-ufs.o
88
obj-$(CONFIG_PHY_MTK_XSPHY) += phy-mtk-xsphy.o
9+
10+
phy-mtk-hdmi-drv-y := phy-mtk-hdmi.o
11+
phy-mtk-hdmi-drv-y += phy-mtk-hdmi-mt2701.o
12+
phy-mtk-hdmi-drv-y += phy-mtk-hdmi-mt8173.o
13+
obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o

drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c renamed to drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Author: Chunhui Dai <chunhui.dai@mediatek.com>
55
*/
66

7-
#include "mtk_hdmi_phy.h"
7+
#include "phy-mtk-hdmi.h"
88

99
#define HDMI_CON0 0x00
1010
#define RG_HDMITX_DRV_IBIAS 0

drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c renamed to drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Author: Jie Qiu <jie.qiu@mediatek.com>
55
*/
66

7-
#include "mtk_hdmi_phy.h"
7+
#include "phy-mtk-hdmi.h"
88

99
#define HDMI_CON0 0x00
1010
#define RG_HDMITX_PLL_EN BIT(31)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Author: Jie Qiu <jie.qiu@mediatek.com>
55
*/
66

7-
#include "mtk_hdmi_phy.h"
7+
#include "phy-mtk-hdmi.h"
88

99
static int mtk_hdmi_phy_power_on(struct phy *phy);
1010
static int mtk_hdmi_phy_power_off(struct phy *phy);

0 commit comments

Comments
 (0)