diff mbox series

[v5,3/4] phy: mediatek: Move mtk_hdmi_phy driver into drivers/phy/mediatek folder

Message ID 20200823014830.15962-4-chunkuang.hu@kernel.org (mailing list archive)
State New, archived
Headers show
Series Move Mediatek HDMI PHY driver from DRM folder to PHY folder | expand

Commit Message

Chun-Kuang Hu Aug. 23, 2020, 1:48 a.m. UTC 
From: CK Hu <ck.hu@mediatek.com>

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>
---
 drivers/gpu/drm/mediatek/Kconfig                           | 7 -------
 drivers/gpu/drm/mediatek/Makefile                          | 6 ------
 drivers/phy/mediatek/Kconfig                               | 7 +++++++
 drivers/phy/mediatek/Makefile                              | 5 +++++
 .../mediatek/phy-mtk-hdmi-mt2701.c}                        | 2 +-
 .../mediatek/phy-mtk-hdmi-mt8173.c}                        | 2 +-
 .../mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c}         | 2 +-
 .../mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h}         | 0
 8 files changed, 15 insertions(+), 16 deletions(-)
 rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%)
 rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%)
 rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (99%)
 rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (100%)

Comments

Chun-Kuang Hu Aug. 30, 2020, 11:03 p.m. UTC | #1 
Hi, Chunfeng & Kishon:

How do you feel about this patch?

Regards,
Chun-Kuang.

