Skip to content

Commit dd63af1

Browse files
gregkhgregkh
committed
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents 50d1e7d + 009d043 commit dd63af1

File tree

592 files changed

+5504
-2554
lines changed

Some content is hidden

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

592 files changed

+5504
-2554
lines changed

‎Documentation/devicetree/bindings/ata/sata_rcar.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
Required properties:
44
- compatible : should contain one of the following:
55
- "renesas,sata-r8a7779" for R-Car H1
6-
- "renesas,sata-r8a7790" for R-Car H2
7-
- "renesas,sata-r8a7791" for R-Car M2
6+
- "renesas,sata-r8a7790-es1" for R-Car H2 ES1
7+
- "renesas,sata-r8a7790" for R-Car H2 other than ES1
8+
- "renesas,sata-r8a7791" for R-Car M2-W
9+
- "renesas,sata-r8a7793" for R-Car M2-N
810
- reg : address and length of the SATA registers;
911
- interrupts : must consist of one interrupt specifier.
1012

‎Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents.
3030
Example:
3131
interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;
3232

33-
A device node may contain either "interrupts" or "interrupts-extended", but not
34-
both. If both properties are present, then the operating system should log an
35-
error and use only the data in "interrupts".
36-
3733
2) Interrupt controller nodes
3834
-----------------------------
3935

‎Documentation/devicetree/bindings/pci/pci.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,14 @@ And for the interrupt mapping part:
77

88
Open Firmware Recommended Practice: Interrupt Mapping
99
http://www.openfirmware.org/1275/practice/imap/imap0_9d.pdf
10+
11+
Additionally to the properties specified in the above standards a host bridge
12+
driver implementation may support the following properties:
13+
14+
- linux,pci-domain:
15+
If present this property assigns a fixed PCI domain number to a host bridge,
16+
otherwise an unstable (across boots) unique number will be assigned.
17+
It is required to either not set this property at all or set it for all
18+
host bridges in the system, otherwise potentially conflicting domain numbers
19+
may be assigned to root buses behind different host bridges. The domain
20+
number for each host bridge in the system must be unique.

‎Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
99
common pinctrl bindings used by client devices, including the meaning of the
1010
phrase "pin configuration node".
1111

12-
TZ1090-PDC's pin configuration nodes act as a container for an abitrary number
12+
TZ1090-PDC's pin configuration nodes act as a container for an arbitrary number
1313
of subnodes. Each of these subnodes represents some desired configuration for a
1414
pin, a group, or a list of pins or groups. This configuration can include the
1515
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
99
common pinctrl bindings used by client devices, including the meaning of the
1010
phrase "pin configuration node".
1111

12-
TZ1090's pin configuration nodes act as a container for an abitrary number of
12+
TZ1090's pin configuration nodes act as a container for an arbitrary number of
1313
subnodes. Each of these subnodes represents some desired configuration for a
1414
pin, a group, or a list of pins or groups. This configuration can include the
1515
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
99
common pinctrl bindings used by client devices, including the meaning of the
1010
phrase "pin configuration node".
1111

12-
Lantiq's pin configuration nodes act as a container for an abitrary number of
12+
Lantiq's pin configuration nodes act as a container for an arbitrary number of
1313
subnodes. Each of these subnodes represents some desired configuration for a
1414
pin, a group, or a list of pins or groups. This configuration can include the
1515
mux function to select on those group(s), and two pin configuration parameters:

‎Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
99
common pinctrl bindings used by client devices, including the meaning of the
1010
phrase "pin configuration node".
1111

12-
Lantiq's pin configuration nodes act as a container for an abitrary number of
12+
Lantiq's pin configuration nodes act as a container for an arbitrary number of
1313
subnodes. Each of these subnodes represents some desired configuration for a
1414
pin, a group, or a list of pins or groups. This configuration can include the
1515
mux function to select on those group(s), and two pin configuration parameters:

‎Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
99
common pinctrl bindings used by client devices, including the meaning of the
1010
phrase "pin configuration node".
1111

