Skip to content

Commit 4b622d6

Browse files
noglitchnoglitch
committed
Merge tag 'v4.9.109' into linux-4.9-at91
This is the 4.9.109 stable release
2 parents eef8777 + 8e52b94 commit 4b622d6

1,815 files changed

Lines changed: 29342 additions & 11037 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-bus-iio‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Description:
3232
Description of the physical chip / device for device X.
3333
Typically a part number.
3434

35-
What: /sys/bus/iio/devices/iio:deviceX/timestamp_clock
35+
What: /sys/bus/iio/devices/iio:deviceX/current_timestamp_clock
3636
KernelVersion: 4.5
3737
Contact: linux-iio@vger.kernel.org
3838
Description:

‎Documentation/ABI/testing/sysfs-devices-system-cpu‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ What: /sys/devices/system/cpu/vulnerabilities
355355
/sys/devices/system/cpu/vulnerabilities/meltdown
356356
/sys/devices/system/cpu/vulnerabilities/spectre_v1
357357
/sys/devices/system/cpu/vulnerabilities/spectre_v2
358+
/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
358359
Date: January 2018
359360
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
360361
Description: Information about CPU vulnerabilities

‎Documentation/arm64/silicon-errata.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ stable kernels.
5454
| ARM | Cortex-A57 | #852523 | N/A |
5555
| ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 |
5656
| ARM | Cortex-A72 | #853709 | N/A |
57+
| ARM | Cortex-A55 | #1024718 | ARM64_ERRATUM_1024718 |
5758
| ARM | MMU-500 | #841119,#826419 | N/A |
5859
| | | | |
5960
| Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 |

‎Documentation/device-mapper/thin-provisioning.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,11 @@ $low_water_mark is expressed in blocks of size $data_block_size. If
112112
free space on the data device drops below this level then a dm event
113113
will be triggered which a userspace daemon should catch allowing it to
114114
extend the pool device. Only one such event will be sent.
115-
Resuming a device with a new table itself triggers an event so the
116-
userspace daemon can use this to detect a situation where a new table
117-
already exceeds the threshold.
115+
116+
No special event is triggered if a just resumed device's free space is below
117+
the low water mark. However, resuming a device always triggers an
118+
event; a userspace daemon should verify that free space exceeds the low
119+
water mark when handling this event.
118120

119121
A low water mark for the metadata device is maintained in the kernel and
120122
will trigger a dm event if free space on the metadata device drops below

‎Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
* Amlogic Meson8b Clock and Reset Unit
1+
* Amlogic Meson8, Meson8b and Meson8m2 Clock and Reset Unit
22

3-
The Amlogic Meson8b clock controller generates and supplies clock to various
4-
controllers within the SoC.
3+
The Amlogic Meson8 / Meson8b / Meson8m2 clock controller generates and
4+
supplies clock to various controllers within the SoC.
55

66
Required Properties:
77

8-
- compatible: should be "amlogic,meson8b-clkc"
8+
- compatible: must be one of:
9+
- "amlogic,meson8-clkc" for Meson8 (S802) SoCs
10+
- "amlogic,meson8b-clkc" for Meson8 (S805) SoCs
11+
- "amlogic,meson8m2-clkc" for Meson8m2 (S812) SoCs
912
- reg: it must be composed by two tuples:
1013
0) physical base address of the xtal register and length of memory
1114
mapped region.

Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt renamed to Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Toppoly TD028TTEC1 Panel
22
========================
33

44
Required properties:
5-
- compatible: "toppoly,td028ttec1"
5+
- compatible: "tpo,td028ttec1"
66

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

1616
lcd-panel: td028ttec1@0 {
17-
compatible = "toppoly,td028ttec1";
17+
compatible = "tpo,td028ttec1";
1818
reg = <0>;
1919
spi-max-frequency = <100000>;
2020
spi-cpol;

‎Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ Required properties:
4747
Documentation/devicetree/bindings/media/video-interfaces.txt. The
4848
first port should be the input endpoint, the second one the output
4949

50-
The output should have two endpoints. The first is the block
51-
connected to the TCON channel 0 (usually a panel or a bridge), the
52-
second the block connected to the TCON channel 1 (usually the TV
53-
encoder)
50+
The output may have multiple endpoints. The TCON has two channels,
51+
usually with the first channel being used for the panels interfaces
52+
(RGB, LVDS, etc.), and the second being used for the outputs that
53+
require another controller (TV Encoder, HDMI, etc.). The endpoints
54+
will take an extra property, allwinner,tcon-channel, to specify the
55+
channel the endpoint is associated to. If that property is not
56+
present, the endpoint number will be used as the channel number.
5457

5558
On SoCs other than the A33, there is one more clock required:
5659
- 'tcon-ch1': The clock driving the TCON channel 1

‎Documentation/devicetree/bindings/dma/mv-xor-v2.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ Required properties:
1111
interrupts.
1212

1313
Optional properties:
14-
- clocks: Optional reference to the clock used by the XOR engine.
14+
- clocks: Optional reference to the clocks used by the XOR engine.
15+
- clock-names: mandatory if there is a second clock, in this case the
16+
name must be "core" for the first clock and "reg" for the second
17+
one
18+
1519

1620
Example:
1721

‎Documentation/devicetree/bindings/mfd/axp20x.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ Optional properties:
2828
regulator to drive the OTG VBus, rather then as an input pin
2929
which signals whether the board is driving OTG VBus or not.
3030

31+
- x-powers,master-mode: Boolean (axp806 only). Set this when the PMIC is
32+
wired for master mode. The default is slave mode.
33+
3134
- <input>-supply: a phandle to the regulator supply node. May be omitted if
3235
inputs are unregulated, such as using the IPSOUT output
3336
from the PMIC.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ Optional properties:
3535
- ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode.
3636
Selection primary or secondary function associated to GPADC_START
3737
and SYSEN2 pin/pad for DVFS2 interface
38+
- ti,palmas-override-powerhold: This is applicable for PMICs for which
39+
GPIO7 is configured in POWERHOLD mode which has higher priority
40+
over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
41+
bit is turned off. This property enables driver to over ride the
42+
POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
43+
scenarios. So for GPIO7 if ti,palmas-override-powerhold is set
44+
then the GPIO_7 field should never be muxed to anything else.
45+
It should be set to POWERHOLD by default and only in case of
46+
power off scenarios the driver will over ride the mux value.
3847

3948
This binding uses the following generic properties as defined in
4049
pinctrl-bindings.txt:

0 commit comments

Comments
 (0)