Skip to content

Commit f38b751

Browse files
committed
Merge tag 'pwm/for-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux
Pull pwm updates from Uwe Kleine-König: "Apart from the usual mix of new drivers (pwm-argon-fan-hat), adding support for variants to existing drivers, minor improvements to both drivers and docs, device tree documenation updates, the noteworthy changes are: - A hwmon companion driver to pwm-mc33xs2410 living in drivers/hwmon and acked by Guenter Roeck - chardev support for PWM devices. This leverages atomic PWM updates to userspace and at the same time simplifies and accelerates PWM configuration changes" * tag 'pwm/for-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux: (35 commits) pwm: raspberrypi-poe: Fix spelling mistake "Firwmware" -> "Firmware" hwmon: add support for MC33XS2410 hardware monitoring pwm: mc33xs2410: add hwmon support pwm: img: Remove redundant pm_runtime_mark_last_busy() calls pwm: Expose PWM_WFHWSIZE in public header dt-bindings: pwm: Convert lpc32xx-pwm.txt to yaml format docs: pwm: Adapt Locking paragraph to reality pwm: twl-led: Drop driver local locking pwm: sun4i: Drop driver local locking pwm: sti: Drop driver local locking pwm: microchip-core: Drop driver local locking pwm: lpc18xx-sct: Drop driver local locking pwm: fsl-ftm: Drop driver local locking pwm: clps711x: Drop driver local locking pwm: atmel: Drop driver local locking pwm: argon-fan-hat: Add Argon40 Fan HAT support dt-bindings: pwm: argon40,fan-hat: Document Argon40 Fan HAT dt-bindings: vendor-prefixes: Document Argon40 pwm: pwm-mediatek: Add support for PWM IP V3.0.2 in MT6991/MT8196 pwm: pwm-mediatek: Pass PWM_CK_26M_SEL from platform data ...
2 parents 0262163 + 68b9272 commit f38b751

Some content is hidden

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

41 files changed

+1227
-306
lines changed

Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description:
1414
The Analog Devices AXI PWM generator can generate PWM signals
1515
with variable pulse width and period.
1616

17-
https://wiki.analog.com/resources/fpga/docs/axi_pwm_gen
17+
https://analogdevicesinc.github.io/hdl/library/axi_pwm_gen/index.html
1818

1919
allOf:
2020
- $ref: pwm.yaml#
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pwm/argon40,fan-hat.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Argon40 Fan HAT PWM controller
8+
9+
maintainers:
10+
- Marek Vasut <[email protected]>
11+
12+
description:
13+
The trivial PWM on Argon40 Fan HAT, which is a RaspberryPi blower fan
14+
hat which can be controlled over I2C, generates a fixed 30 kHz period
15+
PWM signal with configurable 0..100% duty cycle to control the fan
16+
speed.
17+
18+
allOf:
19+
- $ref: pwm.yaml#
20+
21+
properties:
22+
compatible:
23+
const: argon40,fan-hat
24+
25+
reg:
26+
maxItems: 1
27+
28+
"#pwm-cells":
29+
const: 3
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
i2c {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
pwm@1a {
44+
compatible = "argon40,fan-hat";
45+
reg = <0x1a>;
46+
#pwm-cells = <3>;
47+
};
48+
};

Documentation/devicetree/bindings/pwm/lpc1850-sct-pwm.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,47 @@ maintainers:
1111

1212
allOf:
1313
- $ref: pwm.yaml#
14+
- if:
15+
properties:
16+
compatible:
17+
contains:
18+
const: spacemit,k1-pwm
19+
then:
20+
properties:
21+
"#pwm-cells":
22+
const: 3
23+
else:
24+
properties:
25+
"#pwm-cells":
26+
const: 1
27+
description: |
28+
Used for specifying the period length in nanoseconds.
1429
1530
properties:
1631
compatible:
17-
enum:
18-
- marvell,pxa250-pwm
19-
- marvell,pxa270-pwm
20-
- marvell,pxa168-pwm
21-
- marvell,pxa910-pwm
32+
oneOf:
33+
- enum:
34+
- marvell,pxa250-pwm
35+
- marvell,pxa270-pwm
36+
- marvell,pxa168-pwm
37+
- marvell,pxa910-pwm
38+
- items:
39+
- const: spacemit,k1-pwm
40+
- const: marvell,pxa910-pwm
2241

