diff options
author | 2025-06-06 13:16:50 -0700 | |
---|---|---|
committer | 2025-06-06 13:16:50 -0700 | |
commit | 8a2ba6f8ee7dd764ffec4484e4f4d5ad377f9a69 (patch) | |
tree | 1ee405b98e80cb5c5d9457bc227322f43b46efcc /Documentation | |
parent | Merge tag 'block-6.16-20250606' of git://git.kernel.dk/linux (diff) | |
parent | pwm: axi-pwmgen: fix missing separate external clock (diff) | |
download | linux-rng-8a2ba6f8ee7dd764ffec4484e4f4d5ad377f9a69.tar.xz linux-rng-8a2ba6f8ee7dd764ffec4484e4f4d5ad377f9a69.zip |
Merge tag 'pwm/for-6.16-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux
Pull pwm fixes from Uwe Kleine-König:
"axi-pwmgen: Fix handling of external clock
The pwm-axi-pwmgen device is backed by an FPGA and can be synthesized
in different ways. Relevant here is that it can use one or two
external clock signals. These fix clock handling for the two clocks
case"
* tag 'pwm/for-6.16-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
pwm: axi-pwmgen: fix missing separate external clock
dt-bindings: pwm: adi,axi-pwmgen: Fix clocks
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml b/Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml index 45e112d0efb4..5575c58357d6 100644 --- a/Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml +++ b/Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml @@ -30,11 +30,19 @@ properties: const: 3 clocks: - maxItems: 1 + minItems: 1 + maxItems: 2 + + clock-names: + minItems: 1 + items: + - const: axi + - const: ext required: - reg - clocks + - clock-names unevaluatedProperties: false @@ -43,6 +51,7 @@ examples: pwm@44b00000 { compatible = "adi,axi-pwmgen-2.00.a"; reg = <0x44b00000 0x1000>; - clocks = <&spi_clk>; + clocks = <&fpga_clk>, <&spi_clk>; + clock-names = "axi", "ext"; #pwm-cells = <3>; }; |