Skip to content

Commit 3551a3f

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.17/letsketch' into for-linus
- new driver to support for LetSketch device (Hans de Goede)
2 parents 906095a + 33a5c27 commit 3551a3f

523 files changed

Lines changed: 5756 additions & 1964 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.

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
126126
Greg Kroah-Hartman <greg@kroah.com>
127127
Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
128128
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
129+
Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
130+
Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
129131
Gustavo Padovan <gustavo@las.ic.unicamp.br>
130132
Gustavo Padovan <padovan@profusion.mobi>
131133
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ allOf:
2020

2121
properties:
2222
compatible:
23-
enum:
24-
- apple,t8103-i2c
25-
- apple,i2c
23+
items:
24+
- const: apple,t8103-i2c
25+
- const: apple,i2c
2626

2727
reg:
2828
maxItems: 1
@@ -51,7 +51,7 @@ unevaluatedProperties: false
5151
examples:
5252
- |
5353
i2c@35010000 {
54-
compatible = "apple,t8103-i2c";
54+
compatible = "apple,t8103-i2c", "apple,i2c";
5555
reg = <0x35010000 0x4000>;
5656
interrupt-parent = <&aic>;
5757
interrupts = <0 627 4>;

Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ examples:
136136
samsung,syscon-phandle = <&pmu_system_controller>;
137137
138138
/* NTC thermistor is a hwmon device */
139-
ncp15wb473 {
139+
thermistor {
140140
compatible = "murata,ncp15wb473";
141141
pullup-uv = <1800000>;
142142
pullup-ohm = <47000>;

Documentation/devicetree/bindings/input/gpio-keys.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ examples:
142142
down {
143143
label = "GPIO Key DOWN";
144144
linux,code = <108>;
145-
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
145+
interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
146146
};
147147
};
148148

Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ properties:
7979

8080
properties:
8181
data-lanes:
82+
description:
83+
Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.
8284
items:
8385
minItems: 1
8486
maxItems: 4
@@ -91,18 +93,6 @@ properties:
9193
required:
9294
- data-lanes
9395

94-
allOf:
95-
- if:
96-
properties:
97-
compatible:
98-
contains:
99-
const: fsl,imx7-mipi-csi2
100-
then:
101-
properties:
102-
data-lanes:
103-
items:
104-
maxItems: 2
105-
10696
port@1:
10797
$ref: /schemas/graph.yaml#/properties/port
10898
description:

Documentation/devicetree/bindings/net/ethernet-phy.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,14 @@ properties:
9191
compensate for the board being designed with the lanes
9292
swapped.
9393

94+
enet-phy-lane-no-swap:
95+
$ref: /schemas/types.yaml#/definitions/flag
96+
description:
97+
If set, indicates that PHY will disable swap of the
98+
TX/RX lanes. This property allows the PHY to work correcly after
99+
e.g. wrong bootstrap configuration caused by issues in PCB
100+
layout design.
101+
94102
eee-broken-100tx:
95103
$ref: /schemas/types.yaml#/definitions/flag
96104
description:

Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ properties:
2929
- PHY_TYPE_PCIE
3030
- PHY_TYPE_SATA
3131
- PHY_TYPE_SGMII
32-
- PHY_TYPE_USB
32+
- PHY_TYPE_USB3
3333
- description: The PHY instance
3434
minimum: 0
3535
maximum: 1 # for DP, SATA or USB

Documentation/devicetree/bindings/power/supply/bq25980.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ examples:
105105
reg = <0x65>;
106106
interrupt-parent = <&gpio1>;
107107
interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
108-
ti,watchdog-timer = <0>;
108+
ti,watchdog-timeout-ms = <0>;
109109
ti,sc-ocp-limit-microamp = <2000000>;
110110
ti,sc-ovp-limit-microvolt = <17800000>;
111111
monitored-battery = <&bat>;

Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,19 @@ patternProperties:
5151
description:
5252
Properties for single BUCK regulator.
5353

54+
properties:
55+
op_mode:
56+
$ref: /schemas/types.yaml#/definitions/uint32
57+
enum: [0, 1, 2, 3]
58+
default: 1
59+
description: |
60+
Describes the different operating modes of the regulator with power
61+
mode change in SOC. The different possible values are:
62+
0 - always off mode
63+
1 - on in normal mode
64+
2 - low power mode
65+
3 - suspend mode
66+
5467
required:
5568
- regulator-name
5669

@@ -63,6 +76,18 @@ patternProperties:
6376
Properties for single BUCK regulator.
6477

6578
properties:
79+
op_mode:
80+
$ref: /schemas/types.yaml#/definitions/uint32
81+
enum: [0, 1, 2, 3]
82+
default: 1
83+
description: |
84+
Describes the different operating modes of the regulator with power
85+
mode change in SOC. The different possible values are:
86+
0 - always off mode
87+
1 - on in normal mode
88+
2 - low power mode
89+
3 - suspend mode
90+
6691
s5m8767,pmic-ext-control-gpios:
6792
maxItems: 1
6893
description: |

Documentation/devicetree/bindings/sound/wlf,wm8962.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ properties:
1919
clocks:
2020
maxItems: 1
2121

22+
interrupts:
23+
maxItems: 1
24+
2225
"#sound-dai-cells":
2326
const: 0
2427

0 commit comments

Comments
 (0)