diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-05 11:27:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-05 11:27:23 +0200 |
| commit | bce6824cc8e86619901265b7e77c59cc9d99e05b (patch) | |
| tree | ad118914e1374c2ccd06999bc24bd2708897ff7f /arch/arm/boot/dts/stm32mp157c.dtsi | |
| parent | 494b5168f2de009eb80f198f668da374295098dd (diff) | |
| parent | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (diff) | |
| download | linux-bce6824cc8e86619901265b7e77c59cc9d99e05b.tar.bz2 | |
Merge branch 'x86/core' into x86/build, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/stm32mp157c.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/stm32mp157c.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi index 661be948ab74..185541a5b69f 100644 --- a/arch/arm/boot/dts/stm32mp157c.dtsi +++ b/arch/arm/boot/dts/stm32mp157c.dtsi @@ -1078,8 +1078,8 @@ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; clocks = <&rcc SPI6_K>; resets = <&rcc SPI6_R>; - dmas = <&mdma1 34 0x0 0x40008 0x0 0x0 0>, - <&mdma1 35 0x0 0x40002 0x0 0x0 0>; + dmas = <&mdma1 34 0x0 0x40008 0x0 0x0>, + <&mdma1 35 0x0 0x40002 0x0 0x0>; dma-names = "rx", "tx"; status = "disabled"; }; |