diff options
| author | Ezequiel Garcia <ezequiel@collabora.com> | 2020-08-25 19:07:10 -0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-31 18:28:21 +0530 |
| commit | 37abc181bbac235633ae23f94d81138c20a4c147 (patch) | |
| tree | fc385b50cfad05f1b93fafc0346f0d711567252e | |
| parent | a1bf1c60b55537382e6857bae8aa89d0dd584747 (diff) | |
phy: Move phy-rockchip-dphy-rx0 out of staging
There is no need for this driver to be in staging.
Let's promote it!
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Link: https://lore.kernel.org/r/20200825220710.634106-1-ezequiel@collabora.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
| -rw-r--r-- | drivers/phy/rockchip/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/phy/rockchip/Makefile | 1 | ||||
| -rw-r--r-- | drivers/phy/rockchip/phy-rockchip-dphy-rx0.c (renamed from drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/staging/media/phy-rockchip-dphy-rx0/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/media/phy-rockchip-dphy-rx0/TODO | 6 |
8 files changed, 13 insertions, 24 deletions
diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index 0824b9dd5683..c2f22f90736c 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -9,6 +9,18 @@ config PHY_ROCKCHIP_DP help Enable this to support the Rockchip Display Port PHY. +config PHY_ROCKCHIP_DPHY_RX0 + tristate "Rockchip MIPI Synopsys DPHY RX0 driver" + depends on ARCH_ROCKCHIP || COMPILE_TEST + select GENERIC_PHY_MIPI_DPHY + select GENERIC_PHY + help + Enable this to support the Rockchip MIPI Synopsys DPHY RX0 + associated to the Rockchip ISP module present in RK3399 SoCs. + + To compile this driver as a module, choose M here: the module + will be called phy-rockchip-dphy-rx0. + config PHY_ROCKCHIP_EMMC tristate "Rockchip EMMC PHY Driver" depends on ARCH_ROCKCHIP && OF diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index 9f59a81e4e0d..c3cfc7f0af5c 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o +obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 7c4df6d48c43..7c4df6d48c43 100644 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 71d077762698..63d3bc61b529 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -42,8 +42,6 @@ source "drivers/staging/media/tegra-video/Kconfig" source "drivers/staging/media/ipu3/Kconfig" -source "drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig" - source "drivers/staging/media/rkisp1/Kconfig" if MEDIA_ANALOG_TV_SUPPORT diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 17ececa1e095..fee9c9b2aaaf 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -10,6 +10,5 @@ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ obj-$(CONFIG_TEGRA_VDE) += tegra-vde/ obj-$(CONFIG_VIDEO_HANTRO) += hantro/ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/ -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0/ obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rkisp1/ obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig b/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig deleted file mode 100644 index fb74df829371..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -config PHY_ROCKCHIP_DPHY_RX0 - tristate "Rockchip MIPI Synopsys DPHY RX0 driver" - depends on ARCH_ROCKCHIP || COMPILE_TEST - select GENERIC_PHY_MIPI_DPHY - select GENERIC_PHY - help - Enable this to support the Rockchip MIPI Synopsys DPHY RX0 - associated to the Rockchip ISP module present in RK3399 SoCs. - - To compile this driver as a module, choose M here: the module - will be called phy-rockchip-dphy-rx0. diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/Makefile b/drivers/staging/media/phy-rockchip-dphy-rx0/Makefile deleted file mode 100644 index 507e5d0593ab..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/TODO b/drivers/staging/media/phy-rockchip-dphy-rx0/TODO deleted file mode 100644 index ab612e5b27dc..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/TODO +++ /dev/null @@ -1,6 +0,0 @@ -The main reason for keeping this in staging is because the only driver -that uses this is rkisp1, which is also in staging. It should be moved together -with rkisp1. - -Please CC patches to Linux Media <linux-media@vger.kernel.org> and -Helen Koike <helen.koike@collabora.com>. |