From 8eaa58d9a794e6f1c14303da99f2d8a8518ec4c0 Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Mon, 9 Sep 2019 17:45:35 +0800
Subject: [PATCH] video: Add rockchip video drivers

Change-Id: Ice3ea34c4ea3862c29f5e9b561d19a390f2965c7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
---
 drivers/video/Kconfig           |  4 ++
 drivers/video/Makefile          |  1 +
 drivers/video/rockchip/Kconfig  | 70 ---------------------------------
 drivers/video/rockchip/Makefile |  9 -----
 4 files changed, 5 insertions(+), 79 deletions(-)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7eb4efc3c1b2..5f08c95cb9eb 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -25,6 +25,10 @@ endmenu
 
 source "drivers/video/backlight/Kconfig"
 
+menu "Rockchip Misc Video driver"
+source "drivers/video/rockchip/Kconfig"
+endmenu
+
 config VGASTATE
        tristate
        default n
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index df7650adede9..b355e2fcb423 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_VT)		  += console/
 obj-$(CONFIG_FB_STI)		  += console/
 obj-$(CONFIG_LOGO)		  += logo/
 obj-y				  += backlight/
+obj-y				  += rockchip/
 
 obj-y				  += fbdev/
 
diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
index 5808d0a4dbdd..0f39a6833859 100644
--- a/drivers/video/rockchip/Kconfig
+++ b/drivers/video/rockchip/Kconfig
@@ -1,73 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-menuconfig FB_ROCKCHIP
-	tristate "Frame buffer support for Rockchip "
-	depends on FB
-	select FB_CFB_FILLRECT
-	select FB_CFB_COPYAREA
-	select FB_CFB_IMAGEBLIT
-	select FB_MODE_HELPERS
-	select VIDEOMODE_HELPERS
-        help
-          Framebuffer driver for rockchip based platform
-
-config FB_MIRRORING
-	bool     "Mirroring support"
-	depends on FB_ROCKCHIP
-choice
-        bool "Dual display ploy select"
-	depends on FB_ROCKCHIP
-	default NO_DUAL_DISP
-        help
-	  If you use dual lcdc for dual display ,select "implement dual display in kernel with dual lcdc"
-	  If you use one lcdc like rk2928 or one lcdc with RK Jetta,select "one lcdc dual output display interface support"
-	
-config DUAL_LCDC_DUAL_DISP_IN_KERNEL
-        bool "implement dual display in kernel with dual lcdc"
-        depends on FB_ROCKCHIP
-        help
-          select y will implement dual screen display in kernel
-
-config ONE_LCDC_DUAL_OUTPUT_INF
-        bool "one lcdc dual output display interface support"
-        depends on FB_ROCKCHIP
-        help
-          select y if on platform like rk2928 which have one lcdc but two output interface
-config NO_DUAL_DISP
-	bool "NO dual display needed"
-	depends on FB_ROCKCHIP
-	help
-	  No dual display needed
-endchoice
-
-config FB_ROTATE
-	bool"FB rotate support"
-	depends on FB_ROCKCHIP
-	default n
-	help
-	  select y if you need rotate your screen
-
-config ROTATE_ORIENTATION
-	int "rotate orientation"
-	depends on FB_ROTATE
-	default 0
-	help
-	  select 0, 90, 180,270 according to your Mold
-config THREE_FB_BUFFER
-        bool "Three fb buffer support"
-        depends on FB_ROCKCHIP
-        default y
-        help
-           select y if android support three buffer,like Jelly Bean
-
-
-source "drivers/video/rockchip/lcdc/Kconfig"
-source "drivers/video/rockchip/screen/Kconfig"
-source "drivers/video/rockchip/transmitter/Kconfig"
-source "drivers/video/rockchip/hdmi/Kconfig"
-source "drivers/video/rockchip/tve/Kconfig"
-source "drivers/video/rockchip/rga/Kconfig"
 source "drivers/video/rockchip/rga2/Kconfig"
-source "drivers/video/rockchip/vcodec/Kconfig"
 source "drivers/video/rockchip/iep/Kconfig"
-source "drivers/video/rockchip/dp/Kconfig"
-source "drivers/video/rockchip/vpu/Kconfig"
diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile
index 245c2456392d..48bc7dac48e4 100644
--- a/drivers/video/rockchip/Makefile
+++ b/drivers/video/rockchip/Makefile
@@ -1,12 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ROCKCHIP_RGA) += rga/
 obj-$(CONFIG_ROCKCHIP_RGA2) += rga2/
-obj-$(CONFIG_FB_ROCKCHIP) += rk_fb.o rkfb_sysfs.o bmp_helper.o screen/
-obj-$(CONFIG_RK_TRSM) += transmitter/
-obj-$(CONFIG_FB_ROCKCHIP) += display-sys.o lcdc/
-obj-$(CONFIG_RK_HDMI) += hdmi/
 obj-$(CONFIG_IEP) += iep/
-obj-$(CONFIG_RK_TVENCODER) += tve/
-obj-$(CONFIG_RK_VCODEC) += vcodec/
-obj-$(CONFIG_ROCKCHIP_DP) += dp/
-obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += vpu/