Commit f0dba776 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'davinci-for-v4.5/dts' of...

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
parents d4e68fa3 f0ad4353
...@@ -28,3 +28,11 @@ serial2: serial@1d0d000 { ...@@ -28,3 +28,11 @@ serial2: serial@1d0d000 {
}; };
}; };
}; };
&edma0 {
ti,edma-reserved-slot-ranges = <32 50>;
};
&edma1 {
ti,edma-reserved-slot-ranges = <32 90>;
};
...@@ -242,3 +242,11 @@ &mcasp0 { ...@@ -242,3 +242,11 @@ &mcasp0 {
tx-num-evt = <32>; tx-num-evt = <32>;
rx-num-evt = <32>; rx-num-evt = <32>;
}; };
&edma0 {
ti,edma-reserved-slot-ranges = <32 50>;
};
&edma1 {
ti,edma-reserved-slot-ranges = <32 90>;
};
...@@ -151,10 +151,44 @@ mii_pins: pinmux_mii_pins { ...@@ -151,10 +151,44 @@ mii_pins: pinmux_mii_pins {
}; };
edma0: edma@01c00000 { edma0: edma@01c00000 {
compatible = "ti,edma3"; compatible = "ti,edma3-tpcc";
reg = <0x0 0x10000>; /* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
interrupts = <11 13 12>; reg = <0x0 0x8000>;
#dma-cells = <1>; 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 { serial0: serial@1c42000 {
compatible = "ns16550a"; compatible = "ns16550a";
...@@ -201,6 +235,16 @@ mmc0: mmc@1c40000 { ...@@ -201,6 +235,16 @@ mmc0: mmc@1c40000 {
compatible = "ti,da830-mmc"; compatible = "ti,da830-mmc";
reg = <0x40000 0x1000>; reg = <0x40000 0x1000>;
interrupts = <16>; 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"; status = "disabled";
}; };
ehrpwm0: ehrpwm@01f00000 { ehrpwm0: ehrpwm@01f00000 {
...@@ -241,6 +285,8 @@ spi1: spi@1f0e000 { ...@@ -241,6 +285,8 @@ spi1: spi@1f0e000 {
num-cs = <4>; num-cs = <4>;
ti,davinci-spi-intr-line = <1>; ti,davinci-spi-intr-line = <1>;
interrupts = <56>; interrupts = <56>;
dmas = <&edma0 18 0>, <&edma0 19 0>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
mdio: mdio@1e24000 { mdio: mdio@1e24000 {
...@@ -285,8 +331,8 @@ mcasp0: mcasp@01d00000 { ...@@ -285,8 +331,8 @@ mcasp0: mcasp@01d00000 {
interrupts = <54>; interrupts = <54>;
interrupt-names = "common"; interrupt-names = "common";
status = "disabled"; status = "disabled";
dmas = <&edma0 1>, dmas = <&edma0 1 1>,
<&edma0 0>; <&edma0 0 1>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment