Skip to content

Commit 9d93551

Browse files
dtordtor
committed
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042 drivers.
2 parents dd4cae8 + bfe01a5 commit 9d93551

File tree

925 files changed

+9658
-5139
lines changed

Some content is hidden

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

925 files changed

+9658
-5139
lines changed

‎Documentation/DocBook/media/v4l/compat.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2545,6 +2545,30 @@ fields changed from _s32 to _u32.
25452545
</orderedlist>
25462546
</section>
25472547

2548+
<section>
2549+
<title>V4L2 in Linux 3.16</title>
2550+
<orderedlist>
2551+
<listitem>
2552+
<para>Added event V4L2_EVENT_SOURCE_CHANGE.
2553+
</para>
2554+
</listitem>
2555+
</orderedlist>
2556+
</section>
2557+
2558+
<section>
2559+
<title>V4L2 in Linux 3.17</title>
2560+
<orderedlist>
2561+
<listitem>
2562+
<para>Extended &v4l2-pix-format;. Added format flags.
2563+
</para>
2564+
</listitem>
2565+
<listitem>
2566+
<para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
2567+
</para>
2568+
</listitem>
2569+
</orderedlist>
2570+
</section>
2571+
25482572
<section id="other">
25492573
<title>Relation of V4L2 to other Linux multimedia APIs</title>
25502574

‎Documentation/DocBook/media/v4l/func-poll.xml

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ can suspend execution until the driver has captured data or is ready
2929
to accept data for output.</para>
3030

3131
<para>When streaming I/O has been negotiated this function waits
32-
until a buffer has been filled or displayed and can be dequeued with
33-
the &VIDIOC-DQBUF; ioctl. When buffers are already in the outgoing
34-
queue of the driver the function returns immediately.</para>
32+
until a buffer has been filled by the capture device and can be dequeued
33+
with the &VIDIOC-DQBUF; ioctl. For output devices this function waits
34+
until the device is ready to accept a new buffer to be queued up with
35+
the &VIDIOC-QBUF; ioctl for display. When buffers are already in the outgoing
36+
queue of the driver (capture) or the incoming queue isn't full (display)
37+
the function returns immediately.</para>
3538

3639
<para>On success <function>poll()</function> returns the number of
3740
file descriptors that have been selected (that is, file descriptors
@@ -44,10 +47,22 @@ Capture devices set the <constant>POLLIN</constant> and
4447
flags. When the function timed out it returns a value of zero, on
4548
failure it returns <returnvalue>-1</returnvalue> and the
4649
<varname>errno</varname> variable is set appropriately. When the
47-
application did not call &VIDIOC-QBUF; or &VIDIOC-STREAMON; yet the
50+
application did not call &VIDIOC-STREAMON; the
4851
<function>poll()</function> function succeeds, but sets the
4952
<constant>POLLERR</constant> flag in the
50-
<structfield>revents</structfield> field.</para>
53+
<structfield>revents</structfield> field. When the
54+
application has called &VIDIOC-STREAMON; for a capture device but hasn't
55+
yet called &VIDIOC-QBUF;, the <function>poll()</function> function
56+
succeeds and sets the <constant>POLLERR</constant> flag in the
57+
<structfield>revents</structfield> field. For output devices this
58+
same situation will cause <function>poll()</function> to succeed
59+
as well, but it sets the <constant>POLLOUT</constant> and
60+
<constant>POLLWRNORM</constant> flags in the <structfield>revents</structfield>
61+
field.</para>
62+
63+
<para>If an event occurred (see &VIDIOC-DQEVENT;) then
64+
<constant>POLLPRI</constant> will be set in the <structfield>revents</structfield>
65+
field and <function>poll()</function> will return.</para>
5166

5267
<para>When use of the <function>read()</function> function has
5368
been negotiated and the driver does not capture yet, the
@@ -58,10 +73,18 @@ continuously (as opposed to, for example, still images) the function
5873
may return immediately.</para>
5974

6075
<para>When use of the <function>write()</function> function has
61-
been negotiated the <function>poll</function> function just waits
76+
been negotiated and the driver does not stream yet, the
77+
<function>poll</function> function starts streaming. When that fails
78+
it returns a <constant>POLLERR</constant> as above. Otherwise it waits
6279
until the driver is ready for a non-blocking
6380
<function>write()</function> call.</para>
6481

82+
<para>If the caller is only interested in events (just
83+
<constant>POLLPRI</constant> is set in the <structfield>events</structfield>
84+
field), then <function>poll()</function> will <emphasis>not</emphasis>
85+
start streaming if the driver does not stream yet. This makes it
86+
possible to just poll for events and not for buffers.</para>
87+
6588
<para>All drivers implementing the <function>read()</function> or
6689
<function>write()</function> function or streaming I/O must also
6790
support the <function>poll()</function> function.</para>

‎Documentation/DocBook/media/v4l/v4l2.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,11 @@ structs, ioctls) must be noted in more detail in the history chapter
152152
applications. -->
153153

