Skip to content

Commit c5c34f5

Browse files
wsakernelwsakernel
committed
Merge branch 'i2c/for-current' into i2c/for-mergewindow
2 parents 669b2e4 + 64570fb commit c5c34f5

File tree

1,267 files changed

+13740
-7447
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,267 files changed

+13740
-7447
lines changed

‎CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,7 @@ D: PowerPC
971971
N: Daniel Drake
972972
E: dsd@gentoo.org
973973
D: USBAT02 CompactFlash support in usb-storage
974+
D: ZD1211RW wireless driver
974975
S: UK
975976

976977
N: Oleg Drokin

‎Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Configuring the kernel
259259
Compiling the kernel
260260
--------------------
261261

262-
- Make sure you have at least gcc 4.9 available.
262+
- Make sure you have at least gcc 5.1 available.
263263
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.
264264

265265
Please note that you can still run a.out user programs with this kernel.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@
12661266
The VGA and EFI output is eventually overwritten by
12671267
the real console.
12681268

1269-
The xen output can only be used by Xen PV guests.
1269+
The xen option can only be used in Xen domains.
12701270

12711271
The sclp output can only be used on s390.
12721272

‎Documentation/core-api/irq/irq-domain.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
175175
case the Linux IRQ numbers cannot be dynamically assigned and the legacy
176176
mapping should be used.
177177

178-
As the name implies, the *_legacy() functions are deprecated and only
178+
As the name implies, the \*_legacy() functions are deprecated and only
179179
exist to ease the support of ancient platforms. No new users should be
180-
added.
180+
added. Same goes for the \*_simple() functions when their use results
181+
in the legacy behaviour.
181182

182183
The legacy map assumes a contiguous range of IRQ numbers has already
183184
been allocated for the controller and that the IRQ number can be

‎Documentation/devicetree/bindings/arm/tegra.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ properties:
5454
- const: toradex,apalis_t30
5555
- const: nvidia,tegra30
5656
- items:
57-
- const: toradex,apalis_t30-eval-v1.1
57+
- const: toradex,apalis_t30-v1.1-eval
5858
- const: toradex,apalis_t30-eval
5959
- const: toradex,apalis_t30-v1.1
6060
- const: toradex,apalis_t30

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050
data-lanes:
5151
description: array of physical DSI data lane indexes.
5252
minItems: 1
53-
maxItems: 4
5453
items:
5554
- const: 1
5655
- const: 2
@@ -71,7 +70,6 @@ properties:
7170
data-lanes:
7271
description: array of physical DSI data lane indexes.
7372
minItems: 1
74-
maxItems: 4
7573
items:
7674
- const: 1
7775
- const: 2

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ properties:
1818
const: ti,sn65dsi86
1919

2020
reg:
21-
const: 0x2d
21+
enum: [ 0x2c, 0x2d ]
2222

2323
enable-gpios:
2424
maxItems: 1

‎Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function block.
99

1010
All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
1111
For a description of the MMSYS_CONFIG binding, see
12-
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
12+
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.
1313

1414
DISP function blocks
1515
====================

‎Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ properties:
2222
items:
2323
- enum:
2424
# ili9341 240*320 Color on stm32f429-disco board
25-
- st,sf-tc240t-9370-t
25+
- st,sf-tc240t-9370-t
2626
- const: ilitek,ili9341
2727

2828
reg: true

‎Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ properties:
3131

3232
clocks:
3333
minItems: 1
34-
maxItems: 3
34+
maxItems: 7
3535

3636
clock-names:
3737
minItems: 1
38-
maxItems: 3
38+
maxItems: 7
3939