Chun-Kuang Hu <chunkuang.hu@kernel.org> 於 2020年8月23日 週日 上午9:48寫道：
>
> From: CK Hu <ck.hu@mediatek.com>
>
> 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>
> ---
>  drivers/gpu/drm/mediatek/Kconfig                           | 7 -------
>  drivers/gpu/drm/mediatek/Makefile                          | 6 ------
>  drivers/phy/mediatek/Kconfig                               | 7 +++++++
>  drivers/phy/mediatek/Makefile                              | 5 +++++
>  .../mediatek/phy-mtk-hdmi-mt2701.c}                        | 2 +-
>  .../mediatek/phy-mtk-hdmi-mt8173.c}                        | 2 +-
>  .../mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c}         | 2 +-
>  .../mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h}         | 0
>  8 files changed, 15 insertions(+), 16 deletions(-)
>  rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%)
>  rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%)
>  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (99%)
>  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (100%)
>
> diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> index 6363f2c1cdbc..65cd03a4be29 100644
> --- a/drivers/gpu/drm/mediatek/Kconfig
> +++ b/drivers/gpu/drm/mediatek/Kconfig
> @@ -27,10 +27,3 @@ config DRM_MEDIATEK_HDMI
>         select PHY_MTK_HDMI
>         help
>           DRM/KMS HDMI driver for Mediatek SoCs
> -
> -config PHY_MTK_HDMI
> -       tristate "MediaTek HDMI-PHY Driver"
> -       depends on ARCH_MEDIATEK && OF
> -       select GENERIC_PHY
> -       help
> -         Support HDMI PHY for Mediatek SoCs.
> diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
> index fcbef23aa6ce..77b0fd86063d 100644
> --- a/drivers/gpu/drm/mediatek/Makefile
> +++ b/drivers/gpu/drm/mediatek/Makefile
> @@ -22,9 +22,3 @@ mediatek-drm-hdmi-objs := mtk_cec.o \
>                           mtk_hdmi_ddc.o
>
>  obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
> -
> -phy-mtk-hdmi-drv-objs := mtk_hdmi_phy.o \
> -                        mtk_mt2701_hdmi_phy.o \
> -                        mtk_mt8173_hdmi_phy.o
> -
> -obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o
> diff --git a/drivers/phy/mediatek/Kconfig b/drivers/phy/mediatek/Kconfig
> index dee757c957f2..50c5e9306e19 100644
> --- a/drivers/phy/mediatek/Kconfig
> +++ b/drivers/phy/mediatek/Kconfig
> @@ -35,3 +35,10 @@ config PHY_MTK_XSPHY
>           Enable this to support the SuperSpeedPlus XS-PHY transceiver for
>           USB3.1 GEN2 controllers on MediaTek chips. The driver supports
>           multiple USB2.0, USB3.1 GEN2 ports.
> +
> +config PHY_MTK_HDMI
> +       tristate "MediaTek HDMI-PHY Driver"
> +       depends on ARCH_MEDIATEK && OF
> +       select GENERIC_PHY
> +       help
> +         Support HDMI PHY for Mediatek SoCs.
> diff --git a/drivers/phy/mediatek/Makefile b/drivers/phy/mediatek/Makefile
> index 08a8e6a97b1e..6325e38709ed 100644
> --- a/drivers/phy/mediatek/Makefile
> +++ b/drivers/phy/mediatek/Makefile
> @@ -6,3 +6,8 @@
>  obj-$(CONFIG_PHY_MTK_TPHY)             += phy-mtk-tphy.o
>  obj-$(CONFIG_PHY_MTK_UFS)              += phy-mtk-ufs.o
>  obj-$(CONFIG_PHY_MTK_XSPHY)            += phy-mtk-xsphy.o
> +
> +phy-mtk-hdmi-drv-y                     := phy-mtk-hdmi.o
> +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt2701.o
> +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt8173.o
> +obj-$(CONFIG_PHY_MTK_HDMI)             += phy-mtk-hdmi-drv.o
> diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> similarity index 99%
> rename from drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> rename to drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> index 99fe05cd3598..a6cb1dea3d0c 100644
> --- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> @@ -4,7 +4,7 @@
>   * Author: Chunhui Dai <chunhui.dai@mediatek.com>
>   */
>
> -#include "mtk_hdmi_phy.h"
> +#include "phy-mtk-hdmi.h"
>
>  #define HDMI_CON0      0x00
>  #define RG_HDMITX_DRV_IBIAS            0
> diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> similarity index 99%
> rename from drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> rename to drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> index 827b93786fac..6cdfdf5a698a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> @@ -4,7 +4,7 @@
>   * Author: Jie Qiu <jie.qiu@mediatek.com>
>   */
>
> -#include "mtk_hdmi_phy.h"
> +#include "phy-mtk-hdmi.h"
>
>  #define HDMI_CON0              0x00
>  #define RG_HDMITX_PLL_EN               BIT(31)
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
> similarity index 99%
> rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> rename to drivers/phy/mediatek/phy-mtk-hdmi.c
> index fe022acddbef..8fc83f01a720 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
> @@ -4,7 +4,7 @@
>   * Author: Jie Qiu <jie.qiu@mediatek.com>
>   */
>
> -#include "mtk_hdmi_phy.h"
> +#include "phy-mtk-hdmi.h"
>
>  static int mtk_hdmi_phy_power_on(struct phy *phy);
>  static int mtk_hdmi_phy_power_off(struct phy *phy);
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/phy/mediatek/phy-mtk-hdmi.h
> similarity index 100%
> rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.h
> rename to drivers/phy/mediatek/phy-mtk-hdmi.h
> --
> 2.17.1
>
Chunfeng Yun (云春峰) Aug. 31, 2020, 1:46 a.m. UTC | #2 
On Mon, 2020-08-31 at 07:03 +0800, Chun-Kuang Hu wrote:
> Hi, Chunfeng & Kishon:
> 
> How do you feel about this patch?
It's fine to me, 

Reviewed-by: Chunfeng Yun <chunfeng.yun@mediatek.com>

Thanks a lot

