On 10/29/2015 04:40 PM, Heiko Stuebner wrote: > Am Donnerstag, 29. Oktober 2015, 09:12:21 schrieb Yakir Yang: >> Hi Heiko, >> >> On 10/29/2015 04:02 AM, Heiko Stuebner wrote: >>> Hi Yakir, >>> >>> Am Mittwoch, 28. Oktober 2015, 16:26:33 schrieb Yakir Yang: >>>> diff --git >>>> a/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt >>>> b/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt >>>> index 7a3a9cd..9905081 100644 >>>> --- a/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt >>>> +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt >>>> @@ -31,45 +31,31 @@ Required properties for dp-controller: >>>> from general PHY binding: the phandle for the PHY >>>> device. >>>> -phy-names: >>>> from general PHY binding: Should be "dp". >>>> - -samsung,color-space: >>>> - input video data format. >>>> - COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2 >>>> - -samsung,dynamic-range: >>>> - dynamic range for input video data. >>>> - VESA = 0, CEA = 1 >>>> - -samsung,ycbcr-coeff: >>>> - YCbCr co-efficients for input video. >>>> - COLOR_YCBCR601 = 0, COLOR_YCBCR709 = 1 >>>> - -samsung,color-depth: >>>> - number of bits per colour component. >>>> - COLOR_6 = 0, COLOR_8 = 1, COLOR_10 = 2, COLOR_12 = 3 >>>> - -samsung,link-rate: >>>> - link rate supported by the panel. >>>> - LINK_RATE_1_62GBPS = 0x6, LINK_RATE_2_70GBPS = 0x0A >>>> - -samsung,lane-count: >>>> - number of lanes supported by the panel. >>>> - LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4 >>>> - - display-timings: timings for the connected panel as described by >>>> - Documentation/devicetree/bindings/video/display-timing.txt >>> >>> ^^ display/display-timings.txt >>> otherwise this patch does not apply. >> I thought I have deleted this old path of "display-timing.txt", and >> changed it to >> >> - Documentation/devicetree/bindings/video/display-timing.txt > in the changes I got from Rob Hering's dt-branch [0] the path in the file > is already display/display-timing.txt so applying a change with video/... > in it fails. Anyway, as this will probably only make it in after the merge- > window, we can see how this ends up before anyway :-) .
Agree > >> + >> Documentation/devicetree/bindings/display/panel/display-timing.txt >> >> And the real path of "display-timing.txt" in linux-next [tag 20151022] >> do under >> the "display/panel/", those change should be right. > > Heiko > > [0] > https://git.kernel.org/cgit/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=efdbd7345f8836f7495f3ac6ee237d86cb3bb6b0 Found some conflicting things in that commit: He move the display-timing.txt from "video/" to "display/panel" diff --git a/Documentation/devicetree/bindings/video/display-timing.txt b/Documentation/devicetree/bindings/display/panel/display-timing.txt index e1d4a0b..e1d4a0b 100644 --- a/Documentation/devicetree/bindings/video/display-timing.txt <https://git.kernel.org/cgit/linux/kernel/git/robh/linux.git/tree/Documentation/devicetree/bindings/video/display-timing.txt?h=dt/next&id=9ffecb10283508260936b96022d4ee43a7798b4c> +++ b/Documentation/devicetree/bindings/display/panel/display-timing.txt <https://git.kernel.org/cgit/linux/kernel/git/robh/linux.git/tree/Documentation/devicetree/bindings/display/panel/display-timing.txt?h=dt/next&id=efdbd7345f8836f7495f3ac6ee237d86cb3bb6b0> But didn't give the real path to other documents --- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt <https://git.kernel.org/cgit/linux/kernel/git/robh/linux.git/tree/Documentation/devicetree/bindings/video/fsl,imx-fb.txt?h=dt/next&id=9ffecb10283508260936b96022d4ee43a7798b4c> +++ b/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt <https://git.kernel.org/cgit/linux/kernel/git/robh/linux.git/tree/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt?h=dt/next&id=efdbd7345f8836f7495f3ac6ee237d86cb3bb6b0> @@ -9,7 +9,7 @@ Required properties: Required nodes: - display: Phandle to a display node as described in - Documentation/devicetree/bindings/video/display-timing.txt + Documentation/devicetree/bindings/display/display-timing.txt Additional, the display node has to define properties: - bits-per-pixel: Bits per pixel - fsl,pcr: LCDC PCR value Thanks, - Yakir > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20151029/d2b5713b/attachment-0001.html>
