diff options
| author | Olof Johansson | 2020-01-06 09:33:53 -0800 |
|---|---|---|
| committer | Olof Johansson | 2020-01-06 09:33:53 -0800 |
| commit | 4081b335592a46d506e9ab5725ba8d7cd8cea1d9 (patch) | |
| tree | 3aed3118e0e16349fdc2c7619046bf3854270c3c /Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml | |
| parent | 3b6930e82439895319bbd4fd5bf2d5b2a29f7915 (diff) | |
| parent | 0bc5f749bcb671547c8b126870bc60d06dcaccdf (diff) | |
Merge branch 'mmp/hsic' into arm/dt
* mmp/hsic:
ARM: dts: mmp3-dell-ariel: Enable the HSIC
ARM: dts: mmp3: Add HSIC controllers
dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy
clk: mmp2: Add HSIC clocks
dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks
+ Linux 5.5-rc2
Diffstat (limited to 'Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml b/Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml index 0ac52f83a58c..4a21fe77ee1d 100644 --- a/Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml @@ -8,7 +8,7 @@ title: Allwinner A10 PWM Device Tree Bindings maintainers: - Chen-Yu Tsai <wens@csie.org> - - Maxime Ripard <maxime.ripard@bootlin.com> + - Maxime Ripard <mripard@kernel.org> properties: "#pwm-cells": |