4040
required:
4141
- compatible
@@ -72,6 +72,32 @@ allOf:
7272
contains:
7373
enum:
7474
- qcom,sdm660-a2noc
75+
then:
76+
properties:
77+
clocks:
78+
items:
79+
- description: Bus Clock.
80+
- description: Bus A Clock.
81+
- description: IPA Clock.
82+
- description: UFS AXI Clock.
83+
- description: Aggregate2 UFS AXI Clock.
84+
- description: Aggregate2 USB3 AXI Clock.
85+
- description: Config NoC USB2 AXI Clock.
86+
clock-names:
87+
items:
88+
- const: bus
89+
- const: bus_a
90+
- const: ipa
91+
- const: ufs_axi
92+
- const: aggre2_ufs_axi
93+
- const: aggre2_usb3_axi
94+
- const: cfg_noc_usb2_axi
95+
96+
- if:
97+
properties:
98+
compatible:
99+
contains:
100+
enum:
75101
- qcom,sdm660-bimc
76102
- qcom,sdm660-cnoc
77103
- qcom,sdm660-gnoc
@@ -91,6 +117,7 @@ examples:
91117
- |
92118
#include <dt-bindings/clock/qcom,rpmcc.h>
93119
#include <dt-bindings/clock/qcom,mmcc-sdm660.h>
120+
#include <dt-bindings/clock/qcom,gcc-sdm660.h>
94121
95122
bimc: interconnect@1008000 {
96123
compatible = "qcom,sdm660-bimc";
@@ -123,9 +150,20 @@ examples:
123150
compatible = "qcom,sdm660-a2noc";
124151
reg = <0x01704000 0xc100>;
125152
#interconnect-cells = <1>;
126-
clock-names = "bus", "bus_a";
153+
clock-names = "bus",
154+
"bus_a",
155+
"ipa",
156+
"ufs_axi",
157+
"aggre2_ufs_axi",
158+
"aggre2_usb3_axi",
159+
"cfg_noc_usb2_axi";
127160
clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
128-
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;
161+
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
162+
<&rpmcc RPM_SMD_IPA_CLK>,
163+
<&gcc GCC_UFS_AXI_CLK>,
164+
<&gcc GCC_AGGRE2_UFS_AXI_CLK>,
165+
<&gcc GCC_AGGRE2_USB3_AXI_CLK>,
166+
<&gcc GCC_CFG_NOC_USB2_AXI_CLK>;
129167
};
130168
131169
mnoc: interconnect@1745000 {

‎Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ properties:
3131
maxItems: 1
3232

3333
port:
34-
$ref: /schemas/graph.yaml#/properties/port
34+
$ref: /schemas/graph.yaml#/$defs/port-base
3535
additionalProperties: false
3636

3737
properties:

‎Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

‎Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

‎Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

‎Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ properties:
2020
- snps,dwcmshc-sdhci
2121

2222
reg:
23-
minItems: 1
24-
items:
25-
- description: Offset and length of the register set for the device
23+
maxItems: 1
2624

2725
interrupts:
2826
maxItems: 1

‎Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ properties:
1919
- const: allwinner,sun8i-v3s-emac
2020
- const: allwinner,sun50i-a64-emac
2121
- items:
22-
- const: allwinner,sun50i-h6-emac
22+
- enum:
23+
- allwinner,sun20i-d1-emac
24+
- allwinner,sun50i-h6-emac
2325
- const: allwinner,sun50i-a64-emac
2426

2527
reg:

‎Documentation/devicetree/bindings/net/dsa/marvell.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Example:
8383
#interrupt-cells = <2>;
8484

8585
switch0: switch@0 {
86-
compatible = "marvell,mv88e6390";
86+
compatible = "marvell,mv88e6190";
8787
reg = <0>;
8888
reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
8989

‎Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434

3535
clocks:
3636
minItems: 3
37-
maxItems: 5
3837
items:
3938
- description: MAC host clock
4039
- description: MAC apb clock

‎Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ properties:
4141
- description: builtin MSI controller.
4242

4343
interrupt-names:
44-
minItems: 1
4544
items:
4645
- const: msi
4746

‎Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ufs/samsung,exynos-ufs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung SoC series UFS host controller Device Tree Bindings
8+
9+
maintainers:
10+
- Alim Akhtar <alim.akhtar@samsung.com>
11+
12+
description: |
13+
Each Samsung UFS host controller instance should have its own node.
14+
This binding define Samsung specific binding other then what is used
15+
in the common ufshcd bindings
16+
[1] Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
17+
18+
properties:
19+
20+
compatible:
21+
enum:
22+
- samsung,exynos7-ufs
23+
24+
reg:
25+
items:
26+
- description: HCI register
27+
- description: vendor specific register
28+
- description: unipro register
29+
- description: UFS protector register
30+
31+
reg-names:
32+
items:
33+
- const: hci
34+
- const: vs_hci
35+
- const: unipro
36+
- const: ufsp
37+
38+
clocks:
39+
items:
40+
- description: ufs link core clock
41+
- description: unipro main clock
42+
43+
clock-names:
44+
items:
45+
- const: core_clk
46+
- const: sclk_unipro_main
47+
48+
interrupts:
49+
maxItems: 1
50+
51+
phys:
52+
maxItems: 1
53+
54+
phy-names:
55+
const: ufs-phy
56+
57+
required:
58+
- compatible
59+
- reg
60+
- interrupts
61+
- phys
62+
- phy-names
63+
- clocks
64+
- clock-names
65+
66+
additionalProperties: false
67+
68+
examples:
69+
- |
70+
#include <dt-bindings/interrupt-controller/arm-gic.h>
71+
#include <dt-bindings/clock/exynos7-clk.h>
72+
73+
ufs: ufs@15570000 {
74+
compatible = "samsung,exynos7-ufs";
75+
reg = <0x15570000 0x100>,
76+
<0x15570100 0x100>,
77+
<0x15571000 0x200>,
78+
<0x15572000 0x300>;
79+
reg-names = "hci", "vs_hci", "unipro", "ufsp";
80+
interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
81+
clocks = <&clock_fsys1 ACLK_UFS20_LINK>,
82+
<&clock_fsys1 SCLK_UFSUNIPRO20_USER>;
83+
clock-names = "core_clk", "sclk_unipro_main";
84+
pinctrl-names = "default";
85+
pinctrl-0 = <&ufs_rst_n &ufs_refclk_out>;
86+
phys = <&ufs_phy>;
87+
phy-names = "ufs-phy";
88+
};
89+
...

‎Documentation/gpu/amdgpu.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ pcie_replay_count
300300
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
301301
:doc: pcie_replay_count
302302

303-
+GPU SmartShift Information
304-
============================
303+
GPU SmartShift Information
304+
==========================
305305

306306
GPU SmartShift information via sysfs
307307

‎Documentation/gpu/drm-internals.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ Component Helper Usage
111111
.. kernel-doc:: drivers/gpu/drm/drm_drv.c
112112
:doc: component helper usage recommendations
113113

114-
IRQ Helper Library
115-
~~~~~~~~~~~~~~~~~~
116-
117-
.. kernel-doc:: drivers/gpu/drm/drm_irq.c
118-
:doc: irq helpers
119-
120-
.. kernel-doc:: drivers/gpu/drm/drm_irq.c
121-
:export:
122-
123114
Memory Manager Initialization
124115
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
125116

‎Documentation/hwmon/k10temp.rst

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report
132132
Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported
133133
as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU
134134
variant.
135-
136-
Various Family 17h and 18h CPUs report voltage and current telemetry
137-
information. The following attributes may be reported.
138-
139-
Attribute Label Description
140-
=============== ======= ================
141-
in0_input Vcore Core voltage
142-
in1_input Vsoc SoC voltage
143-
curr1_input Icore Core current
144-
curr2_input Isoc SoC current
145-
=============== ======= ================
146-
147-
Current values are raw (unscaled) as reported by the CPU. Core current is
148-
reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A
149-
/ LSB. The real current is board specific. Reported currents should be seen
150-
as rough guidance, and should be scaled using sensors3.conf as appropriate
151-
for a given board.

‎Documentation/networking/device_drivers/ethernet/intel/ice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ NOTES:
851851
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with
852852
the following command::
853853

854-
# ethool -K <ethX> rxvlan off
854+
# ethtool -K <ethX> rxvlan off
855855

856856
- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS
857857
configured on the same port. 0x88a8/0x8100 traffic will not be received if

0 commit comments

Comments
 (0)