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 /drivers/video | |
| parent | d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1 (diff) | |
| parent | 85e8f8d175caa6a39f4c4e11dd4d0ab038f43324 (diff) | |
| download | linux-1a3865d64a0d8151c7fe23f4b57a587615ccc5bb.tar.bz2 | |
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 'drivers/video')
| -rw-r--r-- | drivers/video/of_display_timing.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c index db992c684f09..32b0a7543433 100644 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@ -119,7 +119,7 @@ static int of_parse_display_timing(const struct device_node *np, * @name: name of the timing node * @dt: display_timing struct to fill **/ -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 device_node *timing_np; @@ -142,7 +142,7 @@ EXPORT_SYMBOL_GPL(of_get_display_timing); * of_get_display_timings - parse all display_timing entries from a device_node * @np: device_node with the subnodes **/ -struct display_timings *of_get_display_timings(struct device_node *np) +struct display_timings *of_get_display_timings(const struct device_node *np) { struct device_node *timings_np; struct device_node *entry; @@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(of_get_display_timings); * of_display_timings_exist - check if a display-timings node is provided * @np: device_node with the timing **/ -int of_display_timings_exist(struct device_node *np) +int of_display_timings_exist(const struct device_node *np) { struct device_node *timings_np; |