2342
reg:
2443
# Length should be 0x10
2544
maxItems: 1
2645

2746
"#pwm-cells":
28-
# Used for specifying the period length in nanoseconds
29-
const: 1
47+
description: Number of cells in a pwm specifier.
3048

3149
clocks:
3250
maxItems: 1
3351

52+
resets:
53+
maxItems: 1
54+
3455
required:
3556
- compatible
3657
- reg

Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- enum:
1919
- mediatek,mt2712-pwm
2020
- mediatek,mt6795-pwm
21+
- mediatek,mt6991-pwm
2122
- mediatek,mt7622-pwm
2223
- mediatek,mt7623-pwm
2324
- mediatek,mt7628-pwm
@@ -32,6 +33,10 @@ properties:
3233
- enum:
3334
- mediatek,mt8195-pwm
3435
- const: mediatek,mt8183-pwm
36+
- items:
37+
- enum:
38+
- mediatek,mt8196-pwm
39+
- const: mediatek,mt6991-pwm
3540

3641
reg:
3742
maxItems: 1
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pwm/nxp,lpc1850-sct-pwm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP LPC18xx State Configurable Timer
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: nxp,lpc1850-sct-pwm
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
clock-names:
23+
items:
24+
- const: pwm
25+
26+
'#pwm-cells':
27+
const: 3
28+
29+
resets:
30+
maxItems: 1
31+
32+
required:
33+
- compatible
34+
- reg
35+
- clocks
36+
- clock-names
37+
- '#pwm-cells'
38+
39+
allOf:
40+
- $ref: pwm.yaml#
41+
42+
unevaluatedProperties: false
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/clock/lpc18xx-ccu.h>
47+
48+
pwm@40000000 {
49+
compatible = "nxp,lpc1850-sct-pwm";
50+
reg = <0x40000000 0x1000>;
51+
clocks =<&ccu1 CLK_CPU_SCT>;
52+
clock-names = "pwm";
53+
#pwm-cells = <3>;
54+
};
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pwm/nxp,lpc3220-pwm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP LPC32XX PWM controller
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- nxp,lpc3220-pwm
16+
- nxp,lpc3220-motor-pwm
17+
18+
reg:
19+
maxItems: 1
20+
21+
clocks:
22+
maxItems: 1
23+
24+
'#pwm-cells':
25+
const: 3
26+
27+
required:
28+
- compatible
29+
- reg
30+
- '#pwm-cells'
31+
32+
allOf:
33+
- $ref: pwm.yaml#
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
pwm@4005c000 {
40+
compatible = "nxp,lpc3220-pwm";
41+
reg = <0x4005c000 0x4>;
42+
#pwm-cells = <3>;
43+
};
44+

Documentation/devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ allOf:
1717

1818
properties:
1919
compatible:
20-
const: sophgo,sg2042-pwm
20+
enum:
21+
- sophgo,sg2042-pwm
22+
- sophgo,sg2044-pwm
2123

2224
reg:
2325
maxItems: 1

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ patternProperties:
149149
description: Arctic Sand
150150
"^arcx,.*":
151151
description: arcx Inc. / Archronix Inc.
152+
"^argon40,.*":
153+
description: Argon 40 Technologies Limited
152154
"^ariaboard,.*":
153155
description: Shanghai Novotech Co., Ltd. (Ariaboard)
154156
"^aries,.*":

0 commit comments

Comments
 (0)