> 
> Regards,
> Chun-Kuang.
> 
> Chun-Kuang Hu <chunkuang.hu@kernel.org> 於 2020年8月23日 週日 上午9:48寫道：
> >
> > From: CK Hu <ck.hu@mediatek.com>
> >
> > 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>
> > ---
> >  drivers/gpu/drm/mediatek/Kconfig                           | 7 -------
> >  drivers/gpu/drm/mediatek/Makefile                          | 6 ------
> >  drivers/phy/mediatek/Kconfig                               | 7 +++++++
> >  drivers/phy/mediatek/Makefile                              | 5 +++++
> >  .../mediatek/phy-mtk-hdmi-mt2701.c}                        | 2 +-
> >  .../mediatek/phy-mtk-hdmi-mt8173.c}                        | 2 +-
> >  .../mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c}         | 2 +-
> >  .../mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h}         | 0
> >  8 files changed, 15 insertions(+), 16 deletions(-)
> >  rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%)
> >  rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%)
> >  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (99%)
> >  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (100%)
> >
> > diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> > index 6363f2c1cdbc..65cd03a4be29 100644
> > --- a/drivers/gpu/drm/mediatek/Kconfig
> > +++ b/drivers/gpu/drm/mediatek/Kconfig
> > @@ -27,10 +27,3 @@ config DRM_MEDIATEK_HDMI
> >         select PHY_MTK_HDMI
> >         help
> >           DRM/KMS HDMI driver for Mediatek SoCs
> > -
> > -config PHY_MTK_HDMI
> > -       tristate "MediaTek HDMI-PHY Driver"
> > -       depends on ARCH_MEDIATEK && OF
> > -       select GENERIC_PHY
> > -       help
> > -         Support HDMI PHY for Mediatek SoCs.
> > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
> > index fcbef23aa6ce..77b0fd86063d 100644
> > --- a/drivers/gpu/drm/mediatek/Makefile
> > +++ b/drivers/gpu/drm/mediatek/Makefile
> > @@ -22,9 +22,3 @@ mediatek-drm-hdmi-objs := mtk_cec.o \
> >                           mtk_hdmi_ddc.o
> >
> >  obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
> > -
> > -phy-mtk-hdmi-drv-objs := mtk_hdmi_phy.o \
> > -                        mtk_mt2701_hdmi_phy.o \
> > -                        mtk_mt8173_hdmi_phy.o
> > -
> > -obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o
> > diff --git a/drivers/phy/mediatek/Kconfig b/drivers/phy/mediatek/Kconfig
> > index dee757c957f2..50c5e9306e19 100644
> > --- a/drivers/phy/mediatek/Kconfig
> > +++ b/drivers/phy/mediatek/Kconfig
> > @@ -35,3 +35,10 @@ config PHY_MTK_XSPHY
> >           Enable this to support the SuperSpeedPlus XS-PHY transceiver for
> >           USB3.1 GEN2 controllers on MediaTek chips. The driver supports
> >           multiple USB2.0, USB3.1 GEN2 ports.
> > +
> > +config PHY_MTK_HDMI
> > +       tristate "MediaTek HDMI-PHY Driver"
> > +       depends on ARCH_MEDIATEK && OF
> > +       select GENERIC_PHY
> > +       help
> > +         Support HDMI PHY for Mediatek SoCs.
> > diff --git a/drivers/phy/mediatek/Makefile b/drivers/phy/mediatek/Makefile
> > index 08a8e6a97b1e..6325e38709ed 100644
> > --- a/drivers/phy/mediatek/Makefile
> > +++ b/drivers/phy/mediatek/Makefile
> > @@ -6,3 +6,8 @@
> >  obj-$(CONFIG_PHY_MTK_TPHY)             += phy-mtk-tphy.o
> >  obj-$(CONFIG_PHY_MTK_UFS)              += phy-mtk-ufs.o
> >  obj-$(CONFIG_PHY_MTK_XSPHY)            += phy-mtk-xsphy.o
> > +
> > +phy-mtk-hdmi-drv-y                     := phy-mtk-hdmi.o
> > +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt2701.o
> > +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt8173.o
> > +obj-$(CONFIG_PHY_MTK_HDMI)             += phy-mtk-hdmi-drv.o
> > diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > similarity index 99%
> > rename from drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> > rename to drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > index 99fe05cd3598..a6cb1dea3d0c 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> > +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > @@ -4,7 +4,7 @@
> >   * Author: Chunhui Dai <chunhui.dai@mediatek.com>
> >   */
> >
> > -#include "mtk_hdmi_phy.h"
> > +#include "phy-mtk-hdmi.h"
> >
> >  #define HDMI_CON0      0x00
> >  #define RG_HDMITX_DRV_IBIAS            0
> > diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > similarity index 99%
> > rename from drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> > rename to drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > index 827b93786fac..6cdfdf5a698a 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> > +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > @@ -4,7 +4,7 @@
> >   * Author: Jie Qiu <jie.qiu@mediatek.com>
> >   */
> >
> > -#include "mtk_hdmi_phy.h"
> > +#include "phy-mtk-hdmi.h"
> >
> >  #define HDMI_CON0              0x00
> >  #define RG_HDMITX_PLL_EN               BIT(31)
> > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
> > similarity index 99%
> > rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> > rename to drivers/phy/mediatek/phy-mtk-hdmi.c
> > index fe022acddbef..8fc83f01a720 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> > +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
> > @@ -4,7 +4,7 @@
> >   * Author: Jie Qiu <jie.qiu@mediatek.com>
> >   */
> >
> > -#include "mtk_hdmi_phy.h"
> > +#include "phy-mtk-hdmi.h"
> >
> >  static int mtk_hdmi_phy_power_on(struct phy *phy);
> >  static int mtk_hdmi_phy_power_off(struct phy *phy);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/phy/mediatek/phy-mtk-hdmi.h
> > similarity index 100%
> > rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.h
> > rename to drivers/phy/mediatek/phy-mtk-hdmi.h
> > --
> > 2.17.1
> >
Chun-Kuang Hu Aug. 31, 2020, 4:01 p.m. UTC | #3 
Hi, Chunfeng:

