Skip to content

Commit 74164d2

Browse files
committed
Merge tag 'pwm/for-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm updates from Thierry Reding: "This contains conversions of some more drivers to the atomic API as well as the addition of new chip support for some existing drivers. There are also various minor fixes and cleanups across the board, from drivers to device tree bindings" * tag 'pwm/for-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (45 commits) pwm: rcar: Simplify multiplication/shift logic dt-bindings: pwm: renesas,tpu: Do not require pwm-cells twice dt-bindings: pwm: tiehrpwm: Do not require pwm-cells twice dt-bindings: pwm: tiecap: Do not require pwm-cells twice dt-bindings: pwm: samsung: Do not require pwm-cells twice dt-bindings: pwm: intel,keembay: Do not require pwm-cells twice dt-bindings: pwm: brcm,bcm7038: Do not require pwm-cells twice dt-bindings: pwm: toshiba,visconti: Include generic PWM schema dt-bindings: pwm: renesas,pwm: Include generic PWM schema dt-bindings: pwm: sifive: Include generic PWM schema dt-bindings: pwm: rockchip: Include generic PWM schema dt-bindings: pwm: mxs: Include generic PWM schema dt-bindings: pwm: iqs620a: Include generic PWM schema dt-bindings: pwm: intel,lgm: Include generic PWM schema dt-bindings: pwm: imx: Include generic PWM schema dt-bindings: pwm: allwinner,sun4i-a10: Include generic PWM schema pwm: pwm-mediatek: Beautify error messages text pwm: pwm-mediatek: Allocate clk_pwms with devm_kmalloc_array pwm: pwm-mediatek: Simplify error handling with dev_err_probe() pwm: brcmstb: Remove useless locking ...
2 parents 4f37301 + ed14d36 commit 74164d2

38 files changed

+492
-401
lines changed

Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ properties:
8585

8686
ec-pwm:
8787
$ref: "/schemas/pwm/google,cros-ec-pwm.yaml#"
88+
deprecated: true
89+
90+
pwm:
91+
$ref: "/schemas/pwm/google,cros-ec-pwm.yaml#"
8892

8993
keyboard-controller:
9094
$ref: "/schemas/input/google,cros-ec-keyb.yaml#"

Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,36 @@ properties:
5252
resets:
5353
maxItems: 1
5454

55-
if:
56-
properties:
57-
compatible:
58-
contains:
59-
const: allwinner,sun50i-h6-pwm
60-
61-
then:
62-
properties:
63-
clocks:
64-
maxItems: 2
65-
66-
clock-names:
67-
items:
68-
- const: mod
69-
- const: bus
70-
71-
required:
72-
- clock-names
73-
- resets
74-
75-
else:
76-
properties:
77-
clocks:
78-
maxItems: 1
55+
56+
allOf:
57+
- $ref: pwm.yaml#
58+
59+
- if:
60+
properties:
61+
compatible:
62+
contains:
63+
const: allwinner,sun50i-h6-pwm
64+
65+
then:
66+
properties:
67+
clocks:
68+
maxItems: 2
69+
70+
clock-names:
71+
items:
72+
- const: mod
73+
- const: bus
74+
75+
required:
76+
- clock-names
77+
- resets
78+
79+
else:
80+
properties:
81+
clocks:
82+
maxItems: 1
7983

8084
required:
81-
- "#pwm-cells"
8285
- compatible
8386
- reg
8487
- clocks

Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ properties:
2828
required:
2929
- compatible
3030
- reg
31-
- "#pwm-cells"
3231
- clocks
3332

3433
additionalProperties: false

Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ description: |
1616
An EC PWM node should be only found as a sub-node of the EC node (see
1717
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml).
1818
19+
allOf:
20+
- $ref: pwm.yaml#
21+
1922
properties:
2023
compatible:
2124
const: google,cros-ec-pwm
@@ -39,7 +42,7 @@ examples:
3942
compatible = "google,cros-ec-spi";
4043
reg = <0>;
4144
42-
cros_ec_pwm: ec-pwm {
45+
cros_ec_pwm: pwm {
4346
compatible = "google,cros-ec-pwm";
4447
#pwm-cells = <1>;
4548
};

Documentation/devicetree/bindings/pwm/imx-pwm.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Freescale i.MX PWM controller
99
maintainers:
1010
- Philipp Zabel <p.zabel@pengutronix.de>
1111

12+
allOf:
13+
- $ref: pwm.yaml#
14+
1215
properties:
1316
"#pwm-cells":
1417
description: |
@@ -59,7 +62,6 @@ properties:
5962
maxItems: 1
6063

6164
required:
62-
- "#pwm-cells"
6365
- compatible
6466
- reg
6567
- clocks

Documentation/devicetree/bindings/pwm/imx-tpm-pwm.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ description: |
1313
The TPM counter and period counter are shared between multiple
1414
channels, so all channels should use same period setting.
1515
16+
allOf:
17+
- $ref: pwm.yaml#
18+
1619
properties:
1720
"#pwm-cells":
1821
const: 3
@@ -34,7 +37,6 @@ properties:
3437
maxItems: 1
3538

3639
required:
37-
- "#pwm-cells"
3840
- compatible
3941
- reg
4042
- clocks

Documentation/devicetree/bindings/pwm/intel,keembay-pwm.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ required:
3131
- compatible
3232
- reg
3333
- clocks
34-
- '#pwm-cells'
3534

3635
additionalProperties: false
3736

Documentation/devicetree/bindings/pwm/intel,lgm-pwm.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: LGM SoC PWM fan controller
99
maintainers:
1010
- Rahul Tanwar <rtanwar@maxlinear.com>
1111

12+
allOf:
13+
- $ref: pwm.yaml#
14+
1215
properties:
1316
compatible:
1417
const: intel,lgm-pwm

Documentation/devicetree/bindings/pwm/iqs620a-pwm.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ description: |
1515
Documentation/devicetree/bindings/mfd/iqs62x.yaml for further details as
1616
well as an example.
1717
18+
allOf:
19+
- $ref: pwm.yaml#
20+
1821
properties:
1922
compatible:
2023
enum:
@@ -25,7 +28,6 @@ properties:
2528

2629
required:
2730
- compatible
28-
- "#pwm-cells"
2931

3032
additionalProperties: false
3133

Documentation/devicetree/bindings/pwm/mxs-pwm.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ maintainers:
1010
- Shawn Guo <shawnguo@kernel.org>
1111
- Anson Huang <anson.huang@nxp.com>
1212

13+
allOf:
14+
- $ref: pwm.yaml#
15+
1316
properties:
1417
compatible:
1518
enum:
@@ -28,7 +31,6 @@ properties:
2831
required:
2932
- compatible
3033
- reg
31-
- "#pwm-cells"
3234
- fsl,pwm-number
3335

3436
additionalProperties: false

0 commit comments

Comments
 (0)