diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-16 09:39:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-16 09:39:21 +1000 |
| commit | 1a3865d64a0d8151c7fe23f4b57a587615ccc5bb (patch) | |
| tree | c3ad147281f48e85c59d23559485f0e9408ecea7 /include/video | |
| parent | d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1 (diff) | |
| parent | 85e8f8d175caa6a39f4c4e11dd4d0ab038f43324 (diff) | |
| download | op-kernel-dev-1a3865d64a0d8151c7fe23f4b57a587615ccc5bb.zip op-kernel-dev-1a3865d64a0d8151c7fe23f4b57a587615ccc5bb.tar.gz | |
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next
rcar-du -next branch.
* 'drm/next/du' of git://linuxtv.org/pinchartl/media:
drm: rcar-du: Fix LVDS start sequence on Gen3
drm: rcar-du: Fix H/V sync signal polarity configuration
drm: rcar-du: Fix display timing controller parameter
drm: rcar-du: Fix dot clock routing configuration
drm: rcar-du: Add R8A7796 support
drm: rcar-du: Add R8A7792 support
drm: rcar-du: Simplify and fix probe error handling
drm: rcar-du: Fix crash in encoder failure error path
drm: rcar-du: Remove memory allocation error message
drm: rcar-du: Remove test for impossible error condition
drm: rcar-du: Bring HDMI encoder comments in line with the driver
drm: rcar-du: Constify node argument to rcar_du_lvds_connector_init()
video: of: Constify node argument to display timing functions
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/of_display_timing.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/video/of_display_timing.h b/include/video/of_display_timing.h index ea755b5..956455f 100644 --- a/include/video/of_display_timing.h +++ b/include/video/of_display_timing.h @@ -16,21 +16,22 @@ struct display_timings; #define OF_USE_NATIVE_MODE -1 #ifdef CONFIG_OF -int of_get_display_timing(struct device_node *np, const char *name, +int of_get_display_timing(const struct device_node *np, const char *name, struct display_timing *dt); -struct display_timings *of_get_display_timings(struct device_node *np); -int of_display_timings_exist(struct device_node *np); +struct display_timings *of_get_display_timings(const struct device_node *np); +int of_display_timings_exist(const struct device_node *np); #else -static inline int of_get_display_timing(struct device_node *np, const char *name, - struct display_timing *dt) +static inline int of_get_display_timing(const struct device_node *np, + const char *name, struct display_timing *dt) { return -ENOSYS; } -static inline struct display_timings *of_get_display_timings(struct device_node *np) +static inline struct display_timings * +of_get_display_timings(const struct device_node *np) { return NULL; } -static inline int of_display_timings_exist(struct device_node *np) +static inline int of_display_timings_exist(const struct device_node *np) { return -ENOSYS; } |