Chunfeng Yun <chunfeng.yun@mediatek.com> 於 2020年8月31日 週一 上午9:48寫道：
>
> On Mon, 2020-08-31 at 07:03 +0800, Chun-Kuang Hu wrote:
> > Hi, Chunfeng & Kishon:
> >
> > How do you feel about this patch?
> It's fine to me,
>
> Reviewed-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
>

Could you give an 'Acked-by' tag on this patch? So I could apply the
whole series into my tree.

Regards,
Chun-Kuang.

> Thanks a lot
>
> >
> > Regards,
> > Chun-Kuang.
> >
> > Chun-Kuang Hu <chunkuang.hu@kernel.org> 於 2020年8月23日 週日 上午9:48寫道：
> > >
> > > From: CK Hu <ck.hu@mediatek.com>
> > >
> > > 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>
> > > ---
> > >  drivers/gpu/drm/mediatek/Kconfig                           | 7 -------
> > >  drivers/gpu/drm/mediatek/Makefile                          | 6 ------
> > >  drivers/phy/mediatek/Kconfig                               | 7 +++++++
> > >  drivers/phy/mediatek/Makefile                              | 5 +++++
> > >  .../mediatek/phy-mtk-hdmi-mt2701.c}                        | 2 +-
> > >  .../mediatek/phy-mtk-hdmi-mt8173.c}                        | 2 +-
> > >  .../mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c}         | 2 +-
> > >  .../mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h}         | 0
> > >  8 files changed, 15 insertions(+), 16 deletions(-)
> > >  rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%)
> > >  rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%)
> > >  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (99%)
> > >  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (100%)
> > >
> > > diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> > > index 6363f2c1cdbc..65cd03a4be29 100644
> > > --- a/drivers/gpu/drm/mediatek/Kconfig
> > > +++ b/drivers/gpu/drm/mediatek/Kconfig
> > > @@ -27,10 +27,3 @@ config DRM_MEDIATEK_HDMI
> > >         select PHY_MTK_HDMI
> > >         help
> > >           DRM/KMS HDMI driver for Mediatek SoCs
> > > -
> > > -config PHY_MTK_HDMI
> > > -       tristate "MediaTek HDMI-PHY Driver"
> > > -       depends on ARCH_MEDIATEK && OF
> > > -       select GENERIC_PHY
> > > -       help
> > > -         Support HDMI PHY for Mediatek SoCs.
> > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
> > > index fcbef23aa6ce..77b0fd86063d 100644
> > > --- a/drivers/gpu/drm/mediatek/Makefile
> > > +++ b/drivers/gpu/drm/mediatek/Makefile
> > > @@ -22,9 +22,3 @@ mediatek-drm-hdmi-objs := mtk_cec.o \
> > >                           mtk_hdmi_ddc.o
> > >
> > >  obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
> > > -
> > > -phy-mtk-hdmi-drv-objs := mtk_hdmi_phy.o \
> > > -                        mtk_mt2701_hdmi_phy.o \
> > > -                        mtk_mt8173_hdmi_phy.o
> > > -
> > > -obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o
> > > diff --git a/drivers/phy/mediatek/Kconfig b/drivers/phy/mediatek/Kconfig
> > > index dee757c957f2..50c5e9306e19 100644
> > > --- a/drivers/phy/mediatek/Kconfig
> > > +++ b/drivers/phy/mediatek/Kconfig
> > > @@ -35,3 +35,10 @@ config PHY_MTK_XSPHY
> > >           Enable this to support the SuperSpeedPlus XS-PHY transceiver for
> > >           USB3.1 GEN2 controllers on MediaTek chips. The driver supports
> > >           multiple USB2.0, USB3.1 GEN2 ports.
> > > +
> > > +config PHY_MTK_HDMI
> > > +       tristate "MediaTek HDMI-PHY Driver"
> > > +       depends on ARCH_MEDIATEK && OF
> > > +       select GENERIC_PHY
> > > +       help
> > > +         Support HDMI PHY for Mediatek SoCs.
> > > diff --git a/drivers/phy/mediatek/Makefile b/drivers/phy/mediatek/Makefile
> > > index 08a8e6a97b1e..6325e38709ed 100644
> > > --- a/drivers/phy/mediatek/Makefile
> > > +++ b/drivers/phy/mediatek/Makefile
> > > @@ -6,3 +6,8 @@
> > >  obj-$(CONFIG_PHY_MTK_TPHY)             += phy-mtk-tphy.o
> > >  obj-$(CONFIG_PHY_MTK_UFS)              += phy-mtk-ufs.o
> > >  obj-$(CONFIG_PHY_MTK_XSPHY)            += phy-mtk-xsphy.o
> > > +
> > > +phy-mtk-hdmi-drv-y                     := phy-mtk-hdmi.o
> > > +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt2701.o
> > > +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt8173.o
> > > +obj-$(CONFIG_PHY_MTK_HDMI)             += phy-mtk-hdmi-drv.o
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > > similarity index 99%
> > > rename from drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> > > rename to drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > > index 99fe05cd3598..a6cb1dea3d0c 100644
> > > --- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> > > +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > > @@ -4,7 +4,7 @@
> > >   * Author: Chunhui Dai <chunhui.dai@mediatek.com>
> > >   */
> > >
> > > -#include "mtk_hdmi_phy.h"
> > > +#include "phy-mtk-hdmi.h"
> > >
> > >  #define HDMI_CON0      0x00
> > >  #define RG_HDMITX_DRV_IBIAS            0
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > > similarity index 99%
> > > rename from drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> > > rename to drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > > index 827b93786fac..6cdfdf5a698a 100644
> > > --- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> > > +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > > @@ -4,7 +4,7 @@
> > >   * Author: Jie Qiu <jie.qiu@mediatek.com>
> > >   */
> > >
> > > -#include "mtk_hdmi_phy.h"
> > > +#include "phy-mtk-hdmi.h"
> > >
> > >  #define HDMI_CON0              0x00
> > >  #define RG_HDMITX_PLL_EN               BIT(31)
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
> > > similarity index 99%
> > > rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> > > rename to drivers/phy/mediatek/phy-mtk-hdmi.c
> > > index fe022acddbef..8fc83f01a720 100644
> > > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> > > +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
> > > @@ -4,7 +4,7 @@
> > >   * Author: Jie Qiu <jie.qiu@mediatek.com>
> > >   */
> > >
> > > -#include "mtk_hdmi_phy.h"
> > > +#include "phy-mtk-hdmi.h"
> > >
> > >  static int mtk_hdmi_phy_power_on(struct phy *phy);
> > >  static int mtk_hdmi_phy_power_off(struct phy *phy);
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/phy/mediatek/phy-mtk-hdmi.h
> > > similarity index 100%
> > > rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.h
> > > rename to drivers/phy/mediatek/phy-mtk-hdmi.h
> > > --
> > > 2.17.1
> > >
>
Chunfeng Yun (云春峰) Sept. 1, 2020, 1:52 a.m. UTC | #4 
On Tue, 2020-09-01 at 00:01 +0800, Chun-Kuang Hu wrote:
> Hi, Chunfeng:
> 
> Chunfeng Yun <chunfeng.yun@mediatek.com> 於 2020年8月31日 週一 上午9:48寫道：
> >
> > On Mon, 2020-08-31 at 07:03 +0800, Chun-Kuang Hu wrote:
> > > Hi, Chunfeng & Kishon:
> > >
> > > How do you feel about this patch?
> > It's fine to me,
> >
> > Reviewed-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
> >
> 
> Could you give an 'Acked-by' tag on this patch? So I could apply the
> whole series into my tree.
Acked-by: Chunfeng Yun <chunfeng.yun@mediatek.com>

