Skip to content

Commit bc94b99

Browse files
author
Ingo Molnar
committed
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 4650bac + fc77dbd commit bc94b99

File tree

1,279 files changed

+15332
-62124
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,279 files changed

+15332
-62124
lines changed

‎Documentation/cgroup-v2.txt

Lines changed: 5 additions & 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

@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back.
843843
Amount of memory used to cache filesystem data,
844844
including tmpfs and shared memory.
845845

846+
sock
847+
848+
Amount of memory used in network transmission buffers
849+
846850
file_mapped
847851

848852
Amount of cached filesystem data mapped with mmap()

‎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/brcm,bcmgenet.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ethernet@f0b60000 {
6868
phy1: ethernet-phy@1 {
6969
max-speed = <1000>;
7070
reg = <0x1>;
71-
compatible = "brcm,28nm-gphy", "ethernet-phy-ieee802.3-c22";
71+
compatible = "ethernet-phy-ieee802.3-c22";
7272
};
7373
};
7474
};
@@ -115,7 +115,7 @@ ethernet@f0ba0000 {
115115
phy0: ethernet-phy@0 {
116116
max-speed = <1000>;
117117
reg = <0x0>;
118-
compatible = "brcm,bcm53125", "ethernet-phy-ieee802.3-c22";
118+
compatible = "ethernet-phy-ieee802.3-c22";
119119
};
120120
};
121121
};

‎Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ Required properties:
44
- compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2".
55
"hisilicon,hns-dsaf-v1" is for hip05.
66
"hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612.
7-
- dsa-name: dsa fabric name who provide this interface.
8-
should be "dsafX", X is the dsaf id.
97
- mode: dsa fabric mode string. only support one of dsaf modes like these:
108
"2port-64vf",
119
"6port-16rss",
@@ -26,9 +24,8 @@ Required properties:
2624

2725
Example:
2826

