diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-12-30 21:17:51 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-12-30 21:17:51 +0300 |
| commit | 9fc85a7124b5ff9ec24ad391f9994f89ae611313 (patch) | |
| tree | cd4cb1b097a6ed502bd679a8b59ce00b55cae923 /arch/arm/boot/dts/dra7-l4.dtsi | |
| parent | 6e678a76b3451be4e099e30a4875bfc7be5ffd2f (diff) | |
| parent | 37b156ecf71ab74f8e991562f8d13825aaf07512 (diff) | |
| download | linux-9fc85a7124b5ff9ec24ad391f9994f89ae611313.tar.xz | |
Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata
Diffstat (limited to 'arch/arm/boot/dts/dra7-l4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra7-l4.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi index 13e77e9dc33c..c1740868042a 100644 --- a/arch/arm/boot/dts/dra7-l4.dtsi +++ b/arch/arm/boot/dts/dra7-l4.dtsi @@ -186,7 +186,6 @@ target-module@56000 { /* 0x4a056000, ap 9 02.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "dma_system"; reg = <0x56000 0x4>, <0x5602c 0x4>, <0x56028 0x4>; @@ -212,7 +211,7 @@ ranges = <0x0 0x56000 0x1000>; sdma: dma-controller@0 { - compatible = "ti,omap4430-sdma"; + compatible = "ti,omap4430-sdma", "ti,omap-sdma"; reg = <0x0 0x1000>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, |