12-
Tegra's pin configuration nodes act as a container for an abitrary number of
12+
Tegra's pin configuration nodes act as a container for an arbitrary number of
1313
subnodes. Each of these subnodes represents some desired configuration for a
1414
pin, a group, or a list of pins or groups. This configuration can include the
1515
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Optional properties:
1313
Please refer to pinctrl-bindings.txt in this directory for details of the common
1414
pinctrl bindings used by client devices.
1515

16-
SiRFprimaII's pinmux nodes act as a container for an abitrary number of subnodes.
16+
SiRFprimaII's pinmux nodes act as a container for an arbitrary number of subnodes.
1717
Each of these subnodes represents some desired configuration for a group of pins.
1818

1919
Required subnode-properties:

‎Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Required properties:
3232
Please refer to pinctrl-bindings.txt in this directory for details of the common
3333
pinctrl bindings used by client devices.
3434

35-
SPEAr's pinmux nodes act as a container for an abitrary number of subnodes. Each
35+
SPEAr's pinmux nodes act as a container for an arbitrary number of subnodes. Each
3636
of these subnodes represents muxing for a pin, a group, or a list of pins or
3737
groups.
3838

‎Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
1818
common pinctrl bindings used by client devices, including the meaning of the
1919
phrase "pin configuration node".
2020

21-
Qualcomm's pin configuration nodes act as a container for an abitrary number of
21+
Qualcomm's pin configuration nodes act as a container for an arbitrary number of
2222
subnodes. Each of these subnodes represents some desired configuration for a
2323
pin, a group, or a list of pins or groups. This configuration can include the
2424
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
4747
common pinctrl bindings used by client devices, including the meaning of the
4848
phrase "pin configuration node".
4949

50-
The pin configuration nodes act as a container for an abitrary number of
50+
The pin configuration nodes act as a container for an arbitrary number of
5151
subnodes. Each of these subnodes represents some desired configuration for a
5252
pin, a group, or a list of pins or groups. This configuration can include the
5353
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
1818
common pinctrl bindings used by client devices, including the meaning of the
1919
phrase "pin configuration node".
2020

21-
Qualcomm's pin configuration nodes act as a container for an abitrary number of
21+
Qualcomm's pin configuration nodes act as a container for an arbitrary number of
2222
subnodes. Each of these subnodes represents some desired configuration for a
2323
pin, a group, or a list of pins or groups. This configuration can include the
2424
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
4747
common pinctrl bindings used by client devices, including the meaning of the
4848
phrase "pin configuration node".
4949

50-
The pin configuration nodes act as a container for an abitrary number of
50+
The pin configuration nodes act as a container for an arbitrary number of
5151
subnodes. Each of these subnodes represents some desired configuration for a
5252
pin, a group, or a list of pins or groups. This configuration can include the
5353
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
1818
common pinctrl bindings used by client devices, including the meaning of the
1919
phrase "pin configuration node".
2020

21-
Qualcomm's pin configuration nodes act as a container for an abitrary number of
21+
Qualcomm's pin configuration nodes act as a container for an arbitrary number of
2222
subnodes. Each of these subnodes represents some desired configuration for a
2323
pin, a group, or a list of pins or groups. This configuration can include the
2424
mux function to select on those pin(s)/group(s), and various pin configuration

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ chipidea Chipidea, Inc
3434
chrp Common Hardware Reference Platform
3535
chunghwa Chunghwa Picture Tubes Ltd.
3636
cirrus Cirrus Logic, Inc.
37+
cnm Chips&Media, Inc.
3738
cortina Cortina Systems, Inc.
3839
crystalfontz Crystalfontz America, Inc.
3940
dallas Maxim Integrated Products (formerly Dallas Semiconductor)
@@ -92,6 +93,7 @@ maxim Maxim Integrated Products
9293
mediatek MediaTek Inc.
9394
micrel Micrel Inc.
9495
microchip Microchip Technology Inc.
96+
micron Micron Technology Inc.
9597
mitsubishi Mitsubishi Electric Corporation
9698
mosaixtech Mosaix Technologies, Inc.
9799
moxa Moxa
@@ -127,6 +129,7 @@ renesas Renesas Electronics Corporation
127129
ricoh Ricoh Co. Ltd.
128130
rockchip Fuzhou Rockchip Electronics Co., Ltd
129131
samsung Samsung Semiconductor
132+
sandisk Sandisk Corporation
130133
sbs Smart Battery System
131134
schindler Schindler
132135
seagate Seagate Technology PLC
@@ -138,7 +141,7 @@ silergy Silergy Corp.
138141
sirf SiRF Technology, Inc.
139142
sitronix Sitronix Technology Corporation
140143
smsc Standard Microsystems Corporation
141-
snps Synopsys, Inc.
144+
snps Synopsys, Inc.
142145
solidrun SolidRun
143146
sony Sony Corporation
144147
spansion Spansion Inc.

