fb:

	Define dts node disp-policy vale:
		DISPLAY_POLICY_SDK
		DISPLAY_POLICY_BOX

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 4d59287f31c6b41f0e52461a0236904461db0be1..2747643fb9cc1ac9bb6ee30ab61a100ade699f5a 100755 (executable)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -596,7 +596,7 @@
        fb: fb{
                compatible = "rockchip,rk-fb";
                rockchip,disp-mode = <NO_DUAL>;
-               rockchip,disp-policy = <1>;
+               rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
        };
 
        rk_screen: rk_screen{

diff --git a/arch/arm/boot/dts/rk3128-box-rk88.dts b/arch/arm/boot/dts/rk3128-box-rk88.dts
index 18bfc2439f2f832627b085980774b4eac7b3f8c8..3547bd3af8cfa9a76a63d540a12751dbce5367c3 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -212,7 +212,7 @@
 
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
-       rockchip,disp-policy = <1>;
+       rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
        rockchip,uboot-logo-on = <1>;
 };
 

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index 4b54fb7b43a379f29b04a1d77e6b569be8ca60ad..f4c564d62af5b73e87d7ea9a8840f3ce38659013 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -213,7 +213,7 @@
 
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
-       rockchip,disp-policy = <1>;
+       rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
        rockchip,uboot-logo-on = <1>;
 };
 

diff --git a/include/dt-bindings/rkfb/rk_fb.h b/include/dt-bindings/rkfb/rk_fb.h
index f05d165e873d976ba2789f27b508711264537ae2..65190b00f8e55f408ad57b03d304370160175bce 100755 (executable)
--- a/include/dt-bindings/rkfb/rk_fb.h
+++ b/include/dt-bindings/rkfb/rk_fb.h
@@ -59,6 +59,9 @@
 #define FB0_WIN1_FB1_WIN0_FB2_WIN2     201
 #define FB0_WIN0_FB1_WIN1_FB2_WIN2_FB3_WIN3    3210
 
+#define DISPLAY_POLICY_SDK     0
+#define DISPLAY_POLICY_BOX     1
+
 /*             lvds connect config       
  *                                        
  *             LVDS_8BIT_1    LVDS_8BIT_2     LVDS_8BIT_3     LVDS_6BIT

diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index 56436cc497f5ff88524a37e37d5d6d55db5603a8..85959bace47dfeafd3a0ce89bd75faa5fcdc9c8a 100755 (executable)
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -238,11 +238,6 @@ typedef enum {
        SCREEN_UNPREPARE_DDR_CHANGE,
 } screen_status;
 
-enum {
-       DISPLAY_POLICY_SDK = 0,
-       DISPLAY_POLICY_BOX,
-};
-
 struct rk_fb_rgb {
        struct fb_bitfield red;
        struct fb_bitfield green;