Thanks

> 
> Regards,
> Chun-Kuang.
> 
> > Thanks a lot
> >
> > >
> > > Regards,
> > > Chun-Kuang.
> > >
> > > Chun-Kuang Hu <chunkuang.hu@kernel.org> 於 2020年8月23日 週日 上午9:48寫道：
> > > >
> > > > From: CK Hu <ck.hu@mediatek.com>
> > > >
> > > > 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>
> > > > ---
> > > >  drivers/gpu/drm/mediatek/Kconfig                           | 7 -------
> > > >  drivers/gpu/drm/mediatek/Makefile                          | 6 ------
> > > >  drivers/phy/mediatek/Kconfig                               | 7 +++++++
> > > >  drivers/phy/mediatek/Makefile                              | 5 +++++
> > > >  .../mediatek/phy-mtk-hdmi-mt2701.c}                        | 2 +-
> > > >  .../mediatek/phy-mtk-hdmi-mt8173.c}                        | 2 +-
> > > >  .../mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c}         | 2 +-
> > > >  .../mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h}         | 0
> > > >  8 files changed, 15 insertions(+), 16 deletions(-)
> > > >  rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%)
> > > >  rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%)
> > > >  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (99%)
> > > >  rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (100%)
> > > >
> > > > diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> > > > index 6363f2c1cdbc..65cd03a4be29 100644
> > > > --- a/drivers/gpu/drm/mediatek/Kconfig
> > > > +++ b/drivers/gpu/drm/mediatek/Kconfig
> > > > @@ -27,10 +27,3 @@ config DRM_MEDIATEK_HDMI
> > > >         select PHY_MTK_HDMI
> > > >         help
> > > >           DRM/KMS HDMI driver for Mediatek SoCs
> > > > -
> > > > -config PHY_MTK_HDMI
> > > > -       tristate "MediaTek HDMI-PHY Driver"
> > > > -       depends on ARCH_MEDIATEK && OF
> > > > -       select GENERIC_PHY
> > > > -       help
> > > > -         Support HDMI PHY for Mediatek SoCs.
> > > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
> > > > index fcbef23aa6ce..77b0fd86063d 100644
> > > > --- a/drivers/gpu/drm/mediatek/Makefile
> > > > +++ b/drivers/gpu/drm/mediatek/Makefile
> > > > @@ -22,9 +22,3 @@ mediatek-drm-hdmi-objs := mtk_cec.o \
> > > >                           mtk_hdmi_ddc.o
> > > >
> > > >  obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
> > > > -
> > > > -phy-mtk-hdmi-drv-objs := mtk_hdmi_phy.o \
> > > > -                        mtk_mt2701_hdmi_phy.o \
> > > > -                        mtk_mt8173_hdmi_phy.o
> > > > -
> > > > -obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o
> > > > diff --git a/drivers/phy/mediatek/Kconfig b/drivers/phy/mediatek/Kconfig
> > > > index dee757c957f2..50c5e9306e19 100644
> > > > --- a/drivers/phy/mediatek/Kconfig
> > > > +++ b/drivers/phy/mediatek/Kconfig
> > > > @@ -35,3 +35,10 @@ config PHY_MTK_XSPHY
> > > >           Enable this to support the SuperSpeedPlus XS-PHY transceiver for
> > > >           USB3.1 GEN2 controllers on MediaTek chips. The driver supports
> > > >           multiple USB2.0, USB3.1 GEN2 ports.
> > > > +
> > > > +config PHY_MTK_HDMI
> > > > +       tristate "MediaTek HDMI-PHY Driver"
> > > > +       depends on ARCH_MEDIATEK && OF
> > > > +       select GENERIC_PHY
> > > > +       help
> > > > +         Support HDMI PHY for Mediatek SoCs.
> > > > diff --git a/drivers/phy/mediatek/Makefile b/drivers/phy/mediatek/Makefile
> > > > index 08a8e6a97b1e..6325e38709ed 100644
> > > > --- a/drivers/phy/mediatek/Makefile
> > > > +++ b/drivers/phy/mediatek/Makefile
> > > > @@ -6,3 +6,8 @@
> > > >  obj-$(CONFIG_PHY_MTK_TPHY)             += phy-mtk-tphy.o
> > > >  obj-$(CONFIG_PHY_MTK_UFS)              += phy-mtk-ufs.o
> > > >  obj-$(CONFIG_PHY_MTK_XSPHY)            += phy-mtk-xsphy.o
> > > > +
> > > > +phy-mtk-hdmi-drv-y                     := phy-mtk-hdmi.o
> > > > +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt2701.o
> > > > +phy-mtk-hdmi-drv-y                     += phy-mtk-hdmi-mt8173.o
> > > > +obj-$(CONFIG_PHY_MTK_HDMI)             += phy-mtk-hdmi-drv.o
> > > > diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > > > similarity index 99%
> > > > rename from drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> > > > rename to drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > > > index 99fe05cd3598..a6cb1dea3d0c 100644
> > > > --- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
> > > > +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
> > > > @@ -4,7 +4,7 @@
> > > >   * Author: Chunhui Dai <chunhui.dai@mediatek.com>
> > > >   */
> > > >
> > > > -#include "mtk_hdmi_phy.h"
> > > > +#include "phy-mtk-hdmi.h"
> > > >
> > > >  #define HDMI_CON0      0x00
> > > >  #define RG_HDMITX_DRV_IBIAS            0
> > > > diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > > > similarity index 99%
> > > > rename from drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> > > > rename to drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > > > index 827b93786fac..6cdfdf5a698a 100644
> > > > --- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
> > > > +++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
> > > > @@ -4,7 +4,7 @@
> > > >   * Author: Jie Qiu <jie.qiu@mediatek.com>
> > > >   */
> > > >
> > > > -#include "mtk_hdmi_phy.h"
> > > > +#include "phy-mtk-hdmi.h"
> > > >
> > > >  #define HDMI_CON0              0x00
> > > >  #define RG_HDMITX_PLL_EN               BIT(31)
> > > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
> > > > similarity index 99%
> > > > rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> > > > rename to drivers/phy/mediatek/phy-mtk-hdmi.c
> > > > index fe022acddbef..8fc83f01a720 100644
> > > > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
> > > > +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
> > > > @@ -4,7 +4,7 @@
> > > >   * Author: Jie Qiu <jie.qiu@mediatek.com>
> > > >   */
> > > >
> > > > -#include "mtk_hdmi_phy.h"
> > > > +#include "phy-mtk-hdmi.h"
> > > >
> > > >  static int mtk_hdmi_phy_power_on(struct phy *phy);
> > > >  static int mtk_hdmi_phy_power_off(struct phy *phy);
> > > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/phy/mediatek/phy-mtk-hdmi.h
> > > > similarity index 100%
> > > > rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.h
> > > > rename to drivers/phy/mediatek/phy-mtk-hdmi.h
> > > > --
> > > > 2.17.1
> > > >
> >
diff mbox series

