-
Notifications
You must be signed in to change notification settings - Fork 38
pwm: spacemit: Add Support for K3 SoC #319
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
EncrowThorne19
wants to merge
7
commits into
RVCK-Project:rvck-6.6
Choose a base branch
from
EncrowThorne19:dev-pwm-k3
base: rvck-6.6
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
812a996
dt-bindings: pxa-pwm: Convert to YAML
LegoLivesMatter 306782e
dt-bindings: pwm: marvell,pxa: Do not require pwm-cells twice
AaronDot bd8862d
dt-bindings: pwm: marvell,pxa-pwm: Add SpacemiT K1 PWM support
eec8806
dt-bindings: pwm: marvell,pxa-pwm: Add SpacemiT K3 PWM support
80c7936
pwm: pxa: Add optional bus clock
f020e13
pwm: pxa: Adapt SpacemiT K3 PWM support
encrow eb1edde
riscv: dts: spacemit: k3: Add pwm support
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
106 changes: 106 additions & 0 deletions
106
Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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>; | ||
| }; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
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 合入。一共有四个:
cherry pick 这四个 commit 会帮助我们更好地维护和理解 6.6 与 master 的发展关系(譬如当我们增加 marvell,pxa-pwm.yaml 时,对应的 pxa-pwm.txt 应该删除,但这个改动在你的 commit 中没有体现出来,而 严格按照修改历史cherry-pick,上游的 bdc585f 实际上是有所反映的)。注意在每个 cherry-pick 中都要加上 backport 的说明以及你的签名。
binding 的修改相对独立,所以我理解可以这么做,k1 的部分这里先加进来也不会对编译啥的有影响。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
历史commit均已添加