Skip to content

Commit 4241119

Browse files
author
Ingo Molnar
committed
Merge tag 'v4.12-rc4' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents e73ad5f + 3c2993b commit 4241119

File tree

439 files changed

+4909
-2644
lines changed

Some content is hidden

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

439 files changed

+4909
-2644
lines changed

‎Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Optional properties:
3636
control gpios
3737

3838
- threshold: allows setting the "click"-threshold in the range
39-
from 20 to 80.
39+
from 0 to 80.
4040

4141
- gain: allows setting the sensitivity in the range from 0 to
4242
31. Note that lower values indicate higher

‎Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Required properties:
1616
- reg: Base address of PMIC on Hi6220 SoC.
1717
- interrupt-controller: Hi655x has internal IRQs (has own IRQ domain).
1818
- pmic-gpios: The GPIO used by PMIC IRQ.
19+
- #clock-cells: From common clock binding; shall be set to 0
20+
21+
Optional properties:
22+
- clock-output-names: From common clock binding to override the
23+
default output clock name
1924

2025
Example:
2126
pmic: pmic@f8000000 {
@@ -24,4 +29,5 @@ Example:
2429
interrupt-controller;
2530
#interrupt-cells = <2>;
2631
pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
32+
#clock-cells = <0>;
2733
}

‎Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Optional properties:
1818
"ext_clock" (External clock provided to the card).
1919
- post-power-on-delay-ms : Delay in ms after powering the card and
2020
de-asserting the reset-gpios (if any)
21+
- power-off-delay-us : Delay in us after asserting the reset-gpios (if any)
22+
during power off of the card.
2123

2224
Example:
2325

‎Documentation/devicetree/bindings/net/fsl-fec.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Optional properties:
1515
- phy-reset-active-high : If present then the reset sequence using the GPIO
1616
specified in the "phy-reset-gpios" property is reversed (H=reset state,
1717
L=operation state).
18+
- phy-reset-post-delay : Post reset delay in milliseconds. If present then
19+
a delay of phy-reset-post-delay milliseconds will be observed after the
20+
phy-reset-gpios has been toggled. Can be omitted thus no delay is
21+
observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.
1822
- phy-supply : regulator that powers the Ethernet PHY.
1923
- phy-handle : phandle to the PHY device connected to this device.
2024
- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ bias-bus-hold - latch weakly
247247
bias-pull-up - pull up the pin
248248
bias-pull-down - pull down the pin
249249
bias-pull-pin-default - use pin-default pull state
250-
bi-directional - pin supports simultaneous input/output operations
251250
drive-push-pull - drive actively high and low
252251
drive-open-drain - drive with open drain
253252
drive-open-source - drive with open source
@@ -260,7 +259,6 @@ input-debounce - debounce mode with debound time X
260259
power-source - select between different power supplies
261260
low-power-enable - enable low power mode
262261
low-power-disable - disable low power mode
263-
output-enable - enable output on pin regardless of output value
264262
output-low - set the pin to output mode with low level
265263
output-high - set the pin to output mode with high level
266264
slew-rate - set the slew rate

‎Documentation/input/devices/edt-ft5x06.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ It has been tested with the following devices:
1515
The driver allows configuration of the touch screen via a set of sysfs files:
1616

1717
/sys/class/input/eventX/device/device/threshold:
18-
allows setting the "click"-threshold in the range from 20 to 80.
18+
allows setting the "click"-threshold in the range from 0 to 80.
1919

2020
/sys/class/input/eventX/device/device/gain:
2121
allows setting the sensitivity in the range from 0 to 31. Note that

‎Documentation/sound/hd-audio/models.rst

Lines changed: 65 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ALC880
1616
6-jack in back, 2-jack in front
1717
6stack-digout
1818
6-jack with a SPDIF out
19+
6stack-automute
20+
6-jack with headphone jack detection
1921

2022
ALC260
2123
======
@@ -62,6 +64,8 @@ lenovo-dock
6264
Enables docking station I/O for some Lenovos
6365
hp-gpio-led
6466
GPIO LED support on HP laptops
67+
hp-dock-gpio-mic1-led
68+
HP dock with mic LED support
6569
dell-headset-multi
6670
Headset jack, which can also be used as mic-in
6771
dell-headset-dock
@@ -72,6 +76,12 @@ alc283-sense-combo
7276
Combo jack sensing on ALC283
7377
tpt440-dock
7478
Pin configs for Lenovo Thinkpad Dock support
79+
tpt440
80+
Lenovo Thinkpad T440s setup
81+
tpt460
82+
Lenovo Thinkpad T460/560 setup
83+
dual-codecs
84+
Lenovo laptops with dual codecs
7585

7686
ALC66x/67x/892
7787
==============
@@ -97,6 +107,8 @@ inv-dmic
97107
Inverted internal mic workaround
98108
dell-headset-multi
99109
Headset jack, which can also be used as mic-in
110+
dual-codecs
111+
Lenovo laptops with dual codecs
100112

101113
ALC680
102114
======
@@ -114,6 +126,8 @@ inv-dmic
114126
Inverted internal mic workaround
115127
no-primary-hp
116128
VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC)
129+
dual-codecs
130+
ALC1220 dual codecs for Gaming mobos
117131

118132
ALC861/660
119133
==========
@@ -206,65 +220,47 @@ auto
206220

