diff options
| author |   Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
| commit | 4081b335592a46d506e9ab5725ba8d7cd8cea1d9 (patch) | |
| tree | 3aed3118e0e16349fdc2c7619046bf3854270c3c /Documentation/devicetree/bindings/timer | |
| parent | Merge tag 'renesas-dt-bindings-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt (diff) | |
| parent | ARM: dts: mmp3-dell-ariel: Enable the HSIC (diff) | |
| download | wireguard-linux-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.tar.xz wireguard-linux-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.zip | |
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/timer')
| -rw-r--r-- | Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml index 20adc1c8e9cc..23e989e09766 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml @@ -8,7 +8,7 @@ title: Allwinner A10 Timer Device Tree Bindings maintainers: - Chen-Yu Tsai <wens@csie.org> - - Maxime Ripard <maxime.ripard@bootlin.com> + - Maxime Ripard <mripard@kernel.org> properties: compatible: diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml index dfa0c41fd261..40fc4bcb3145 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml +++ b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml @@ -8,7 +8,7 @@ title: Allwinner A13 High-Speed Timer Device Tree Bindings maintainers: - Chen-Yu Tsai <wens@csie.org> - - Maxime Ripard <maxime.ripard@bootlin.com> + - Maxime Ripard <mripard@kernel.org> properties: compatible: |