From: zwl Date: Tue, 21 Oct 2014 10:46:24 +0000 (+0800) Subject: rk312x:lcdc: X-Git-Tag: firefly_0821_release~4547 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be4d73a13326be4ea5909e31573a4d400aa11b08;p=firefly-linux-kernel-4.4.55.git rk312x:lcdc: * fix screen flash when suspend like at charge ui init or pcba ui init * set uboot logo on as open at dst node Signed-off-by: zwl --- diff --git a/arch/arm/boot/dts/rk3126-86v.dts b/arch/arm/boot/dts/rk3126-86v.dts index 5b5dcbcdf379..d42823efb1b0 100644 --- a/arch/arm/boot/dts/rk3126-86v.dts +++ b/arch/arm/boot/dts/rk3126-86v.dts @@ -4,7 +4,7 @@ / { compatible = "rockchip,rk3126"; - backlight { + backlight: backlight { compatible = "pwm-backlight"; pwms = <&pwm0 0 25000>; brightness-levels = <255 169 168 168 167 166 166 165 164 164 163 162 162 161 160 160 159 158 158 157 156 156 155 154 154 153 152 152 151 150 150 149 148 148 147 146 146 145 144 144 143 142 142 141 140 140 139 138 138 137 136 136 135 134 134 133 132 132 131 130 130 129 128 128 127 126 126 125 124 124 123 122 122 121 120 120 119 118 118 117 116 116 115 114 114 113 112 112 111 110 110 109 108 108 107 106 106 105 104 104 103 102 102 101 100 100 99 98 98 97 96 96 95 94 94 93 92 92 91 90 90 89 88 88 87 86 86 85 84 84 83 82 82 81 80 80 79 78 78 77 76 76 75 74 74 73 72 72 71 70 70 69 68 68 67 66 66 65 64 64 63 62 62 61 60 60 59 58 58 57 56 56 55 54 54 53 52 52 51 50 50 49 48 48 47 46 46 45 44 44 43 42 42 41 40 40 39 38 38 37 36 36 35 34 34 33 32 32 31 30 30 29 28 28 27 26 26 25 24 24 23 22 22 21 20 20 19 18 18 17 16 16 15 14 14 13 12 12 11 10 10 9 8 8 7 6 6 5 4 4 3 2 2 1 1 1 0 >; @@ -176,7 +176,7 @@ &fb { rockchip,disp-mode = ; - rockchip,uboot-logo-on = <0>; + rockchip,uboot-logo-on = <1>; }; &rk_screen { @@ -193,6 +193,7 @@ &lcdc { status = "okay"; + backlight = <&backlight>; pinctrl-names = "default", "gpio"; pinctrl-0 = <&lcdc0_lcdc>; pinctrl-1 = <&lcdc0_gpio>; diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts index 4ad883e47c54..86b44c024d09 100755 --- a/arch/arm/boot/dts/rk3126-sdk.dts +++ b/arch/arm/boot/dts/rk3126-sdk.dts @@ -3,7 +3,7 @@ / { compatible = "rockchip,rk3126"; - backlight { + backlight: backlight { compatible = "pwm-backlight"; pwms = <&pwm0 0 25000>; brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>; @@ -39,7 +39,7 @@ &fb { rockchip,disp-mode = ; - rockchip,uboot-logo-on = <0>; + rockchip,uboot-logo-on = <1>; }; &rk_screen { @@ -56,6 +56,7 @@ &lcdc { status = "okay"; + backlight = <&backlight>; pinctrl-names = "default", "gpio"; pinctrl-0 = <&lcdc0_lcdc>; pinctrl-1 = <&lcdc0_gpio>; diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts index 1c8a39ac9af8..3bbb9b85f2c6 100755 --- a/arch/arm/boot/dts/rk3128-sdk.dts +++ b/arch/arm/boot/dts/rk3128-sdk.dts @@ -24,6 +24,7 @@ &fb { rockchip,disp-mode = ; + rockchip,uboot-logo-on = <1>; }; &rk_screen { diff --git a/drivers/video/rockchip/lcdc/rk312x_lcdc.c b/drivers/video/rockchip/lcdc/rk312x_lcdc.c index 130b82ab9bd1..3b5619b44a27 100755 --- a/drivers/video/rockchip/lcdc/rk312x_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk312x_lcdc.c @@ -1653,12 +1653,42 @@ static int rk312x_lcdc_ovl_mgr(struct rk_lcdc_driver *dev_drv, int swap, return ovl; } +static int rk312x_lcdc_get_backlight_device(struct rk_lcdc_driver *dev_drv) +{ + struct lcdc_device *lcdc_dev = container_of(dev_drv, + struct lcdc_device, driver); + struct device_node *backlight; + + if (lcdc_dev->backlight) + return 0; + + backlight = of_parse_phandle(lcdc_dev->dev->of_node, + "backlight", 0); + if (backlight) { + lcdc_dev->backlight = of_find_backlight_by_node(backlight); + if (!lcdc_dev->backlight) + dev_info(lcdc_dev->dev, "No find backlight device\n"); + } else { + dev_info(lcdc_dev->dev, "No find backlight device node\n"); + } + + return 0; +} + static int rk312x_lcdc_early_suspend(struct rk_lcdc_driver *dev_drv) { struct lcdc_device *lcdc_dev = container_of(dev_drv, struct lcdc_device, driver); if (dev_drv->suspend_flag) return 0; + + /* close the backlight */ + rk312x_lcdc_get_backlight_device(dev_drv); + if (lcdc_dev->backlight) { + lcdc_dev->backlight->props.fb_blank = FB_BLANK_POWERDOWN; + backlight_update_status(lcdc_dev->backlight); + } + dev_drv->suspend_flag = 1; flush_kthread_worker(&dev_drv->update_regs_worker); @@ -2329,18 +2359,8 @@ static int rk312x_lcdc_dsp_black(struct rk_lcdc_driver *dev_drv, int enable) { struct lcdc_device *lcdc_dev = container_of(dev_drv, struct lcdc_device, driver); - struct device_node *backlight; - if (!lcdc_dev->backlight) { - backlight = of_parse_phandle(lcdc_dev->dev->of_node, - "backlight", 0); - if (backlight) { - lcdc_dev->backlight = - of_find_backlight_by_node(backlight); - if (!lcdc_dev->backlight) - dev_info(lcdc_dev->dev, "No find backlight device\n"); - } - } + rk312x_lcdc_get_backlight_device(dev_drv); if (enable) { /* close the backlight */