diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2017-02-10 15:15:56 +0100 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2017-02-10 15:15:56 +0100 |
| commit | 38b0a526ec33314ee1d9926e3a347078f63eac8e (patch) | |
| tree | 7deea94e326a36567ccdf9a35188657305d1b5cc /Documentation | |
| parent | 776906ff0350de74441a2e2387a2a69f55f0f71c (diff) | |
| parent | 326ed314fefebb259563926c8c6110a009562e07 (diff) | |
Merge branch 'for-4.11/drivers' into for-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/imx-pwm.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pwm/imx-pwm.txt b/Documentation/devicetree/bindings/pwm/imx-pwm.txt index e00c2e9f484d..c61bdf8cd41b 100644 --- a/Documentation/devicetree/bindings/pwm/imx-pwm.txt +++ b/Documentation/devicetree/bindings/pwm/imx-pwm.txt @@ -6,8 +6,8 @@ Required properties: - "fsl,imx1-pwm" for PWM compatible with the one integrated on i.MX1 - "fsl,imx27-pwm" for PWM compatible with the one integrated on i.MX27 - reg: physical base address and length of the controller's registers -- #pwm-cells: should be 2. See pwm.txt in this directory for a description of - the cells format. +- #pwm-cells: 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.txt + in this directory for a description of the cells format. - clocks : Clock specifiers for both ipg and per clocks. - clock-names : Clock names should include both "ipg" and "per" See the clock consumer binding, @@ -17,7 +17,7 @@ See the clock consumer binding, Example: pwm1: pwm@53fb4000 { - #pwm-cells = <2>; + #pwm-cells = <3>; compatible = "fsl,imx53-pwm", "fsl,imx27-pwm"; reg = <0x53fb4000 0x4000>; clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>, |