‎Documentation/filesystems/overlayfs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ is formed.
6464
At mount time, the two directories given as mount options "lowerdir" and
6565
"upperdir" are combined into a merged directory:
6666

67-
mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\
67+
mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\
6868
workdir=/work /merged
6969

7070
The "workdir" needs to be an empty directory on the same filesystem

‎Documentation/input/elantech.txt

Lines changed: 75 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,38 @@ Contents
3838
7.2.1 Status packet
3939
7.2.2 Head packet
4040
7.2.3 Motion packet
41+
8. Trackpoint (for Hardware version 3 and 4)
42+
8.1 Registers
43+
8.2 Native relative mode 6 byte packet format
44+
8.2.1 Status Packet
4145

4246

4347

4448
1. Introduction
4549
~~~~~~~~~~~~
4650

47-
Currently the Linux Elantech touchpad driver is aware of two different
48-
hardware versions unimaginatively called version 1 and version 2. Version 1
49-
is found in "older" laptops and uses 4 bytes per packet. Version 2 seems to
50-
be introduced with the EeePC and uses 6 bytes per packet, and provides
51-
additional features such as position of two fingers, and width of the touch.
51+
Currently the Linux Elantech touchpad driver is aware of four different
52+
hardware versions unimaginatively called version 1,version 2, version 3
53+
and version 4. Version 1 is found in "older" laptops and uses 4 bytes per
54+
packet. Version 2 seems to be introduced with the EeePC and uses 6 bytes
55+
per packet, and provides additional features such as position of two fingers,
56+
and width of the touch. Hardware version 3 uses 6 bytes per packet (and
57+
for 2 fingers the concatenation of two 6 bytes packets) and allows tracking
58+
of up to 3 fingers. Hardware version 4 uses 6 bytes per packet, and can
59+
combine a status packet with multiple head or motion packets. Hardware version
60+
4 allows tracking up to 5 fingers.
61+
62+
Some Hardware version 3 and version 4 also have a trackpoint which uses a
63+
separate packet format. It is also 6 bytes per packet.
5264

5365
The driver tries to support both hardware versions and should be compatible
5466
with the Xorg Synaptics touchpad driver and its graphical configuration
5567
utilities.
5668

69+
Note that a mouse button is also associated with either the touchpad or the
70+
trackpoint when a trackpoint is available. Disabling the Touchpad in xorg
71+
(TouchPadOff=0) will also disable the buttons associated with the touchpad.
72+
5773
Additionally the operation of the touchpad can be altered by adjusting the
5874
contents of some of its internal registers. These registers are represented
5975
by the driver as sysfs entries under /sys/bus/serio/drivers/psmouse/serio?
@@ -78,7 +94,7 @@ completeness sake.
7894
2. Extra knobs
7995
~~~~~~~~~~~
8096

81-
Currently the Linux Elantech touchpad driver provides two extra knobs under
97+
Currently the Linux Elantech touchpad driver provides three extra knobs under
8298
/sys/bus/serio/drivers/psmouse/serio? for the user.
8399

84100
* debug
@@ -112,6 +128,20 @@ Currently the Linux Elantech touchpad driver provides two extra knobs under
112128
data consistency checking can be done. For now checking is disabled by
113129
default. Currently even turning it on will do nothing.
114130