154154
<revision>
155-
<revnumber>3.16</revnumber>
156-
<date>2014-05-27</date>
157-
<authorinitials>lp</authorinitials>
158-
<revremark>Extended &v4l2-pix-format;. Added format flags.
155+
<revnumber>3.17</revnumber>
156+
<date>2014-08-04</date>
157+
<authorinitials>lp, hv</authorinitials>
158+
<revremark>Extended &v4l2-pix-format;. Added format flags. Added compound control types
159+
and VIDIOC_QUERY_EXT_CTRL.
159160
</revremark>
160161
</revision>
161162

@@ -538,7 +539,7 @@ and discussions on the V4L mailing list.</revremark>
538539
</partinfo>
539540

540541
<title>Video for Linux Two API Specification</title>
541-
<subtitle>Revision 3.14</subtitle>
542+
<subtitle>Revision 3.17</subtitle>
542543

543544
<chapter id="common">
544545
&sub-common;

‎Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</row>
120120
<row>
121121
<entry>&v4l2-rect;</entry>
122-
<entry><structfield>rect</structfield></entry>
122+
<entry><structfield>r</structfield></entry>
123123
<entry>Selection rectangle, in pixels.</entry>
124124
</row>
125125
<row>

‎Documentation/SubmittingPatches

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,7 @@ Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
794794
<http://www.kroah.com/log/linux/maintainer-03.html>
795795
<http://www.kroah.com/log/linux/maintainer-04.html>
796796
<http://www.kroah.com/log/linux/maintainer-05.html>
797+
<http://www.kroah.com/log/linux/maintainer-06.html>
797798

798799
NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
799800
<https://lkml.org/lkml/2005/7/11/336>

‎Documentation/cgroups/cpusets.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,14 @@ the named feature on.
345345
The implementation is simple.
346346

347347
Setting the flag 'cpuset.memory_spread_page' turns on a per-process flag
348-
PF_SPREAD_PAGE for each task that is in that cpuset or subsequently
348+
PFA_SPREAD_PAGE for each task that is in that cpuset or subsequently
349349
joins that cpuset. The page allocation calls for the page cache
350-
is modified to perform an inline check for this PF_SPREAD_PAGE task
350+
is modified to perform an inline check for this PFA_SPREAD_PAGE task
351351
flag, and if set, a call to a new routine cpuset_mem_spread_node()
352352
returns the node to prefer for the allocation.
353353

354354
Similarly, setting 'cpuset.memory_spread_slab' turns on the flag
355-
PF_SPREAD_SLAB, and appropriately marked slab caches will allocate
355+
PFA_SPREAD_SLAB, and appropriately marked slab caches will allocate
356356
pages from the node returned by cpuset_mem_spread_node().
357357

358358
The cpuset_mem_spread_node() routine is also simple. It uses the

‎Documentation/devicetree/bindings/dma/rcar-audmapp.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Example:
1616
* DMA client
1717

1818
Required properties:
19-
- dmas: a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
20-
where SRS/DRS values are fixed handles, specified in the SoC
21-
manual as the value that would be written into the PDMACHCR.
19+
- dmas: a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
20+
where SRS/DRS are specified in the SoC manual.
21+
It will be written into PDMACHCR as high 16-bit parts.
2222
- dma-names: a list of DMA channel names, one per "dmas" entry
2323

2424
Example:

‎Documentation/devicetree/bindings/input/atmel,maxtouch.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,17 @@ Required properties:
1111

1212
Optional properties for main touchpad device:
1313

14-
- linux,gpio-keymap: An array of up to 4 entries indicating the Linux
15-
keycode generated by each GPIO. Linux keycodes are defined in
14+
- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages
15+
on GPIO bit changes. An array of up to 8 entries can be provided
16+
indicating the Linux keycode mapped to each bit of the status byte,
17+
starting at the LSB. Linux keycodes are defined in
1618
<dt-bindings/input/input.h>.
1719

20+
Note: the numbering of the GPIOs and the bit they start at varies between
21+
maXTouch devices. You must either refer to the documentation, or
22+
experiment to determine which bit corresponds to which input. Use
23+
KEY_RESERVED for unused padding values.
24+
1825
Example:
1926

