From f92fcd1ceb52010ebb14dbdb0d828ad2f0a3f5c0 Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Tue, 21 Oct 2014 17:31:57 +0800 Subject: [PATCH] fb: Define dts node disp-policy vale: DISPLAY_POLICY_SDK DISPLAY_POLICY_BOX --- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3128-box-rk88.dts | 2 +- arch/arm/boot/dts/rk3128-box.dts | 2 +- include/dt-bindings/rkfb/rk_fb.h | 3 +++ include/linux/rk_fb.h | 5 ----- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 4d59287f31c6..2747643fb9cc 100755 --- 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 = ; - rockchip,disp-policy = <1>; + rockchip,disp-policy = ; }; 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 18bfc2439f2f..3547bd3af8cf 100755 --- 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 = ; - rockchip,disp-policy = <1>; + rockchip,disp-policy = ; rockchip,uboot-logo-on = <1>; }; diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts index 4b54fb7b43a3..f4c564d62af5 100755 --- a/arch/arm/boot/dts/rk3128-box.dts +++ b/arch/arm/boot/dts/rk3128-box.dts @@ -213,7 +213,7 @@ &fb { rockchip,disp-mode = ; - rockchip,disp-policy = <1>; + rockchip,disp-policy = ; rockchip,uboot-logo-on = <1>; }; diff --git a/include/dt-bindings/rkfb/rk_fb.h b/include/dt-bindings/rkfb/rk_fb.h index f05d165e873d..65190b00f8e5 100755 --- 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 56436cc497f5..85959bace47d 100755 --- 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; -- 2.34.1