diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-13 15:03:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-13 15:03:25 -0800 |
| commit | 1482e664fe353775c48d3f9d3e5059b9853d4d99 (patch) | |
| tree | 0eed08bafdc51fb69fbb43a12d94b64716a40fdd /Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml | |
| parent | dd79b5361a6ab3def4a577843ebfecd75b634c8b (diff) | |
| parent | ee9b280e17dce51c44e1d04d11eb0a4acd0ee1a9 (diff) | |
Merge tag 'devicetree-fixes-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree fixes from Rob Herring:
- Fix for dependency tracking caused by unittest interaction
- Fix some schema errors in Tegra memory controller schema
- Update Maxime Ripard's email address
- Review fixes to TI cpsw-switch
- Add wakeup-source prop for STM32 rproc. Got dropped in the schema
conversion.
* tag 'devicetree-fixes-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of/platform: Unconditionally pause/resume sync state during kernel init
dt-bindings: memory-controllers: tegra: Fix type references
dt-bindings: Change maintainer address
dt-bindings: net: ti: cpsw-switch: update to fix comments
dt-bindings: remoteproc: stm32: add wakeup-source property
Diffstat (limited to 'Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml b/Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml index 740b7f9b535b..c1676b96daac 100644 --- a/Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml +++ b/Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml @@ -8,7 +8,7 @@ title: Allwinner A31 DMA Controller Device Tree Bindings maintainers: - Chen-Yu Tsai <wens@csie.org> - - Maxime Ripard <maxime.ripard@bootlin.com> + - Maxime Ripard <mripard@kernel.org> allOf: - $ref: "dma-controller.yaml#" |