Advertisement
Guest User

Untitled

a guest
Sep 29th, 2016
49
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.81 KB | None | 0 0
  1. diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
  2. index bddc8b17a4d8..76470de1c780 100644
  3. --- a/drivers/video/backlight/backlight.c
  4. +++ b/drivers/video/backlight/backlight.c
  5. @@ -564,6 +564,15 @@ struct backlight_device *of_find_backlight_by_node(struct device_node *node)
  6. return dev ? to_backlight_device(dev) : NULL;
  7. }
  8. EXPORT_SYMBOL(of_find_backlight_by_node);
  9. +
  10. +int of_backlight_initial_power_state(struct device_node *node)
  11. +{
  12. + if (of_property_read_bool(node, "default-off"))
  13. + return FB_BLANK_POWERDOWN;
  14. +
  15. + return FB_BLANK_UNBLANK;
  16. +}
  17. +EXPORT_SYMBOL(of_backlight_initial_power_state);
  18. #endif
  19.  
  20. static void __exit backlight_class_exit(void)
  21. diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
  22. index ae3c6b6fd5db..fabcf0f20a13 100644
  23. --- a/drivers/video/backlight/pwm_bl.c
  24. +++ b/drivers/video/backlight/pwm_bl.c
  25. @@ -320,6 +320,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
  26. }
  27.  
  28. bl->props.brightness = data->dft_brightness;
  29. + bl->props.power = of_backlight_initial_power_state(pdev->dev.of_node);
  30. backlight_update_status(bl);
  31.  
  32. platform_set_drvdata(pdev, bl);
  33. diff --git a/include/linux/backlight.h b/include/linux/backlight.h
  34. index 1e7a69adbe6f..0981401fa858 100644
  35. --- a/include/linux/backlight.h
  36. +++ b/include/linux/backlight.h
  37. @@ -163,12 +163,18 @@ struct generic_bl_info {
  38.  
  39. #ifdef CONFIG_OF
  40. struct backlight_device *of_find_backlight_by_node(struct device_node *node);
  41. +int of_backlight_initial_power_state(struct device_node *node);
  42. #else
  43. static inline struct backlight_device *
  44. of_find_backlight_by_node(struct device_node *node)
  45. {
  46. return NULL;
  47. }
  48. +
  49. +static inline int of_backlight_initial_power_state(struct device_node *node)
  50. +{
  51. + return FB_BLANK_UNBLANK;
  52. +}
  53. #endif
  54.  
  55. #endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement