rk fb: move rk_fb.h and mipi_dsi.h to include/dt-bindings/display/
authorHuang Jiachai <hjc@rock-chips.com>
Fri, 4 Dec 2015 01:27:30 +0000 (09:27 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 4 Dec 2015 11:03:14 +0000 (19:03 +0800)
Change-Id: If3a382411efdfc73499204290abb0abdcb74bd11
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
include/dt-bindings/display/mipi_dsi.h [new file with mode: 0755]
include/dt-bindings/display/rk_fb.h [new file with mode: 0755]
include/dt-bindings/rkfb/rk_fb.h [deleted file]
include/dt-bindings/rkmipi/mipi_dsi.h [deleted file]

diff --git a/include/dt-bindings/display/mipi_dsi.h b/include/dt-bindings/display/mipi_dsi.h
new file mode 100755 (executable)
index 0000000..07a2dce
--- /dev/null
@@ -0,0 +1,105 @@
+/*
+drivers/video/rockchip/transmitter/mipi_dsi.h
+*/
+#ifndef MIPI_DSI_H_
+#define MIPI_DSI_H_
+
+#ifdef CONFIG_MIPI_DSI_FT
+#include "..\..\common\config.h"
+#endif
+
+//DSI DATA TYPE
+#define DTYPE_DCS_SWRITE_0P            0x05 
+#define DTYPE_DCS_SWRITE_1P            0x15 
+#define DTYPE_DCS_LWRITE               0x39 
+#define DTYPE_GEN_LWRITE               0x29 
+#define DTYPE_GEN_SWRITE_2P            0x23 
+#define DTYPE_GEN_SWRITE_1P            0x13
+#define DTYPE_GEN_SWRITE_0P            0x03
+
+//command transmit mode
+#define HSDT                   0x00
+#define LPDT                   0x01
+
+//DSI DATA TYPE FLAG
+#define DATA_TYPE_DCS                  0x00
+#define DATA_TYPE_GEN                  0x01
+
+//Video Mode
+#define VM_NBMWSP              0x00  //Non burst mode with sync pulses
+#define VM_NBMWSE              0x01  //Non burst mode with sync events
+#define VM_BM                  0x02  //Burst mode
+
+//Video Pixel Format
+#define VPF_16BPP              0x00
+#define VPF_18BPP              0x01     //packed
+#define VPF_18BPPL             0x02     //loosely packed
+#define VPF_24BPP              0x03
+
+//Display Command Set
+#define dcs_enter_idle_mode            0x39
+#define dcs_enter_invert_mode          0x21
+#define dcs_enter_normal_mode          0x13
+#define dcs_enter_partial_mode         0x12
+#define dcs_enter_sleep_mode           0x10
+#define dcs_exit_idle_mode             0x38
+#define dcs_exit_invert_mode           0x20
+#define dcs_exit_sleep_mode            0x11
+#define dcs_get_address_mode           0x0b
+#define dcs_get_blue_channel           0x08
+#define dcs_get_diagnostic_result      0x0f
+#define dcs_get_display_mode           0x0d
+#define dcs_get_green_channel                  0x07
+#define dcs_get_pixel_format           0x0c
+#define dcs_get_power_mode             0x0a
+#define dcs_get_red_channel            0x06
+#define dcs_get_scanline                       0x45
+#define dcs_get_signal_mode            0x0e
+#define dcs_nop                                                0x00
+#define dcs_read_DDB_continue                  0xa8
+#define dcs_read_DDB_start             0xa1
+#define dcs_read_memory_continue       0x3e
+#define dcs_read_memory_start                  0x2e
+#define dcs_set_address_mode           0x36
+#define dcs_set_column_address         0x2a
+#define dcs_set_display_off            0x28
+#define dcs_set_display_on             0x29
+#define dcs_set_gamma_curve            0x26
+#define dcs_set_page_address           0x2b
+#define dcs_set_partial_area           0x30
+#define dcs_set_pixel_format           0x3a
+#define dcs_set_scroll_area            0x33
+#define dcs_set_scroll_start           0x37
+#define dcs_set_tear_off                       0x34
+#define dcs_set_tear_on                        0x35
+#define dcs_set_tear_scanline                  0x44
+#define dcs_soft_reset                                 0x01
+#define dcs_write_LUT                          0x2d
+#define dcs_write_memory_continue      0x3c
+#define dcs_write_memory_start                 0x2c
+
+#ifndef MHz
+#define MHz   1000000
+#endif
+
+
+#if 0
+typedef signed char s8;
+typedef unsigned char u8;
+
+typedef signed short s16;
+typedef unsigned short u16;
+
+typedef signed int s32;
+typedef unsigned int u32;
+
+typedef signed long s64;
+typedef unsigned long u64;
+#endif
+
+
+//iomux
+#define OLD_RK_IOMUX 0
+
+
+#endif /* end of MIPI_DSI_H_ */
diff --git a/include/dt-bindings/display/rk_fb.h b/include/dt-bindings/display/rk_fb.h
new file mode 100755 (executable)
index 0000000..6d75770
--- /dev/null
@@ -0,0 +1,169 @@
+#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
+/********************************************************************
+**          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_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 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)
+
+/* 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/dt-bindings/rkfb/rk_fb.h b/include/dt-bindings/rkfb/rk_fb.h
deleted file mode 100755 (executable)
index 6d75770..0000000
+++ /dev/null
@@ -1,169 +0,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
-/********************************************************************
-**          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_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 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)
-
-/* 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/dt-bindings/rkmipi/mipi_dsi.h b/include/dt-bindings/rkmipi/mipi_dsi.h
deleted file mode 100755 (executable)
index 07a2dce..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-drivers/video/rockchip/transmitter/mipi_dsi.h
-*/
-#ifndef MIPI_DSI_H_
-#define MIPI_DSI_H_
-
-#ifdef CONFIG_MIPI_DSI_FT
-#include "..\..\common\config.h"
-#endif
-
-//DSI DATA TYPE
-#define DTYPE_DCS_SWRITE_0P            0x05 
-#define DTYPE_DCS_SWRITE_1P            0x15 
-#define DTYPE_DCS_LWRITE               0x39 
-#define DTYPE_GEN_LWRITE               0x29 
-#define DTYPE_GEN_SWRITE_2P            0x23 
-#define DTYPE_GEN_SWRITE_1P            0x13
-#define DTYPE_GEN_SWRITE_0P            0x03
-
-//command transmit mode
-#define HSDT                   0x00
-#define LPDT                   0x01
-
-//DSI DATA TYPE FLAG
-#define DATA_TYPE_DCS                  0x00
-#define DATA_TYPE_GEN                  0x01
-
-//Video Mode
-#define VM_NBMWSP              0x00  //Non burst mode with sync pulses
-#define VM_NBMWSE              0x01  //Non burst mode with sync events
-#define VM_BM                  0x02  //Burst mode
-
-//Video Pixel Format
-#define VPF_16BPP              0x00
-#define VPF_18BPP              0x01     //packed
-#define VPF_18BPPL             0x02     //loosely packed
-#define VPF_24BPP              0x03
-
-//Display Command Set
-#define dcs_enter_idle_mode            0x39
-#define dcs_enter_invert_mode          0x21
-#define dcs_enter_normal_mode          0x13
-#define dcs_enter_partial_mode         0x12
-#define dcs_enter_sleep_mode           0x10
-#define dcs_exit_idle_mode             0x38
-#define dcs_exit_invert_mode           0x20
-#define dcs_exit_sleep_mode            0x11
-#define dcs_get_address_mode           0x0b
-#define dcs_get_blue_channel           0x08
-#define dcs_get_diagnostic_result      0x0f
-#define dcs_get_display_mode           0x0d
-#define dcs_get_green_channel                  0x07
-#define dcs_get_pixel_format           0x0c
-#define dcs_get_power_mode             0x0a
-#define dcs_get_red_channel            0x06
-#define dcs_get_scanline                       0x45
-#define dcs_get_signal_mode            0x0e
-#define dcs_nop                                                0x00
-#define dcs_read_DDB_continue                  0xa8
-#define dcs_read_DDB_start             0xa1
-#define dcs_read_memory_continue       0x3e
-#define dcs_read_memory_start                  0x2e
-#define dcs_set_address_mode           0x36
-#define dcs_set_column_address         0x2a
-#define dcs_set_display_off            0x28
-#define dcs_set_display_on             0x29
-#define dcs_set_gamma_curve            0x26
-#define dcs_set_page_address           0x2b
-#define dcs_set_partial_area           0x30
-#define dcs_set_pixel_format           0x3a
-#define dcs_set_scroll_area            0x33
-#define dcs_set_scroll_start           0x37
-#define dcs_set_tear_off                       0x34
-#define dcs_set_tear_on                        0x35
-#define dcs_set_tear_scanline                  0x44
-#define dcs_soft_reset                                 0x01
-#define dcs_write_LUT                          0x2d
-#define dcs_write_memory_continue      0x3c
-#define dcs_write_memory_start                 0x2c
-
-#ifndef MHz
-#define MHz   1000000
-#endif
-
-
-#if 0
-typedef signed char s8;
-typedef unsigned char u8;
-
-typedef signed short s16;
-typedef unsigned short u16;
-
-typedef signed int s32;
-typedef unsigned int u32;
-
-typedef signed long s64;
-typedef unsigned long u64;
-#endif
-
-
-//iomux
-#define OLD_RK_IOMUX 0
-
-
-#endif /* end of MIPI_DSI_H_ */