leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EDMA device-tree updates including move to

Browse Source 
new EDMA bindings and EDMA support for MMC/SD
 and SPI.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJWe9hFAAoJEGFBu2jqvgRNUPEP/jX7Vsqj1nYSZIT9uhTL2yhG
 u+TVPqAt90LDl0ikfc6GoUS0DOtNvO3LLWIocgcrn29ltEWJUmhm3E3p0KLuY3Kx
 WEkvL/qc+9DtLXPPwOz2Svhc4yhmW9wxw4vseqUplJJyBGmBMFTh4gUr8gej72uF
 +gQRVRxmENeIoPHzqFWnf34HJvzyVORxbzOrcRemfhYYfs+ES5KU0LXLYh1TNC1a
 87gKv/EsyhKVn5JEAQlRbkMqf+r+JwwcFWnwB0/OFP65S6iy0v+xzAjYgRe3W5Y0
 ylTdMUKf8JNassU7ig1Lh509OqNTE0a7SuIZG2P56Q58XgepyDSreiGxi0lXFnqF
 Cfd+05xAY4wn2q9d6mF4S4vclcTzVC7z22z68zCdtDfhMTCrLuSI9SsXWMkTZmUe
 E7lSk3rGfN63dN6BGIkciqWIKgGeEPOzKOHD8kuMOYHehwCOudVU3TZ346Y+DV1e
 X6haDjbxIwjVXy3ILF0mgty4poMmvW/eeZNIB4k315IACUGDg53PXrCdEagLEAEl
 1vDym6NX28apSPPNaBX6adniK59SsyrplSu1HqcW7i/UZ67bWjZR/0cYCRWD+hKX
 v44vEvNrUFUF+Fjqied1lxDNtH9QdTFt1j+gjrhqJrmya4L9MCwNZ1PacunmfPDX
 eFpZbRrD+0kAGiqlBEem
 =dKhP
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.5/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Merge "DaVinci device-tree updates for v4.5" from Sekhar Nori:

EDMA device-tree updates including move to
new EDMA bindings and EDMA support for MMC/SD
and SPI.

* tag 'davinci-for-v4.5/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: DTS: da850: Enable DMA for SPI1
  ARM: DTS: da850: Add node for mmc1
  ARM: DTS: da850: Enable DMA use for MMC0
  ARM: DTS: da850: Enable eDMA1
  ARM: DTS: da850: Use the new DT bindings for the eDMA3
  ARM: DTS: da850: fix edma0 reg space
This commit is contained in:
Arnd Bergmann 2015-12-31 16:27:45 +01:00
commit f0dba77620
3 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/da850-enbw-cmc.dts
View File

@ -28,3 +28,11 @@
};
};
};
&edma0 {
ti,edma-reserved-slot-ranges = <32 50>;
};
&edma1 {
ti,edma-reserved-slot-ranges = <32 90>;
};

8
arch/arm/boot/dts/da850-evm.dts
View File

@ -242,3 +242,11 @@
tx-num-evt = <32>;
rx-num-evt = <32>;
};
&edma0 {
ti,edma-reserved-slot-ranges = <32 50>;
};
&edma1 {
ti,edma-reserved-slot-ranges = <32 90>;
};

58
arch/arm/boot/dts/da850.dtsi
View File

@ -151,10 +151,44 @@
};
edma0: edma@01c00000 {
compatible = "ti,edma3";
reg = <0x0 0x10000>;
interrupts = <11 13 12>;
#dma-cells = <1>;
compatible = "ti,edma3-tpcc";
/* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
reg = <0x0 0x8000>;
reg-names = "edma3_cc";
interrupts = <11 12>;
interrupt-names = "edma3_ccint", "edma3_ccerrint";
#dma-cells = <2>;
ti,tptcs = <&edma0_tptc0 7>, <&edma0_tptc1 0>;
};
edma0_tptc0: tptc@01c08000 {
compatible = "ti,edma3-tptc";
reg = <0x8000 0x400>;
interrupts = <13>;
interrupt-names = "edm3_tcerrint";
};
edma0_tptc1: tptc@01c08400 {
compatible = "ti,edma3-tptc";
reg = <0x8400 0x400>;
interrupts = <32>;
interrupt-names = "edm3_tcerrint";
};
edma1: edma@01e30000 {
compatible = "ti,edma3-tpcc";
/* eDMA3 CC1: 0x01e3 0000 - 0x01e3 7fff */
reg = <0x230000 0x8000>;
reg-names = "edma3_cc";
interrupts = <93 94>;
interrupt-names = "edma3_ccint", "edma3_ccerrint";
#dma-cells = <2>;
ti,tptcs = <&edma1_tptc0 7>;
};
edma1_tptc0: tptc@01e38000 {
compatible = "ti,edma3-tptc";
reg = <0x238000 0x400>;
interrupts = <95>;
interrupt-names = "edm3_tcerrint";
};
serial0: serial@1c42000 {
compatible = "ns16550a";
@ -201,6 +235,16 @@
compatible = "ti,da830-mmc";
reg = <0x40000 0x1000>;
interrupts = <16>;
dmas = <&edma0 16 0>, <&edma0 17 0>;
dma-names = "rx", "tx";
status = "disabled";
};
mmc1: mmc@1e1b000 {
compatible = "ti,da830-mmc";
reg = <0x21b000 0x1000>;
interrupts = <72>;
dmas = <&edma1 28 0>, <&edma1 29 0>;
dma-names = "rx", "tx";
status = "disabled";
};
ehrpwm0: ehrpwm@01f00000 {
@ -241,6 +285,8 @@
num-cs = <4>;
ti,davinci-spi-intr-line = <1>;
interrupts = <56>;
dmas = <&edma0 18 0>, <&edma0 19 0>;
dma-names = "rx", "tx";
status = "disabled";
};
mdio: mdio@1e24000 {
@ -285,8 +331,8 @@
interrupts = <54>;
interrupt-names = "common";
status = "disabled";
dmas = <&edma0 1>,
<&edma0 0>;
dmas = <&edma0 1 1>,
<&edma0 0 1>;
dma-names = "tx", "rx";
};
};