diff options
| author |   Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:10 -0700 |
|---|---|---|
| committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:10 -0700 |
| commit | d121f07691415df824e6b60520f782f6d13b3c81 (patch) | |
| tree | 422ad3cc6fd631604fef4e469e49bacba8202e52 /arch/arm/boot/dts/am437x-cm-t43.dts | |
| parent | libnvdimm, namespace: remove redundant initialization of 'nd_mapping' (diff) | |
| parent | dax: require 'struct page' by default for filesystem dax (diff) | |
| download | linux-dev-d121f07691415df824e6b60520f782f6d13b3c81.tar.xz linux-dev-d121f07691415df824e6b60520f782f6d13b3c81.zip | |
Merge branch 'for-4.16/dax' into libnvdimm-for-next
Diffstat (limited to 'arch/arm/boot/dts/am437x-cm-t43.dts')
| -rw-r--r-- | arch/arm/boot/dts/am437x-cm-t43.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am437x-cm-t43.dts b/arch/arm/boot/dts/am437x-cm-t43.dts index 9e92d480576b..3b9a94c274a7 100644 --- a/arch/arm/boot/dts/am437x-cm-t43.dts +++ b/arch/arm/boot/dts/am437x-cm-t43.dts @@ -301,8 +301,8 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&spi0_pins>; - dmas = <&edma 16 - &edma 17>; + dmas = <&edma 16 0 + &edma 17 0>; dma-names = "tx0", "rx0"; flash: w25q64cvzpig@0 { |