Skip to content

Commit be5165a

Browse files
committed
Merge tag 'devicetree-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring: "Pretty standard stuff with dtc upstream sync being the biggest piece. - Sync dtc to upstream commit 0931cea3ba20. This picks up overlay support in dtc. - Set dma_ops for reserved memory users. - Make references to IOMMU consistent in DT bindings. - Cleanup references to pm_power_off in bindings. - Move some display bindings that snuck into the old bindings/video/ path. - Fix some wrong documentation paths caused from binding restructuring. - Vendor prefixes for Faraday and Fujitsu. - Fix an of_node ref counting leak in of_find_node_opts_by_path - Introduce new graph helper of_graph_get_remote_node() which will be used by DRM drivers in 4.12" * tag 'devicetree-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (27 commits) DT: add Faraday Tec. as vendor of: introduce of_graph_get_remote_node of: Add missing space at end of pr_fmt(). of: make of_device_make_bus_id() static of: fix of_node leak caused in of_find_node_opts_by_path dt-bindings: net: remove reference to fixed link support dt-bindings: power: reset: qnap-poweroff: Drop reference to pm_power_off dt-bindings: power: reset: gpio-poweroff: Drop reference to pm_power_off dt-bindings: mfd: as3722: Drop reference to pm_power_off dt-bindings: display: move ANX7814 and SiI8620 bridge bindings of/unittest: Swap arguments of of_unittest_apply_overlay() Documentation: usb: fix wrong documentation paths serial: fsl-imx-uart.txt: Remove generic property devicetree: Add Fujitsu Ltd. vendor prefix Documentation: display: fix wrong documentation paths of: remove redundant memset in overlay bus:qcom : Fix typo in qcom,ebi2.txt dt-bindings: qman: Remove pool channel node Documentation: panel-dpi: fix path to display-timing.txt devicetree: bindings: clk: mvebu: fix description for sata1 on Armada XP ...
2 parents c1aac62 + 4e29ccd commit be5165a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1781
-1100
lines changed

Documentation/devicetree/bindings/bus/qcom,ebi2.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Required properties:
5151
- compatible: should be one of:
5252
"qcom,msm8660-ebi2"
5353
"qcom,apq8060-ebi2"
54-
- #address-cells: shoule be <2>: the first cell is the chipselect,
54+
- #address-cells: should be <2>: the first cell is the chipselect,
5555
the second cell is the offset inside the memory range
5656
- #size-cells: should be <1>
5757
- ranges: should be set to:
@@ -64,7 +64,7 @@ Required properties:
6464
- reg: two ranges of registers: EBI2 config and XMEM config areas
6565
- reg-names: should be "ebi2", "xmem"
6666
- clocks: two clocks, EBI_2X and EBI
67-
- clock-names: shoule be "ebi2x", "ebi2"
67+
- clock-names: should be "ebi2x", "ebi2"
6868

6969
Optional subnodes:
7070
- Nodes inside the EBI2 will be considered device nodes.
@@ -100,7 +100,7 @@ Optional properties arrays for FAST chip selects:
100100
assertion, with respect to the cycle where ADV (address valid) is asserted.
101101
2 means 2 cycles between ADV and OE. Valid values 0, 1, 2 or 3.
102102
- qcom,xmem-read-hold-cycles: the length in cycles of the first segment of a
103-
read transfer. For a single read trandfer this will be the time from CS
103+
read transfer. For a single read transfer this will be the time from CS
104104
assertion to OE assertion. Valid values 0 thru 15.
105105

106106

Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ ID Clock Peripheral
117117
25 tdm Time Division Mplx
118118
28 xor1 XOR DMA 1
119119
29 sata1lnk
120-
30 sata1 SATA Host 0
120+
30 sata1 SATA Host 1
121121

122122
The following is a list of provided IDs for Dove:
123123
ID Clock Peripheral

Documentation/devicetree/bindings/display/arm,pl11x.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Required properties:
2222

2323
- clocks: contains phandle and clock specifier pairs for the entries
2424
in the clock-names property. See
25-
Documentation/devicetree/binding/clock/clock-bindings.txt
25+
Documentation/devicetree/bindings/clock/clock-bindings.txt
2626

2727
Optional properties:
2828

Documentation/devicetree/bindings/display/bridge/analogix_dp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Optional properties for dp-controller:
3333
in Documentation/devicetree/bindings/media/video-interfaces.txt,
3434
please refer to the SoC specific binding document:
3535
* Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
36-
* Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt
36+
* Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
3737

3838
[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
3939
-------------------------------------------------------------------------------
File renamed without changes.
File renamed without changes.

Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Required properties:
66
location and size of the framebuffer memory.
77
- clocks : phandle + clock specifier pair of the FB reference clock.
88
- display : phandle to a display node as described in
9-
Documentation/devicetree/bindings/display/display-timing.txt.
9+
Documentation/devicetree/bindings/display/panel/display-timing.txt.
1010
Additionally, the display node has to define properties:
1111
- bits-per-pixel: Bits per pixel.
1212
- ac-prescale : LCD AC bias frequency. This frequency is the required

Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Optional Properties:
3838
Can be used in case timings cannot be provided otherwise
3939
or to override timings provided by the panel.
4040

41-
[1]: Documentation/devicetree/bindings/display/display-timing.txt
41+
[1]: Documentation/devicetree/bindings/display/panel/display-timing.txt
4242

4343
Example:
4444

Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ in [2]. The following are properties specific to those nodes:
8383
3 - for parallel output,
8484
4 - for write-back interface
8585

86-
[1]: Documentation/devicetree/bindings/display/display-timing.txt
86+
[1]: Documentation/devicetree/bindings/display/panel/display-timing.txt
8787
[2]: Documentation/devicetree/bindings/media/video-interfaces.txt
8888

8989
Example:

Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Required properties:
99

1010
Required nodes:
1111
- display: Phandle to a display node as described in
12-
Documentation/devicetree/bindings/display/display-timing.txt
12+
Documentation/devicetree/bindings/display/panel/display-timing.txt
1313
Additional, the display node has to define properties:
1414
- bits-per-pixel: Bits per pixel
1515
- fsl,pcr: LCDC PCR value

0 commit comments

Comments
 (0)