From 7e2da880c10fffcdc337c0f1a9502cfa87fd6393 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 8 Oct 2019 18:44:07 +0800 Subject: [PATCH] include: remove unused rk_fb.h and display-sys.h Change-Id: I88672a3ebc130e69650f1c12be5ebef410bf20af Signed-off-by: Tao Huang --- drivers/clk/rockchip/clk-ddr.c | 1 - drivers/devfreq/rockchip_dmc.c | 1 - include/dt-bindings/display/rk_fb.h | 183 ---------------------------- include/linux/display-sys.h | 105 ---------------- include/soc/rockchip/rockchip_dmc.h | 16 +++ 5 files changed, 16 insertions(+), 290 deletions(-) delete mode 100644 include/dt-bindings/display/rk_fb.h delete mode 100644 include/linux/display-sys.h diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c index ed799eb652d1..1df79e7284d3 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -14,7 +14,6 @@ */ #include -#include #include #include #include diff --git a/drivers/devfreq/rockchip_dmc.c b/drivers/devfreq/rockchip_dmc.c index 22802aaa74ca..70fc6f05e8bf 100644 --- a/drivers/devfreq/rockchip_dmc.c +++ b/drivers/devfreq/rockchip_dmc.c @@ -13,7 +13,6 @@ */ #include -#include #include #include #include diff --git a/include/dt-bindings/display/rk_fb.h b/include/dt-bindings/display/rk_fb.h deleted file mode 100644 index 0b4594b2b055..000000000000 --- a/include/dt-bindings/display/rk_fb.h +++ /dev/null @@ -1,183 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _DT_BINDINGS_RKFB_H_ -#define _DT_BINDINGS_RKFB_H_ -#define GPIO 0 -#define REGULATOR 1 - -#define PRMRY 1 /*primary display device*/ -#define EXTEND 2 /*extend display device*/ - -#define DISPLAY_SOURCE_LCDC0 0 -#define DISPLAY_SOURCE_LCDC1 1 - -#define NO_DUAL 0 -#define ONE_DUAL 1 -#define DUAL 2 -#define DUAL_LCD 3 - -#define DEFAULT_MODE 0 -#define ONE_VOP_DUAL_MIPI_HOR_SCAN 1 -#define ONE_VOP_DUAL_MIPI_VER_SCAN 2 -#define TWO_VOP_TWO_SCREEN 3 - -/******************************************************************** -** display output interface supported by rockchip ** -********************************************************************/ -#define OUT_P888 0 //24bit screen,connect to lcdc D0~D23 -#define OUT_P666 1 //18bit screen,connect to lcdc D0~D17 -#define OUT_P565 2 -#define OUT_S888x 4 -#define OUT_CCIR656 6 -#define OUT_S888 8 -#define OUT_S888DUMY 12 -#define OUT_YUV_420 14 -#define OUT_P101010 15 -#define OUT_YUV_420_10BIT 16 -#define OUT_YUV_422 12 -#define OUT_YUV_422_10BIT 17 -#define OUT_P16BPP4 24 -#define OUT_D888_P666 0x21 //18bit screen,connect to lcdc D2~D7, D10~D15, D18~D23 -#define OUT_D888_P565 0x22 - -#define SCREEN_NULL 0 -#define SCREEN_RGB 1 -#define SCREEN_LVDS 2 -#define SCREEN_DUAL_LVDS 3 -#define SCREEN_MCU 4 -#define SCREEN_TVOUT 5 -#define SCREEN_HDMI 6 -#define SCREEN_MIPI 7 -#define SCREEN_DUAL_MIPI 8 -#define SCREEN_EDP 9 -#define SCREEN_TVOUT_TEST 10 -#define SCREEN_LVDS_10BIT 11 -#define SCREEN_DUAL_LVDS_10BIT 12 -#define SCREEN_DP 13 - -#define LVDS_8BIT_1 0 -#define LVDS_8BIT_2 1 -#define LVDS_8BIT_3 2 -#define LVDS_6BIT 3 -#define LVDS_10BIT_1 4 -#define LVDS_10BIT_2 5 - -/* x y mirror or rotate mode */ -#define NO_MIRROR 0 -#define X_MIRROR 1 /* up-down flip*/ -#define Y_MIRROR 2 /* left-right flip */ -#define X_Y_MIRROR 3 /* the same as rotate 180 degrees */ -#define ROTATE_90 4 /* clockwise rotate 90 degrees */ -#define ROTATE_180 8 /* rotate 180 degrees - * It is recommended to use X_Y_MIRROR - * rather than ROTATE_180 - */ -#define ROTATE_270 12/* clockwise rotate 270 degrees */ - -#define COLOR_RGB 0 -#define COLOR_RGB_BT2020 1 -/* default colorspace is bt601 */ -#define COLOR_YCBCR 2 -#define COLOR_YCBCR_BT709 3 -#define COLOR_YCBCR_BT2020 4 - -#define IS_YUV_COLOR(x) ((x) >= COLOR_YCBCR) - -#define SCREEN_VIDEO_MODE 0 -#define SCREEN_CMD_MODE 1 - -/* fb win map */ -#define FB_DEFAULT_ORDER 0 -#define FB0_WIN2_FB1_WIN1_FB2_WIN0 12 -#define FB0_WIN1_FB1_WIN2_FB2_WIN0 21 -#define FB0_WIN2_FB1_WIN0_FB2_WIN1 102 -#define FB0_WIN0_FB1_WIN2_FB2_WIN1 120 -#define FB0_WIN0_FB1_WIN1_FB2_WIN2 210 -#define FB0_WIN1_FB1_WIN0_FB2_WIN2 201 -#define FB0_WIN0_FB1_WIN1_FB2_WIN2_FB3_WIN3 3210 -#define FB0_WIN0_FB1_WIN1_FB2_WIN2_FB3_WIN3_FB4_HWC 43210 - -#define DISPLAY_POLICY_SDK 0 -#define DISPLAY_POLICY_BOX 1 - -/* lvds connect config - * - * LVDS_8BIT_1 LVDS_8BIT_2 LVDS_8BIT_3 LVDS_6BIT ----------------------------------------------------------------------- - TX0 R0 R2 R2 R0 - TX1 R1 R3 R3 R1 - TX2 R2 R4 R4 R2 -Y TX3 R3 R5 R5 R3 -0 TX4 R4 R6 R6 R4 - TX6 R5 R7 R7 R5 - TX7 G0 G2 G2 G0 ----------------------------------------------------------------------- - TX8 G1 G3 G3 G1 - TX9 G2 G4 G4 G2 -Y TX12 G3 G5 G5 G3 -1 TX13 G4 G6 G6 G4 - TX14 G5 G7 G7 G5 - TX15 B0 B2 B2 B0 - TX18 B1 B3 B3 B1 ----------------------------------------------------------------------- - TX19 B2 B4 B4 B2 - TX20 B3 B5 B5 B3 - TX21 B4 B6 B6 B4 -Y TX22 B5 B7 B7 B5 -2 TX24 HSYNC HSYNC HSYNC HSYNC - TX25 VSYNC VSYNC VSYNC VSYNC - TX26 ENABLE ENABLE ENABLE ENABLE ----------------------------------------------------------------------- - TX27 R6 R0 GND GND - TX5 R7 R1 GND GND - TX10 G6 G0 GND GND -Y TX11 G7 G1 GND GND -3 TX16 B6 B0 GND GND - TX17 B7 B1 GND GND - TX23 RSVD RSVD RSVD RSVD ----------------------------------------------------------------------- - - * LVDS_10BIT_1 LVDS_10BIT_2 ----------------------------------------------------------------------- - TX0 R0 R4 - TX1 R1 R5 - TX2 R2 R6 -Y TX3 R3 R7 -0 TX4 R4 R8 - TX6 R5 R9 - TX7 G0 G4 ----------------------------------------------------------------------- - TX8 G1 G5 - TX9 G2 G6 -Y TX12 G3 G7 -1 TX13 G4 G8 - TX14 G5 G9 - TX15 B0 B4 - TX18 B1 B5 ----------------------------------------------------------------------- - TX19 B2 B6 - TX20 B3 B7 - TX21 B4 B8 -Y TX22 B5 B9 -2 TX24 HSYNC HSYNC - TX25 VSYNC VSYNC - TX26 ENABLE ENABLE ----------------------------------------------------------------------- - TX27 R6 R2 - TX5 R7 R3 - TX10 G6 G2 -Y TX11 G7 G3 -3 TX16 B6 B2 - TX17 B7 B3 - TX23 GND GND ----------------------------------------------------------------------- - TX27 R8 R0 - TX5 R9 R1 - TX10 G8 G0 -Y TX11 G9 G1 -4 TX16 B8 B0 - TX17 B9 B1 - TX23 GND GND ------------------------------------------------------------------------- -*/ - -#endif diff --git a/include/linux/display-sys.h b/include/linux/display-sys.h deleted file mode 100644 index 328e26aebeec..000000000000 --- a/include/linux/display-sys.h +++ /dev/null @@ -1,105 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_DISPLAY_RK_H -#define _LINUX_DISPLAY_RK_H - -#include -#include -#include -#include - -struct rk_display_device; - -enum rk_display_priority { - DISPLAY_PRIORITY_TV = 0, - DISPLAY_PRIORITY_YPBPR, - DISPLAY_PRIORITY_VGA, - DISPLAY_PRIORITY_HDMI, - DISPLAY_PRIORITY_LCD, -}; - -enum { - DISPLAY_SCALE_X = 0, - DISPLAY_SCALE_Y -}; - -enum rk_display_property { - DISPLAY_MAIN = 0, - DISPLAY_AUX -}; - - -/* HDMI mode list*/ -struct display_modelist { - struct list_head list; - struct fb_videomode mode; - unsigned int vic; - unsigned int format_3d; - unsigned int detail_3d; -}; - -/* This structure defines all the properties of a Display. */ -struct rk_display_driver { - void (*suspend)(struct rk_display_device *, pm_message_t state); - void (*resume)(struct rk_display_device *); - int (*probe)(struct rk_display_device *, void *); - int (*remove)(struct rk_display_device *); -}; - -struct rk_display_ops { - int (*setenable)(struct rk_display_device *, int enable); - int (*getenable)(struct rk_display_device *); - int (*getstatus)(struct rk_display_device *); - int (*getmodelist)(struct rk_display_device *, - struct list_head **modelist); - int (*setmode)(struct rk_display_device *, - struct fb_videomode *mode); - int (*getmode)(struct rk_display_device *, - struct fb_videomode *mode); - int (*setscale)(struct rk_display_device *, int, int); - int (*getscale)(struct rk_display_device *, int); - int (*get3dmode)(struct rk_display_device *); - int (*set3dmode)(struct rk_display_device *, int); - int (*getcolor)(struct rk_display_device *, char *); - int (*setcolor)(struct rk_display_device *, const char *, int); - int (*setdebug)(struct rk_display_device *, int); - int (*getdebug)(struct rk_display_device *, char *); - int (*getedidaudioinfo)(struct rk_display_device *, - char *audioinfo, int len); - int (*getmonspecs)(struct rk_display_device *, - struct fb_monspecs *monspecs); - int (*getvrinfo)(struct rk_display_device *, char *); -}; - -struct rk_display_device { - struct module *owner; /* Owner module */ - struct rk_display_driver *driver; - struct device *parent; /* This is the parent */ - struct device *dev; /* This is this display device */ - struct mutex lock; - void *priv_data; - char type[16]; - char *name; - int idx; - struct rk_display_ops *ops; - int priority; - int property; - struct list_head list; -}; - -struct rk_display_devicelist { - struct list_head list; - struct rk_display_device *dev; -}; - -struct rk_display_device - *rk_display_device_register(struct rk_display_driver *driver, - struct device *parent, void *devdata); -void rk_display_device_unregister(struct rk_display_device *dev); -void rk_display_device_enable(struct rk_display_device *ddev); -void rk_display_device_enable_other(struct rk_display_device *ddev); -void rk_display_device_disable_other(struct rk_display_device *ddev); -void rk_display_device_select(int property, int priority); - -int display_add_videomode(const struct fb_videomode *mode, - struct list_head *head); -#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h index 0bc2b8f92b53..a73d30240172 100644 --- a/include/soc/rockchip/rockchip_dmc.h +++ b/include/soc/rockchip/rockchip_dmc.h @@ -15,6 +15,22 @@ #include +/* for lcdc_type */ +#define SCREEN_NULL 0 +#define SCREEN_RGB 1 +#define SCREEN_LVDS 2 +#define SCREEN_DUAL_LVDS 3 +#define SCREEN_MCU 4 +#define SCREEN_TVOUT 5 +#define SCREEN_HDMI 6 +#define SCREEN_MIPI 7 +#define SCREEN_DUAL_MIPI 8 +#define SCREEN_EDP 9 +#define SCREEN_TVOUT_TEST 10 +#define SCREEN_LVDS_10BIT 11 +#define SCREEN_DUAL_LVDS_10BIT 12 +#define SCREEN_DP 13 + #ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ void rockchip_dmcfreq_lock(void); void rockchip_dmcfreq_unlock(void);