2027
touch@4b {

‎Documentation/devicetree/bindings/net/stmmac.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ Optional properties:
3939
further clocks may be specified in derived bindings.
4040
- clock-names: One name for each entry in the clocks property, the
4141
first one should be "stmmaceth".
42+
- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is
43+
available this clock is used for programming the Timestamp Addend Register.
44+
If not passed then the system clock will be used and this is fine on some
45+
platforms.
4246

4347
Examples:
4448

‎Documentation/devicetree/bindings/regulator/tps65090.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Example:
4545
infet5-supply = <&some_reg>;
4646
infet6-supply = <&some_reg>;
4747
infet7-supply = <&some_reg>;
48-
vsys_l1-supply = <&some_reg>;
49-
vsys_l2-supply = <&some_reg>;
48+
vsys-l1-supply = <&some_reg>;
49+
vsys-l2-supply = <&some_reg>;
5050

5151
regulators {
5252
dcdc1 {

‎Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ADI AXI-SPDIF controller
22

33
Required properties:
4-
- compatible : Must be "adi,axi-spdif-1.00.a"
4+
- compatible : Must be "adi,axi-spdif-tx-1.00.a"
55
- reg : Must contain SPDIF core's registers location and length
66
- clocks : Pairs of phandle and specifier referencing the controller's clocks.
77
The controller expects two clocks, the clock used for the AXI interface and

‎Documentation/devicetree/bindings/sound/rockchip-i2s.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ i2s@ff890000 {
3131
#address-cells = <1>;
3232
#size-cells = <0>;
3333
dmas = <&pdma1 0>, <&pdma1 1>;
34-
dma-names = "rx", "tx";
34+
dma-names = "tx", "rx";
3535
clock-names = "i2s_hclk", "i2s_clk";
3636
clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
3737
};

‎Documentation/devicetree/bindings/spi/spi-rockchip.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ Required Properties:
1616
- clocks: Must contain an entry for each entry in clock-names.
1717
- clock-names: Shall be "spiclk" for the transfer-clock, and "apb_pclk" for
1818
the peripheral clock.
19+
- #address-cells: should be 1.
20+
- #size-cells: should be 0.
21+
22+
Optional Properties:
23+
1924
- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,
2025
Documentation/devicetree/bindings/dma/dma.txt
2126
- dma-names: DMA request names should include "tx" and "rx" if present.
22-
- #address-cells: should be 1.
23-
- #size-cells: should be 0.
27+
2428

2529
Example:
2630

‎Documentation/devicetree/bindings/staging/imx-drm/ldb.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ Required properties:
5656
- fsl,data-width : should be <18> or <24>
5757
- port: A port node with endpoint definitions as defined in
5858
Documentation/devicetree/bindings/media/video-interfaces.txt.
59+
On i.MX5, the internal two-input-multiplexer is used.
60+
Due to hardware limitations, only one port (port@[0,1])
61+
can be used for each channel (lvds-channel@[0,1], respectively)
5962
On i.MX6, there should be four ports (port@[0-3]) that correspond
6063
to the four LVDS multiplexer inputs.
6164

@@ -78,6 +81,8 @@ ldb: ldb@53fa8008 {
7881
"di0", "di1";
7982

8083
lvds-channel@0 {
84+
#address-cells = <1>;
85+
#size-cells = <0>;
8186
reg = <0>;
8287
fsl,data-mapping = "spwg";
8388
fsl,data-width = <24>;
@@ -86,14 +91,18 @@ ldb: ldb@53fa8008 {
8691
/* ... */
8792
};
8893

89-
port {
94+
port@0 {
95+
reg = <0>;
96+
9097
lvds0_in: endpoint {
9198
remote-endpoint = <&ipu_di0_lvds0>;
9299
};
93100
};
94101
};
95102

96103
lvds-channel@1 {
104+
#address-cells = <1>;
105+
#size-cells = <0>;
97106
reg = <1>;
98107
fsl,data-mapping = "spwg";
99108
fsl,data-width = <24>;
@@ -102,7 +111,9 @@ ldb: ldb@53fa8008 {
102111
/* ... */
103112
};
104113

105-
port {
114+
port@1 {
115+
reg = <1>;
116+
106117
lvds1_in: endpoint {
107118
remote-endpoint = <&ipu_di1_lvds1>;
108119
};

‎Documentation/devicetree/bindings/usb/mxs-phy.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Required properties:
55
* "fsl,imx23-usbphy" for imx23 and imx28
66
* "fsl,imx6q-usbphy" for imx6dq and imx6dl
77
* "fsl,imx6sl-usbphy" for imx6sl
8+
* "fsl,imx6sx-usbphy" for imx6sx
89
"fsl,imx23-usbphy" is still a fallback for other strings
910
- reg: Should contain registers location and length
1011
- interrupts: Should contain phy interrupt

‎Documentation/devicetree/bindings/video/analog-tv-connector.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Analog TV Connector
22
===================
33

44
Required properties:
5-
- compatible: "composite-connector" or "svideo-connector"
5+
- compatible: "composite-video-connector" or "svideo-connector"
66

77
Optional properties:
88
- label: a symbolic name for the connector
@@ -14,7 +14,7 @@ Example
1414
-------
1515

1616
tv: connector {
17-
compatible = "composite-connector";
17+
compatible = "composite-video-connector";
1818
label = "tv";
1919

2020
port {

0 commit comments

Comments
 (0)