]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
drm: xilinx: Add the 'xlnx' prefix to dt properties
authorHyun Kwon <hyun.kwon@xilinx.com>
Tue, 6 May 2014 02:52:37 +0000 (19:52 -0700)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 8 May 2014 16:01:22 +0000 (18:01 +0200)
Add the 'xlnx' prefix to Xilinx IP core specific properties.

Signed-off-by: Hyun Kwon <hyunk@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
drivers/gpu/drm/xilinx/xilinx_drm_encoder.c
drivers/gpu/drm/xilinx/xilinx_drm_plane.c

index f32d0edb23a6acbbdb1bfcdd088e7199895815c8..4bc556d806ef4a55066ecbbdedcdc4e6957a9aca 100644 (file)
@@ -482,7 +482,7 @@ struct drm_crtc *xilinx_drm_crtc_create(struct drm_device *drm)
                return ERR_PTR(-ENOMEM);
 
        /* probe chroma resampler and enable */
-       sub_node = of_parse_phandle(drm->dev->of_node, "cresample", 0);
+       sub_node = of_parse_phandle(drm->dev->of_node, "xlnx,cresample", 0);
        if (sub_node) {
                crtc->cresample = xilinx_cresample_probe(drm->dev, sub_node);
                of_node_put(sub_node);
@@ -493,7 +493,7 @@ struct drm_crtc *xilinx_drm_crtc_create(struct drm_device *drm)
        }
 
        /* probe color space converter and enable */
-       sub_node = of_parse_phandle(drm->dev->of_node, "rgb2yuv", 0);
+       sub_node = of_parse_phandle(drm->dev->of_node, "xlnx,rgb2yuv", 0);
        if (sub_node) {
                crtc->rgb2yuv = xilinx_rgb2yuv_probe(drm->dev, sub_node);
                of_node_put(sub_node);
@@ -535,7 +535,7 @@ struct drm_crtc *xilinx_drm_crtc_create(struct drm_device *drm)
                goto err_out;
        }
 
-       sub_node = of_parse_phandle(drm->dev->of_node, "vtc", 0);
+       sub_node = of_parse_phandle(drm->dev->of_node, "xlnx,vtc", 0);
        if (!sub_node) {
                DRM_ERROR("failed to get a video timing controller node\n");
                ret = -ENODEV;
index 7513f74280c657c0f8100253a4c1332d9d3782ce..5ab0a14bb336d18a39d0c51d8a048901fd9539ed 100644 (file)
@@ -182,7 +182,7 @@ struct drm_encoder *xilinx_drm_encoder_create(struct drm_device *drm)
                               &xilinx_drm_encoder_helper_funcs);
 
        /* get slave encoder */
-       sub_node = of_parse_phandle(drm->dev->of_node, "encoder-slave", 0);
+       sub_node = of_parse_phandle(drm->dev->of_node, "xlnx,encoder-slave", 0);
        if (!sub_node) {
                DRM_ERROR("failed to get an encoder slave node\n");
                return ERR_PTR(-ENODEV);
index 7334c3fa2bcedc888bd33de047c382d849025c1f..ff05b4c51acd4ee68c11e8daeb8db8acf6842850 100644 (file)
@@ -634,7 +634,7 @@ xilinx_drm_plane_create(struct xilinx_drm_plane_manager *manager,
        }
 
        /* probe color space converter */
-       sub_node = of_parse_phandle(plane_node, "rgb2yuv", i);
+       sub_node = of_parse_phandle(plane_node, "xlnx,rgb2yuv", i);
        if (sub_node) {
                plane->rgb2yuv = xilinx_rgb2yuv_probe(dev, sub_node);
                of_node_put(sub_node);
@@ -652,7 +652,7 @@ xilinx_drm_plane_create(struct xilinx_drm_plane_manager *manager,
        }
 
        /* probe chroma resampler */
-       sub_node = of_parse_phandle(plane_node, "cresample", i);
+       sub_node = of_parse_phandle(plane_node, "xlnx,cresample", i);
        if (sub_node) {
                plane->cresample = xilinx_cresample_probe(dev, sub_node);
                of_node_put(sub_node);
@@ -854,7 +854,7 @@ xilinx_drm_plane_probe_manager(struct drm_device *drm)
        manager->drm = drm;
 
        /* probe an OSD. proceed even if there's no OSD */
-       sub_node = of_parse_phandle(dev->of_node, "osd", 0);
+       sub_node = of_parse_phandle(dev->of_node, "xlnx,osd", 0);
        if (sub_node) {
                manager->osd = xilinx_osd_probe(dev, sub_node);
                of_node_put(sub_node);