Patch

diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
index 6363f2c1cdbc..65cd03a4be29 100644
--- a/drivers/gpu/drm/mediatek/Kconfig
+++ b/drivers/gpu/drm/mediatek/Kconfig
@@ -27,10 +27,3 @@  config DRM_MEDIATEK_HDMI
 	select PHY_MTK_HDMI
 	help
 	  DRM/KMS HDMI driver for Mediatek SoCs
-
-config PHY_MTK_HDMI
-	tristate "MediaTek HDMI-PHY Driver"
-	depends on ARCH_MEDIATEK && OF
-	select GENERIC_PHY
-	help
-	  Support HDMI PHY for Mediatek SoCs.
diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
index fcbef23aa6ce..77b0fd86063d 100644
--- a/drivers/gpu/drm/mediatek/Makefile
+++ b/drivers/gpu/drm/mediatek/Makefile
@@ -22,9 +22,3 @@  mediatek-drm-hdmi-objs := mtk_cec.o \
 			  mtk_hdmi_ddc.o
 
 obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
-
-phy-mtk-hdmi-drv-objs := mtk_hdmi_phy.o \
-			 mtk_mt2701_hdmi_phy.o \
-			 mtk_mt8173_hdmi_phy.o
-
-obj-$(CONFIG_PHY_MTK_HDMI) += phy-mtk-hdmi-drv.o
diff --git a/drivers/phy/mediatek/Kconfig b/drivers/phy/mediatek/Kconfig
index dee757c957f2..50c5e9306e19 100644
--- a/drivers/phy/mediatek/Kconfig
+++ b/drivers/phy/mediatek/Kconfig
@@ -35,3 +35,10 @@  config PHY_MTK_XSPHY
 	  Enable this to support the SuperSpeedPlus XS-PHY transceiver for
 	  USB3.1 GEN2 controllers on MediaTek chips. The driver supports
 	  multiple USB2.0, USB3.1 GEN2 ports.
