Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 106 additions & 0 deletions Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml

@unicornx unicornx Jul 6, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3rd review:

对于 Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml 从 6.6 到 最新的 master 实际上经历了一个相对独立和渐进的修改过程,你这里 pick 的 e7abbff 实际上只包含了针对这个文件的最后一个 commit 的修改。

为了完整地反映 6.6 到 最新 master 的修改,我建议将针对这个文件的 4 个 commit 修改历史完整地纳入这个 PR,而不是合并成一个 commit 合入。一共有四个:

$ git log --oneline Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml
e7abbff5e8b2 dt-bindings: pwm: marvell,pxa-pwm: Add SpacemiT K3 PWM support
08e0b981231f dt-bindings: pwm: marvell,pxa-pwm: Add SpacemiT K1 PWM support
b3d8d1205104 dt-bindings: pwm: marvell,pxa: Do not require pwm-cells twice
bdc585f987a0 dt-bindings: pxa-pwm: Convert to YAML

cherry pick 这四个 commit 会帮助我们更好地维护和理解 6.6 与 master 的发展关系(譬如当我们增加 marvell,pxa-pwm.yaml 时,对应的 pxa-pwm.txt 应该删除,但这个改动在你的 commit 中没有体现出来,而 严格按照修改历史cherry-pick,上游的 bdc585f 实际上是有所反映的)。注意在每个 cherry-pick 中都要加上 backport 的说明以及你的签名。

binding 的修改相对独立,所以我理解可以这么做,k1 的部分这里先加进来也不会对编译啥的有影响。

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

历史commit均已添加

Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/pwm/marvell,pxa-pwm.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Marvell PXA PWM

maintainers:
- Duje Mihanović <duje.mihanovic@skole.hr>

allOf:
- $ref: pwm.yaml#
- if:
properties:
compatible:
contains:
enum:
- spacemit,k1-pwm
- spacemit,k3-pwm
then:
properties:
"#pwm-cells":
const: 3
else:
properties:
"#pwm-cells":
const: 1
description: |
Used for specifying the period length in nanoseconds.
- if:
properties:
compatible:
contains:
enum:
- spacemit,k3-pwm
then:
required:
- clock-names
properties:
clocks:
minItems: 2
clock-names:
minItems: 2
else:
properties:
clocks:
maxItems: 1
clock-names:
maxItems: 1

properties:
compatible:
oneOf:
- enum:
- marvell,pxa250-pwm
- marvell,pxa270-pwm
- marvell,pxa168-pwm
- marvell,pxa910-pwm
- items:
- enum:
- spacemit,k1-pwm
- spacemit,k3-pwm
- const: marvell,pxa910-pwm

reg:
# Length should be 0x10
maxItems: 1

"#pwm-cells":
description: Number of cells in a pwm specifier.

clocks:
minItems: 1
items:
- description: The function clock
- description: An optional bus clock

clock-names:
minItems: 1
maxItems: 2
oneOf:
- items:
- const: func
- const: bus

resets:
maxItems: 1

required:
- compatible
- reg
- clocks

additionalProperties: false

examples:
- |
#include <dt-bindings/clock/pxa-clock.h>

pwm0: pwm@40b00000 {
compatible = "marvell,pxa250-pwm";
reg = <0x40b00000 0x10>;
#pwm-cells = <1>;
clocks = <&clks CLK_PWM0>;
};
30 changes: 0 additions & 30 deletions Documentation/devicetree/bindings/pwm/pxa-pwm.txt

This file was deleted.

Loading
Loading