Commit 9bbd4b9f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull DeviceTree updates from Rob Herring:
 "A fairly large (by DT standards) pull request this time with the
  majority being some overdue moving DT binding docs around to
  consolidate similar bindings.

   - DT binding doc consolidation moving similar bindings to common
     locations.  The majority of these are display related which were
     scattered in video/, fb/, drm/, gpu/, and panel/ directories.

   - Add new config option, CONFIG_OF_ALL_DTBS, to enable building all
     dtbs in the tree for most arches with dts files (except powerpc for
     now).

   - OF_IRQ=n fixes for user enabled CONFIG_OF.

   - of_node_put ref counting fixes from Julia Lawall.

   - Common DT binding for wakeup-source and deprecation of all similar
     bindings.

   - DT binding for PXA LCD controller.

   - Allow ignoring failed PCI resource translations in order to ignore
     64-bit addresses on non-LPAE 32-bit kernels.

   - Support setting the NUMA node from DT instead of only from parent
     device.

   - Couple of earlycon DT parsing fixes for address and options"

* tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
  MAINTAINERS: update DT binding doc locations
  devicetree: add Sigma Designs vendor prefix
  of: simplify arch_find_n_match_cpu_physical_id() function
  Documentation: arm: Fixed typo in socfpga fpga mgr example
  Documentation: devicetree: fix reference to legacy wakeup properties
  Documentation: devicetree: standardize/consolidate on "wakeup-source" property
  drivers: of: removing assignment of 0 to static variable
  xtensa: enable building of all dtbs
  mips: enable building of all dtbs
  metag: enable building of all dtbs
  metag: use common make variables for dtb builds
  h8300: enable building of all dtbs
  arm64: enable building of all dtbs
  arm: enable building of all dtbs
  arc: enable building of all dtbs
  arc: use common make variables for dtb builds
  of: add config option to enable building of all dtbs
  of/fdt: fix error checking for earlycon address
  of/overlay: add missing of_node_put
  of/platform: add missing of_node_put
  ...