207221
Conexant 5045
208222
=============
209-
laptop-hpsense
210-
Laptop with HP sense (old model laptop)
211-
laptop-micsense
212-
Laptop with Mic sense (old model fujitsu)
213-
laptop-hpmicsense
214-
Laptop with HP and Mic senses
215-
benq
216-
Benq R55E
217-
laptop-hp530
218-
HP 530 laptop
219-
test
220-
for testing/debugging purpose, almost all controls can be
221-
adjusted. Appearing only when compiled with $CONFIG_SND_DEBUG=y
223+
cap-mix-amp
224+
Fix max input level on mixer widget
225+
toshiba-p105
226+
Toshiba P105 quirk
227+
hp-530
228+
HP 530 quirk
222229

223230
Conexant 5047
224231
=============
225-
laptop
226-
Basic Laptop config
227-
laptop-hp
228-
Laptop config for some HP models (subdevice 30A5)
229-
laptop-eapd
230-
Laptop config with EAPD support
231-
test
232-
for testing/debugging purpose, almost all controls can be
233-
adjusted. Appearing only when compiled with $CONFIG_SND_DEBUG=y
232+
cap-mix-amp
233+
Fix max input level on mixer widget
234234

235235
Conexant 5051
236236
=============
237-
laptop
238-
Basic Laptop config (default)
239-
hp
240-
HP Spartan laptop
241-
hp-dv6736
242-
HP dv6736
243-
hp-f700
244-
HP Compaq Presario F700
245-
ideapad
246-
Lenovo IdeaPad laptop
247-
toshiba
248-
Toshiba Satellite M300
237+
lenovo-x200
238+
Lenovo X200 quirk
249239

250240
Conexant 5066
251241
=============
252-
laptop
253-
Basic Laptop config (default)
254-
hp-laptop
255-
HP laptops, e g G60
256-
asus
257-
Asus K52JU, Lenovo G560
258-
dell-laptop
259-
Dell laptops
260-
dell-vostro
261-
Dell Vostro
262-
olpc-xo-1_5
263-
OLPC XO 1.5
264-
ideapad
265-
Lenovo IdeaPad U150
242+
stereo-dmic
243+
Workaround for inverted stereo digital mic
244+
gpio1
245+
Enable GPIO1 pin
246+
headphone-mic-pin
247+
Enable headphone mic NID 0x18 without detection
248+
tp410
249+
Thinkpad T400 & co quirks
266250
thinkpad
267-
Lenovo Thinkpad
251+
Thinkpad mute/mic LED quirk
252+
lemote-a1004
253+
Lemote A1004 quirk
254+
lemote-a1205
255+
Lemote A1205 quirk
256+
olpc-xo
257+
OLPC XO quirk
258+
mute-led-eapd
259+
Mute LED control via EAPD
260+
hp-dock
261+
HP dock support
262+
mute-led-gpio
263+
Mute LED control via GPIO
268264

269265
STAC9200
270266
========
@@ -444,6 +440,8 @@ dell-eq
444440
Dell desktops/laptops
445441
alienware
446442
Alienware M17x
443+
asus-mobo
444+
Pin configs for ASUS mobo with 5.1/SPDIF out
447445
auto
448446
BIOS setup (default)
449447

@@ -477,6 +475,8 @@ hp-envy-ts-bass
477475
Pin fixup for HP Envy TS bass speaker (NID 0x10)
478476
hp-bnb13-eq
479477
Hardware equalizer setup for HP laptops
478+
hp-envy-ts-bass
479+
HP Envy TS bass support
480480
auto
481481
BIOS setup (default)
482482

@@ -496,10 +496,22 @@ auto
496496

497497
Cirrus Logic CS4206/4207
498498
========================
499+
mbp53
500+
MacBook Pro 5,3
499501
mbp55
500502
MacBook Pro 5,5
501503
imac27
502504
IMac 27 Inch
505+
imac27_122
506+
iMac 12,2
507+
apple
508+
Generic Apple quirk
509+
mbp101
510+
MacBookPro 10,1
511+
mbp81
512+
MacBookPro 8,1
513+
mba42
514+
MacBookAir 4,2
503515
auto
504516
BIOS setup (default)
505517

@@ -509,6 +521,10 @@ mba6
509521
MacBook Air 6,1 and 6,2
510522
gpio0
511523
Enable GPIO 0 amp
524+
mbp11
525+
MacBookPro 11,2
526+
macmini
527+
MacMini 7,1
512528
auto
513529
BIOS setup (default)
514530

‎MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7143,7 +7143,7 @@ S: Maintained
71437143
F: drivers/media/platform/rcar_jpu.c
71447144

71457145
JSM Neo PCI based serial card
7146-
M: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
7146+
M: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
71477147
L: linux-serial@vger.kernel.org
71487148
S: Maintained
71497149
F: drivers/tty/serial/jsm/
@@ -10450,7 +10450,7 @@ S: Orphan
1045010450

1045110451
PXA RTC DRIVER
1045210452
M: Robert Jarzmik <robert.jarzmik@free.fr>
10453-
L: rtc-linux@googlegroups.com
10453+
L: linux-rtc@vger.kernel.org
1045410454
S: Maintained
1045510455

1045610456
QAT DRIVER
@@ -10757,7 +10757,7 @@ X: kernel/torture.c
1075710757
REAL TIME CLOCK (RTC) SUBSYSTEM
1075810758
M: Alessandro Zummo <a.zummo@towertech.it>
1075910759
M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
10760-
L: rtc-linux@googlegroups.com
10760+
L: linux-rtc@vger.kernel.org
1076110761
Q: http://patchwork.ozlabs.org/project/rtc-linux/list/
1076210762
T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
1076310763
S: Maintained

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 12
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc2
4+
EXTRAVERSION = -rc4
55
NAME = Fearless Coyote
66

77
# *DOCUMENTATION*

0 commit comments

Comments
 (0)