+
+config PHY_MTK_HDMI
+	tristate "MediaTek HDMI-PHY Driver"
+	depends on ARCH_MEDIATEK && OF
+	select GENERIC_PHY
+	help
+	  Support HDMI PHY for Mediatek SoCs.
diff --git a/drivers/phy/mediatek/Makefile b/drivers/phy/mediatek/Makefile
index 08a8e6a97b1e..6325e38709ed 100644
--- a/drivers/phy/mediatek/Makefile
+++ b/drivers/phy/mediatek/Makefile
@@ -6,3 +6,8 @@ 
 obj-$(CONFIG_PHY_MTK_TPHY)		+= phy-mtk-tphy.o
 obj-$(CONFIG_PHY_MTK_UFS)		+= phy-mtk-ufs.o
 obj-$(CONFIG_PHY_MTK_XSPHY)		+= phy-mtk-xsphy.o
+
+phy-mtk-hdmi-drv-y			:= phy-mtk-hdmi.o
+phy-mtk-hdmi-drv-y			+= phy-mtk-hdmi-mt2701.o
+phy-mtk-hdmi-drv-y			+= phy-mtk-hdmi-mt8173.o
+obj-$(CONFIG_PHY_MTK_HDMI)		+= phy-mtk-hdmi-drv.o
diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
similarity index 99%
rename from drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
rename to drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
index 99fe05cd3598..a6cb1dea3d0c 100644
--- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c
+++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
@@ -4,7 +4,7 @@ 
  * Author: Chunhui Dai <chunhui.dai@mediatek.com>
  */
 