parents 3e069ada 2d799dde
...@@ -441,7 +441,7 @@ EXAMPLE: ...@@ -441,7 +441,7 @@ EXAMPLE:
regmap = <&snvs>; regmap = <&snvs>;
interrupts = <0 4 0x4> interrupts = <0 4 0x4>
linux,keycode = <116>; /* KEY_POWER */ linux,keycode = <116>; /* KEY_POWER */
wakeup; wakeup-source;
}; };
===================================================================== =====================================================================
...@@ -530,7 +530,7 @@ FULL EXAMPLE ...@@ -530,7 +530,7 @@ FULL EXAMPLE
regmap = <&sec_mon>; regmap = <&sec_mon>;
interrupts = <0 4 0x4>; interrupts = <0 4 0x4>;
linux,keycode = <116>; /* KEY_POWER */ linux,keycode = <116>; /* KEY_POWER */
wakeup; wakeup-source;
}; };
}; };
......
...@@ -14,8 +14,8 @@ Required properties: ...@@ -14,8 +14,8 @@ Required properties:
-port@[X]: SoC specific port nodes with endpoint definitions as defined -port@[X]: SoC specific port nodes with endpoint definitions as defined
in Documentation/devicetree/bindings/media/video-interfaces.txt, in Documentation/devicetree/bindings/media/video-interfaces.txt,
please refer to the SoC specific binding document: please refer to the SoC specific binding document:
* Documentation/devicetree/bindings/drm/imx/hdmi.txt * Documentation/devicetree/bindings/display/imx/hdmi.txt
* Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt * Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
Optional properties Optional properties
- reg-io-width: the width of the reg:1,4, default set to 1 if not present - reg-io-width: the width of the reg:1,4, default set to 1 if not present
......
...@@ -6,7 +6,7 @@ Required properties: ...@@ -6,7 +6,7 @@ Required properties:
location and size of the framebuffer memory. location and size of the framebuffer memory.
- clocks : phandle + clock specifier pair of the FB reference clock. - clocks : phandle + clock specifier pair of the FB reference clock.
- display : phandle to a display node as described in - display : phandle to a display node as described in
Documentation/devicetree/bindings/video/display-timing.txt. Documentation/devicetree/bindings/display/display-timing.txt.
Additionally, the display node has to define properties: Additionally, the display node has to define properties:
- bits-per-pixel: Bits per pixel. - bits-per-pixel: Bits per pixel.
- ac-prescale : LCD AC bias frequency. This frequency is the required - ac-prescale : LCD AC bias frequency. This frequency is the required
......
...@@ -38,7 +38,7 @@ Optional Properties: ...@@ -38,7 +38,7 @@ Optional Properties:
Can be used in case timings cannot be provided otherwise Can be used in case timings cannot be provided otherwise
or to override timings provided by the panel. or to override timings provided by the panel.
[1]: Documentation/devicetree/bindings/video/display-timing.txt [1]: Documentation/devicetree/bindings/display/display-timing.txt
Example: Example:
......
...@@ -50,7 +50,7 @@ Required properties for dp-controller: ...@@ -50,7 +50,7 @@ Required properties for dp-controller:
number of lanes supported by the panel. number of lanes supported by the panel.
LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4 LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4
- display-timings: timings for the connected panel as described by - display-timings: timings for the connected panel as described by
Documentation/devicetree/bindings/video/display-timing.txt Documentation/devicetree/bindings/display/display-timing.txt
Optional properties for dp-controller: Optional properties for dp-controller:
-interlaced: -interlaced:
......
...@@ -49,7 +49,7 @@ Video interfaces: ...@@ -49,7 +49,7 @@ Video interfaces:
mode mode
- samsung,esc-clock-frequency: specifies DSI frequency in escape mode - samsung,esc-clock-frequency: specifies DSI frequency in escape mode
[1]: Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt [1]: Documentation/devicetree/bindings/display/mipi-dsi-bus.txt
[2]: Documentation/devicetree/bindings/media/video-interfaces.txt [2]: Documentation/devicetree/bindings/media/video-interfaces.txt
Example: Example:
......
...@@ -82,7 +82,7 @@ in [2]. The following are properties specific to those nodes: ...@@ -82,7 +82,7 @@ in [2]. The following are properties specific to those nodes:
3 - for parallel output, 3 - for parallel output,
4 - for write-back interface 4 - for write-back interface
[1]: Documentation/devicetree/bindings/video/display-timing.txt [1]: Documentation/devicetree/bindings/display/display-timing.txt
[2]: Documentation/devicetree/bindings/media/video-interfaces.txt [2]: Documentation/devicetree/bindings/media/video-interfaces.txt
Example: Example:
......
...@@ -9,7 +9,7 @@ Required properties: ...@@ -9,7 +9,7 @@ Required properties:
Required nodes: Required nodes:
- display: Phandle to a display node as described in - 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: Additional, the display node has to define properties:
- bits-per-pixel: Bits per pixel - bits-per-pixel: Bits per pixel
- fsl,pcr: LCDC PCR value - fsl,pcr: LCDC PCR value
......
...@@ -63,7 +63,7 @@ Required properties: ...@@ -63,7 +63,7 @@ Required properties:
Optional properties (required if display-timings are used): Optional properties (required if display-timings are used):
- display-timings : A node that describes the display timings as defined in - display-timings : A node that describes the display timings as defined in
Documentation/devicetree/bindings/video/display-timing.txt. Documentation/devicetree/bindings/display/display-timing.txt.
- fsl,data-mapping : should be "spwg" or "jeida" - fsl,data-mapping : should be "spwg" or "jeida"
This describes how the color bits are laid out in the This describes how the color bits are laid out in the
serialized LVDS signal. serialized LVDS signal.
......
PXA LCD Controller
------------------
Required properties:
- compatible : one of these
"marvell,pxa2xx-lcdc",
"marvell,pxa270-lcdc",
"marvell,pxa300-lcdc"
- reg : should contain 1 register range (address and length).
- interrupts : framebuffer controller interrupt.
- clocks: phandle to input clocks
Required nodes:
- port: connection to the LCD panel (see video-interfaces.txt)
This node must have its properties bus-width and remote-endpoint set.
If the panel is not a TFT color panel, then a "lcd-type" property in
the panel should specify the panel type.
This panel node should be in the board dts.
Example:
lcd-controller@40500000 {
compatible = "marvell,pxa2xx-lcdc";
reg = <0x44000000 0x10000>;
interrupts = <17>;
clocks = <&clks CLK_LCD>;
status = "okay";
port {
lcdc_out: endpoint {
remote-endpoint = <&panel_in>;
bus-width = <16>;
};
};
};
...@@ -28,7 +28,7 @@ Required properties: ...@@ -28,7 +28,7 @@ Required properties:
Optional properties: Optional properties:
- panel@0: Node of panel connected to this DSI controller. - panel@0: Node of panel connected to this DSI controller.
See files in Documentation/devicetree/bindings/panel/ for each supported See files in Documentation/devicetree/bindings/display/panel/ for each supported
panel. panel.
- qcom,dual-dsi-mode: Boolean value indicating if the DSI controller is - qcom,dual-dsi-mode: Boolean value indicating if the DSI controller is
driving a panel which needs 2 DSI links. driving a panel which needs 2 DSI links.
......
...@@ -10,7 +10,7 @@ Optional properties: ...@@ -10,7 +10,7 @@ Optional properties:
Required nodes: Required nodes:
- "panel-timing" containing video timings - "panel-timing" containing video timings
(Documentation/devicetree/bindings/video/display-timing.txt) (Documentation/devicetree/bindings/display/display-timing.txt)
- Video port for DPI input - Video port for DPI input
Example Example
......
...@@ -20,7 +20,7 @@ The device node can contain one 'port' child node with one child ...@@ -20,7 +20,7 @@ The device node can contain one 'port' child node with one child
'endpoint' node, according to the bindings defined in [3]. This 'endpoint' node, according to the bindings defined in [3]. This
node should describe panel's video bus. node should describe panel's video bus.
[1]: Documentation/devicetree/bindings/video/display-timing.txt [1]: Documentation/devicetree/bindings/display/display-timing.txt
[2]: Documentation/devicetree/bindings/spi/spi-bus.txt [2]: Documentation/devicetree/bindings/spi/spi-bus.txt
[3]: Documentation/devicetree/bindings/media/video-interfaces.txt [3]: Documentation/devicetree/bindings/media/video-interfaces.txt
......
...@@ -21,7 +21,7 @@ The device node can contain one 'port' child node with one child ...@@ -21,7 +21,7 @@ The device node can contain one 'port' child node with one child
'endpoint' node, according to the bindings defined in [2]. This 'endpoint' node, according to the bindings defined in [2]. This
node should describe panel's video bus. node should describe panel's video bus.
[1]: Documentation/devicetree/bindings/video/display-timing.txt [1]: Documentation/devicetree/bindings/display/display-timing.txt
[2]: Documentation/devicetree/bindings/media/video-interfaces.txt [2]: Documentation/devicetree/bindings/media/video-interfaces.txt
Example: Example:
......
...@@ -9,7 +9,7 @@ Required properties: ...@@ -9,7 +9,7 @@ Required properties:
- compatible: Should be "rockchip,display-subsystem" - compatible: Should be "rockchip,display-subsystem"
- ports: Should contain a list of phandles pointing to display interface port - ports: Should contain a list of phandles pointing to display interface port
of vop devices. vop definitions as defined in of vop devices. vop definitions as defined in
Documentation/devicetree/bindings/video/rockchip-vop.txt Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt
example: example:
......
...@@ -61,7 +61,7 @@ STMicroelectronics stih4xx platforms ...@@ -61,7 +61,7 @@ STMicroelectronics stih4xx platforms
- reg-names: names of the mapped memory regions listed in regs property in - reg-names: names of the mapped memory regions listed in regs property in
the same order. the same order.
- interrupts : HDMI interrupt number to the CPU. - interrupts : HDMI interrupt number to the CPU.
- interrupt-names: name of the interrupts listed in interrupts property in - interrupt-names: names of the interrupts listed in interrupts property in
the same order the same order
- clocks: from common clock binding: handle hardware IP needed clocks, the - clocks: from common clock binding: handle hardware IP needed clocks, the
number of clocks may depend of the SoC type. number of clocks may depend of the SoC type.
...@@ -95,7 +95,7 @@ sti-dvo: ...@@ -95,7 +95,7 @@ sti-dvo:
- clock-names: names of the clocks listed in clocks property in the same - clock-names: names of the clocks listed in clocks property in the same
order. order.
- pinctrl-0: pin control handle - pinctrl-0: pin control handle
- pinctrl-name: names of the pin control to use - pinctrl-names: names of the pin control states to use
- sti,panel: phandle of the panel connected to the DVO output - sti,panel: phandle of the panel connected to the DVO output
sti-hqvdp: sti-hqvdp:
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment