Skip to content

Commit 9b61c0f

Browse files
airliedairlied
committed
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
2 parents 550e3b2 + 125234d commit 9b61c0f

File tree

1,064 files changed

+12833
-8100
lines changed

Some content is hidden

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

1,064 files changed

+12833
-8100
lines changed

‎Documentation/cgroup-v2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and
77
conventions of cgroup v2. It describes all userland-visible aspects
88
of cgroup including core and specific controller behaviors. All
99
future changes must be reflected in this document. Documentation for
10-
v1 is available under Documentation/cgroup-legacy/.
10+
v1 is available under Documentation/cgroup-v1/.
1111

1212
CONTENTS
1313

‎Documentation/devicetree/bindings/arm/omap/omap.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Optional properties:
2323
during suspend.
2424
- ti,no-reset-on-init: When present, the module should not be reset at init
2525
- ti,no-idle-on-init: When present, the module should not be idled at init
26+
- ti,no-idle: When present, the module is never allowed to idle.
2627

2728
Example:
2829

‎Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following
3030
clock-output-names:
3131
- "xin24m" - crystal input - required,
3232
- "ext_i2s" - external I2S clock - optional,
33-
- "ext_gmac" - external GMAC clock - optional
33+
- "rmii_clkin" - external EMAC clock - optional
3434

3535
Example: Clock controller node:
3636

‎Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ Main node required properties:
2424
1 = edge triggered
2525
4 = level triggered
2626

27-
Cells 4 and beyond are reserved for future use. When the 1st cell
28-
has a value of 0 or 1, cells 4 and beyond act as padding, and may be
29-
ignored. It is recommended that padding cells have a value of 0.
27+
Cells 4 and beyond are reserved for future use and must have a value
28+
of 0 if present.
3029

3130
- reg : Specifies base physical address(s) and size of the GIC
3231
registers, in the following order:

‎Documentation/devicetree/bindings/net/renesas,ravb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ Example:
8282
"ch16", "ch17", "ch18", "ch19",
8383
"ch20", "ch21", "ch22", "ch23",
8484
"ch24";
85-
clocks = <&mstp8_clks R8A7795_CLK_ETHERAVB>;
86-
power-domains = <&cpg_clocks>;
85+
clocks = <&cpg CPG_MOD 812>;
86+
power-domains = <&cpg>;
8787
phy-mode = "rgmii-id";
8888
phy-handle = <&phy0>;
8989

‎Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ OHCI and EHCI controllers.
88
Required properties:
99
- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;
1010
"renesas,pci-r8a7791" for the R8A7791 SoC;
11+
"renesas,pci-r8a7793" for the R8A7793 SoC;
1112
"renesas,pci-r8a7794" for the R8A7794 SoC;
1213
"renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device
1314

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Required properties:
44
compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
55
"renesas,pcie-r8a7790" for the R8A7790 SoC;
66
"renesas,pcie-r8a7791" for the R8A7791 SoC;
7+
"renesas,pcie-r8a7793" for the R8A7793 SoC;
78
"renesas,pcie-r8a7795" for the R8A7795 SoC;
89
"renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.
910

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,59 +26,49 @@ Example:
2626
ti,pmic-shutdown-controller;
2727

2828
regulators {
29-
#address-cells = <1>;
30-
#size-cells = <0>;
31-
3229
dcdc1_reg: dcdc1 {
33-
reg = <0>;
3430
regulator-min-microvolt = <900000>;
3531
regulator-max-microvolt = <1800000>;
3632
regulator-boot-on;
3733
regulator-always-on;
3834
};
3935

4036
dcdc2_reg: dcdc2 {
41-
reg = <1>;
4237
regulator-min-microvolt = <900000>;
4338
regulator-max-microvolt = <3300000>;
4439
regulator-boot-on;
4540
regulator-always-on;
4641
};
4742

4843
dcdc3_reg: dcc3 {
49-
reg = <2>;
5044
regulator-min-microvolt = <900000>;
5145
regulator-max-microvolt = <1500000>;
5246
regulator-boot-on;
5347
regulator-always-on;
5448
};
5549

5650
ldo1_reg: ldo1 {
57-
reg = <3>;
5851
regulator-min-microvolt = <1000000>;
5952
regulator-max-microvolt = <3300000>;
6053
regulator-boot-on;
6154
regulator-always-on;
6255
};
6356

6457
ldo2_reg: ldo2 {
65-
reg = <4>;
6658
regulator-min-microvolt = <900000>;
6759
regulator-max-microvolt = <3300000>;
6860
regulator-boot-on;
6961
regulator-always-on;
7062
};
7163

7264
ldo3_reg: ldo3 {
73-
reg = <5>;
7465
regulator-min-microvolt = <1800000>;
7566
regulator-max-microvolt = <3300000>;
7667
regulator-boot-on;
7768
regulator-always-on;
7869
};
7970

8071
ldo4_reg: ldo4 {
81-
reg = <6>;
8272
regulator-min-microvolt = <1800000>;
8373
regulator-max-microvolt = <3300000>;
8474
regulator-boot-on;

‎Documentation/devicetree/bindings/rtc/s3c-rtc.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@ Required properties:
1414
interrupt number is the rtc alarm interrupt and second interrupt number
1515
is the rtc tick interrupt. The number of cells representing a interrupt
1616
depends on the parent interrupt controller.
17+
- clocks: Must contain a list of phandle and clock specifier for the rtc
18+
and source clocks.
19+
- clock-names: Must contain "rtc" and "rtc_src" entries sorted in the
20+
same order as the clocks property.
1721

1822
Example:
1923

2024
rtc@10070000 {
2125
compatible = "samsung,s3c6410-rtc";
2226
reg = <0x10070000 0x100>;
2327
interrupts = <44 0 45 0>;
28+
clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
29+
clock-names = "rtc", "rtc_src";
2430
};

‎Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Optional properties:
99
- fsl,uart-has-rtscts : Indicate the uart has rts and cts
1010
- fsl,irda-mode : Indicate the uart supports irda mode
1111
- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
12-
is DCE mode by default.
12+
in DCE mode by default.
1313

1414
Note: Each uart controller should have an alias correctly numbered
1515
in "aliases" node.

‎Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently:
3030
"fsl,imx-audio-sgtl5000"
3131
(compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)
3232

33+
"fsl,imx-audio-wm8960"
34+
3335
Required properties:
3436

3537
- compatible : Contains one of entries in the compatible list.

‎Documentation/devicetree/bindings/thermal/rcar-thermal.txt

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
* Renesas R-Car Thermal
22

33
Required properties:
4-
- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
5-
as fallback.
4+
- compatible : "renesas,thermal-<soctype>",
5+
"renesas,rcar-gen2-thermal" (with thermal-zone) or
6+
"renesas,rcar-thermal" (without thermal-zone) as fallback.
67
Examples with soctypes are:
78
- "renesas,thermal-r8a73a4" (R-Mobile APE6)
89
- "renesas,thermal-r8a7779" (R-Car H1)
@@ -36,3 +37,35 @@ thermal@e61f0000 {
3637
0xe61f0300 0x38>;
3738
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
3839
};
40+
41+
Example (with thermal-zone):
42+
43+
thermal-zones {
44+
cpu_thermal: cpu-thermal {
45+
polling-delay-passive = <1000>;
46+
polling-delay = <5000>;
47+
48+
thermal-sensors = <&thermal>;
49+
50+
trips {
51+
cpu-crit {
52+
temperature = <115000>;
53+
hysteresis = <0>;
54+
type = "critical";
55+
};
56+
};
57+
cooling-maps {
58+
};
59+
};
60+
};
61+
62+
thermal: thermal@e61f0000 {
63+
compatible = "renesas,thermal-r8a7790",
64+
"renesas,rcar-gen2-thermal",
65+
"renesas,rcar-thermal";
66+
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
67+
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
68+
clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;
69+
power-domains = <&cpg_clocks>;
70+
#thermal-sensor-cells = <0>;
71+
};

‎Documentation/filesystems/efivarfs.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ filesystem.
1414
efivarfs is typically mounted like this,
1515

1616
mount -t efivarfs none /sys/firmware/efi/efivars
17+
18+
Due to the presence of numerous firmware bugs where removing non-standard
19+
UEFI variables causes the system firmware to fail to POST, efivarfs
20+
files that are not well-known standardized variables are created
21+
as immutable files. This doesn't prevent removal - "chattr -i" will work -
22+
but it does prevent this kind of failure from being accomplished
23+
accidentally.

‎Documentation/kernel-parameters.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4235,6 +4235,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
42354235
The default value of this parameter is determined by
42364236
the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.
42374237

4238+
workqueue.debug_force_rr_cpu
4239+
Workqueue used to implicitly guarantee that work
4240+
items queued without explicit CPU specified are put
4241+
on the local CPU. This guarantee is no longer true
4242+
and while local CPU is still preferred work items
4243+
may be put on foreign CPUs. This debug option
4244+
forces round-robin CPU selection to flush out
4245+
usages which depend on the now broken guarantee.
4246+
When enabled, memory and cache locality will be
4247+
impacted.
4248+
42384249
x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
42394250
default x2apic cluster mode on platforms
42404251
supporting x2apic.

‎Documentation/timers/hpet.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
High Precision Event Timer Driver for Linux
22

33
The High Precision Event Timer (HPET) hardware follows a specification
4-
by Intel and Microsoft which can be found at
5-
6-
http://www.intel.com/hardwaredesign/hpetspec_1.pdf
4+
by Intel and Microsoft, revision 1.
75

86
Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision")
97
and up to 32 comparators. Normally three or more comparators are provided,

‎Documentation/virtual/kvm/mmu.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,8 @@ In the first case there are two additional complications:
358358
- if CR4.SMEP is enabled: since we've turned the page into a kernel page,
359359
the kernel may now execute it. We handle this by also setting spte.nx.
360360
If we get a user fetch or read fault, we'll change spte.u=1 and
361-
spte.nx=gpte.nx back.
361+
spte.nx=gpte.nx back. For this to work, KVM forces EFER.NX to 1 when
362+
shadow paging is in use.
362363
- if CR4.SMAP is disabled: since the page has been changed to a kernel
363364
page, it can not be reused when CR4.SMAP is enabled. We set
364365
CR4.SMAP && !CR0.WP into shadow page's role to avoid this case. Note,

‎Documentation/watchdog/watchdog-parameters.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,3 +400,7 @@ wm8350_wdt:
400400
nowayout: Watchdog cannot be stopped once started
401401
(default=kernel config parameter)
402402
-------------------------------------------------
403+
sun4v_wdt:
404+
timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000)
405+
nowayout: Watchdog cannot be stopped once started
406+
-------------------------------------------------

0 commit comments

Comments
 (0)