29-
dsa: dsa@c7000000 {
27+
dsaf0: dsa@c7000000 {
3028
compatible = "hisilicon,hns-dsaf-v1";
31-
dsa_name = "dsaf0";
3229
mode = "6port-16rss";
3330
interrupt-parent = <&mbigen_dsa>;
3431
reg = <0x0 0xC0000000 0x0 0x420000

‎Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Required properties:
44
- compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2".
55
"hisilicon,hns-nic-v1" is for hip05.
66
"hisilicon,hns-nic-v2" is for Hi1610 and Hi1612.
7-
- ae-name: accelerator name who provides this interface,
8-
is simply a name referring to the name of name in the accelerator node.
7+
- ae-handle: accelerator engine handle for hns,
8+
specifies a reference to the associating hardware driver node.
9+
see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
910
- port-id: is the index of port provided by DSAF (the accelerator). DSAF can
1011
connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They
1112
are called debug ports.
@@ -41,7 +42,7 @@ Example:
4142

4243
ethernet@0{
4344
compatible = "hisilicon,hns-nic-v1";
44-
ae-name = "dsaf0";
45+
ae-handle = <&dsaf0>;
4546
port-id = <0>;
4647
local-mac-address = [a2 14 e4 4b 56 76];
4748
};

‎Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ Required properties:
66
- interrupts: interrupt for the device
77
- phy: See ethernet.txt file in the same directory.
88
- phy-mode: See ethernet.txt file in the same directory
9-
- clocks: a pointer to the reference clock for this device.
9+
- clocks: List of clocks for this device. At least one clock is
10+
mandatory for the core clock. If several clocks are given, then the
11+
clock-names property must be used to identify them.
1012

1113
Optional properties:
1214
- tx-csum-limit: maximum mtu supported by port that allow TX checksum.
1315
Value is presented in bytes. If not used, by default 1600B is set for
1416
"marvell,armada-370-neta" and 9800B for others.
17+
- clock-names: List of names corresponding to clocks property; shall be
18+
"core" for core clock and "bus" for the optional bus clock.
19+
1520

1621
Example:
1722

‎Documentation/devicetree/bindings/net/mdio-mux-gpio.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Example :
3838

3939
phy11: ethernet-phy@1 {
4040
reg = <1>;
41-
compatible = "marvell,88e1149r";
4241
marvell,reg-init = <3 0x10 0 0x5777>,
4342
<3 0x11 0 0x00aa>,
4443
<3 0x12 0 0x4105>,
@@ -48,7 +47,6 @@ Example :
4847
};
4948
phy12: ethernet-phy@2 {
5049
reg = <2>;
51-
compatible = "marvell,88e1149r";
5250
marvell,reg-init = <3 0x10 0 0x5777>,
5351
<3 0x11 0 0x00aa>,
5452
<3 0x12 0 0x4105>,
@@ -58,7 +56,6 @@ Example :
5856
};
5957
phy13: ethernet-phy@3 {
6058
reg = <3>;
61-
compatible = "marvell,88e1149r";
6259
marvell,reg-init = <3 0x10 0 0x5777>,
6360
<3 0x11 0 0x00aa>,
6461
<3 0x12 0 0x4105>,
@@ -68,7 +65,6 @@ Example :
6865
};
6966
phy14: ethernet-phy@4 {
7067
reg = <4>;
71-
compatible = "marvell,88e1149r";
7268
marvell,reg-init = <3 0x10 0 0x5777>,
7369
<3 0x11 0 0x00aa>,
7470
<3 0x12 0 0x4105>,
@@ -85,7 +81,6 @@ Example :
8581

8682
phy21: ethernet-phy@1 {
8783
reg = <1>;
88-
compatible = "marvell,88e1149r";
8984
marvell,reg-init = <3 0x10 0 0x5777>,
9085
<3 0x11 0 0x00aa>,
9186
<3 0x12 0 0x4105>,
@@ -95,7 +90,6 @@ Example :
9590
};
9691
phy22: ethernet-phy@2 {
9792
reg = <2>;
98-
compatible = "marvell,88e1149r";
9993
marvell,reg-init = <3 0x10 0 0x5777>,
10094
<3 0x11 0 0x00aa>,
10195
<3 0x12 0 0x4105>,
@@ -105,7 +99,6 @@ Example :
10599
};
106100
phy23: ethernet-phy@3 {
107101
reg = <3>;
108-
compatible = "marvell,88e1149r";
109102
marvell,reg-init = <3 0x10 0 0x5777>,
110103
<3 0x11 0 0x00aa>,
111104
<3 0x12 0 0x4105>,
@@ -115,7 +108,6 @@ Example :
115108
};
116109
phy24: ethernet-phy@4 {
117110
reg = <4>;
118-
compatible = "marvell,88e1149r";
119111
marvell,reg-init = <3 0x10 0 0x5777>,
120112
<3 0x11 0 0x00aa>,
121113
<3 0x12 0 0x4105>,

‎Documentation/devicetree/bindings/net/mdio-mux.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Example :
4747

4848
phy11: ethernet-phy@1 {
4949
reg = <1>;
50-
compatible = "marvell,88e1149r";
5150
marvell,reg-init = <3 0x10 0 0x5777>,
5251
<3 0x11 0 0x00aa>,
5352
<3 0x12 0 0x4105>,
@@ -57,7 +56,6 @@ Example :
5756
};
5857
phy12: ethernet-phy@2 {
5958
reg = <2>;
60-
compatible = "marvell,88e1149r";
6159
marvell,reg-init = <3 0x10 0 0x5777>,
6260
<3 0x11 0 0x00aa>,
6361
<3 0x12 0 0x4105>,
@@ -67,7 +65,6 @@ Example :
6765
};
6866
phy13: ethernet-phy@3 {
6967
reg = <3>;
70-
compatible = "marvell,88e1149r";
7168
marvell,reg-init = <3 0x10 0 0x5777>,
7269
<3 0x11 0 0x00aa>,
7370
<3 0x12 0 0x4105>,
@@ -77,7 +74,6 @@ Example :
7774
};
7875
phy14: ethernet-phy@4 {
7976
reg = <4>;
80-
compatible = "marvell,88e1149r";
8177
marvell,reg-init = <3 0x10 0 0x5777>,
8278
<3 0x11 0 0x00aa>,
8379
<3 0x12 0 0x4105>,
@@ -94,7 +90,6 @@ Example :
9490

9591
phy21: ethernet-phy@1 {
9692
reg = <1>;
97-
compatible = "marvell,88e1149r";
9893
marvell,reg-init = <3 0x10 0 0x5777>,
9994
<3 0x11 0 0x00aa>,
10095
<3 0x12 0 0x4105>,
@@ -104,7 +99,6 @@ Example :
10499
};
105100
phy22: ethernet-phy@2 {
106101
reg = <2>;
107-
compatible = "marvell,88e1149r";
108102
marvell,reg-init = <3 0x10 0 0x5777>,
109103
<3 0x11 0 0x00aa>,
110104
<3 0x12 0 0x4105>,
@@ -114,7 +108,6 @@ Example :
114108
};
115109
phy23: ethernet-phy@3 {
116110
reg = <3>;
117-
compatible = "marvell,88e1149r";
118111
marvell,reg-init = <3 0x10 0 0x5777>,
119112
<3 0x11 0 0x00aa>,
120113
<3 0x12 0 0x4105>,
@@ -124,7 +117,6 @@ Example :
124117
};
125118
phy24: ethernet-phy@4 {
126119
reg = <4>;
127-
compatible = "marvell,88e1149r";
128120
marvell,reg-init = <3 0x10 0 0x5777>,
129121
<3 0x11 0 0x00aa>,
130122
<3 0x12 0 0x4105>,

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ Optional Properties:
1717
"ethernet-phy-ieee802.3-c22" or "ethernet-phy-ieee802.3-c45" for
1818
PHYs that implement IEEE802.3 clause 22 or IEEE802.3 clause 45
1919
specifications. If neither of these are specified, the default is to
20-
assume clause 22. The compatible list may also contain other
21-
elements.
20+
assume clause 22.
2221

2322
If the phy's identifier is known then the list may contain an entry
2423
of the form: "ethernet-phy-idAAAA.BBBB" where
@@ -28,6 +27,9 @@ Optional Properties:
2827
4 hex digits. This is the chip vendor OUI bits 19:24,
2928
followed by 10 bits of a vendor specific ID.
3029

30+
The compatible list should not contain other values than those
31+
listed here.
32+
3133
- max-speed: Maximum PHY supported speed (10, 100, 1000...)
3234

3335
- broken-turn-around: If set, indicates the PHY device does not correctly

‎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.

0 commit comments

Comments
 (0)