131+
* crc_enabled
132+
133+
Sets crc_enabled to 0/1. The name "crc_enabled" is the official name of
134+
this integrity check, even though it is not an actual cyclic redundancy
135+
check.
136+
137+
Depending on the state of crc_enabled, certain basic data integrity
138+
verification is done by the driver on hardware version 3 and 4. The
139+
driver will reject any packet that appears corrupted. Using this knob,
140+
The state of crc_enabled can be altered with this knob.
141+
142+
Reading the crc_enabled value will show the active value. Echoing
143+
"0" or "1" to this file will set the state to "0" or "1".
144+
115145
/////////////////////////////////////////////////////////////////////////////
116146

117147
3. Differentiating hardware versions
@@ -746,3 +776,42 @@ byte 5:
746776

747777
byte 0 ~ 2 for one finger
748778
byte 3 ~ 5 for another
779+
780+
781+
8. Trackpoint (for Hardware version 3 and 4)
782+
=========================================
783+
8.1 Registers
784+
~~~~~~~~~
785+
No special registers have been identified.
786+
787+
8.2 Native relative mode 6 byte packet format
788+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
789+
8.2.1 Status Packet
790+
~~~~~~~~~~~~~
791+
792+
byte 0:
793+
bit 7 6 5 4 3 2 1 0
794+
0 0 sx sy 0 M R L
795+
byte 1:
796+
bit 7 6 5 4 3 2 1 0
797+
~sx 0 0 0 0 0 0 0
798+
byte 2:
799+
bit 7 6 5 4 3 2 1 0
800+
~sy 0 0 0 0 0 0 0
801+
byte 3:
802+
bit 7 6 5 4 3 2 1 0
803+
0 0 ~sy ~sx 0 1 1 0
804+
byte 4:
805+
bit 7 6 5 4 3 2 1 0
806+
x7 x6 x5 x4 x3 x2 x1 x0
807+
byte 5:
808+
bit 7 6 5 4 3 2 1 0
809+
y7 y6 y5 y4 y3 y2 y1 y0
810+
811+
812+
x and y are written in two's complement spread
813+
over 9 bits with sx/sy the relative top bit and
814+
x7..x0 and y7..y0 the lower bits.
815+
~sx is the inverse of sx, ~sy is the inverse of sy.
816+
The sign of y is opposite to what the input driver
817+
expects for a relative movement

‎Documentation/networking/ip-sysctl.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ ip_forward_use_pmtu - BOOLEAN
5656
0 - disabled
5757
1 - enabled
5858

59+
fwmark_reflect - BOOLEAN
60+
Controls the fwmark of kernel-generated IPv4 reply packets that are not
61+
associated with a socket for example, TCP RSTs or ICMP echo replies).
62+
If unset, these packets have a fwmark of zero. If set, they have the
63+
fwmark of the packet they are replying to.
64+
Default: 0
65+
5966
route/max_size - INTEGER
6067
Maximum number of routes allowed in the kernel. Increase
6168
this when using large numbers of interfaces and/or routes.
@@ -1201,6 +1208,13 @@ conf/all/forwarding - BOOLEAN
12011208
proxy_ndp - BOOLEAN
12021209
Do proxy ndp.
12031210

1211+
fwmark_reflect - BOOLEAN
1212+
Controls the fwmark of kernel-generated IPv6 reply packets that are not
1213+
associated with a socket for example, TCP RSTs or ICMPv6 echo replies).
1214+
If unset, these packets have a fwmark of zero. If set, they have the
1215+
fwmark of the packet they are replying to.
1216+
Default: 0
1217+
12041218
conf/interface/*:
12051219
Change special settings per interface.
12061220

‎Documentation/networking/timestamping.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ SOF_TIMESTAMPING_OPT_ID:
136136

137137
This option is implemented only for transmit timestamps. There, the
138138
timestamp is always looped along with a struct sock_extended_err.
139-
The option modifies field ee_info to pass an id that is unique
139+
The option modifies field ee_data to pass an id that is unique
140140
among all possibly concurrently outstanding timestamp requests for
141141
that socket. In practice, it is a monotonically increasing u32
142142
(that wraps).

0 commit comments

Comments
 (0)