-#include "mtk_hdmi_phy.h"
+#include "phy-mtk-hdmi.h"
 
 #define HDMI_CON0	0x00
 #define RG_HDMITX_DRV_IBIAS		0
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
similarity index 99%
rename from drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
rename to drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
index 827b93786fac..6cdfdf5a698a 100644
--- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
+++ b/drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
@@ -4,7 +4,7 @@ 
  * Author: Jie Qiu <jie.qiu@mediatek.com>
  */
 
-#include "mtk_hdmi_phy.h"
+#include "phy-mtk-hdmi.h"
 
 #define HDMI_CON0		0x00
 #define RG_HDMITX_PLL_EN		BIT(31)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
similarity index 99%
rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
rename to drivers/phy/mediatek/phy-mtk-hdmi.c
index fe022acddbef..8fc83f01a720 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c
+++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
@@ -4,7 +4,7 @@ 
  * Author: Jie Qiu <jie.qiu@mediatek.com>
  */
 
-#include "mtk_hdmi_phy.h"
+#include "phy-mtk-hdmi.h"
 
 static int mtk_hdmi_phy_power_on(struct phy *phy);
 static int mtk_hdmi_phy_power_off(struct phy *phy);
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/phy/mediatek/phy-mtk-hdmi.h
similarity index 100%
rename from drivers/gpu/drm/mediatek/mtk_hdmi_phy.h
rename to drivers/phy/mediatek/phy-mtk-hdmi.h