Commit 81c3ee02 authored by Vinod Koul's avatar Vinod Koul

Merge branch 'topic/jz' into for-linus

parents b29cf443 d426c517
...@@ -2,8 +2,13 @@ ...@@ -2,8 +2,13 @@
Required properties: Required properties:
- compatible: Should be "ingenic,jz4780-dma" - compatible: Should be one of:
- reg: Should contain the DMA controller registers location and length. * ingenic,jz4740-dma
* ingenic,jz4725b-dma
* ingenic,jz4770-dma
* ingenic,jz4780-dma
- reg: Should contain the DMA channel registers location and length, followed
by the DMA controller registers location and length.
- interrupts: Should contain the interrupt specifier of the DMA controller. - interrupts: Should contain the interrupt specifier of the DMA controller.
- clocks: Should contain a clock specifier for the JZ4780 PDMA clock. - clocks: Should contain a clock specifier for the JZ4780 PDMA clock.
- #dma-cells: Must be <2>. Number of integer cells in the dmas property of - #dma-cells: Must be <2>. Number of integer cells in the dmas property of
...@@ -19,9 +24,10 @@ Optional properties: ...@@ -19,9 +24,10 @@ Optional properties:
Example: Example:
dma: dma@13420000 { dma: dma-controller@13420000 {
compatible = "ingenic,jz4780-dma"; compatible = "ingenic,jz4780-dma";
reg = <0x13420000 0x10000>; reg = <0x13420000 0x400
0x13421000 0x40>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <10>; interrupts = <10>;
......
...@@ -154,6 +154,21 @@ uart1: serial@10031000 { ...@@ -154,6 +154,21 @@ uart1: serial@10031000 {
clock-names = "baud", "module"; clock-names = "baud", "module";
}; };
dmac: dma-controller@13020000 {
compatible = "ingenic,jz4740-dma";
reg = <0x13020000 0xbc
0x13020300 0x14>;
#dma-cells = <2>;
interrupt-parent = <&intc>;
interrupts = <29>;
clocks = <&cgu JZ4740_CLK_DMA>;
/* Disable dmac until we have something that uses it */
status = "disabled";
};
uhc: uhc@13030000 { uhc: uhc@13030000 {
compatible = "ingenic,jz4740-ohci", "generic-ohci"; compatible = "ingenic,jz4740-ohci", "generic-ohci";
reg = <0x13030000 0x1000>; reg = <0x13030000 0x1000>;
......
...@@ -196,6 +196,36 @@ uart3: serial@10033000 { ...@@ -196,6 +196,36 @@ uart3: serial@10033000 {
status = "disabled"; status = "disabled";
}; };
dmac0: dma-controller@13420000 {
compatible = "ingenic,jz4770-dma";
reg = <0x13420000 0xC0
0x13420300 0x20>;
#dma-cells = <1>;
clocks = <&cgu JZ4770_CLK_DMA>;
interrupt-parent = <&intc>;
interrupts = <24>;
/* Disable dmac0 until we have something that uses it */
status = "disabled";
};
dmac1: dma-controller@13420100 {
compatible = "ingenic,jz4770-dma";
reg = <0x13420100 0xC0
0x13420400 0x20>;
#dma-cells = <1>;
clocks = <&cgu JZ4770_CLK_DMA>;
interrupt-parent = <&intc>;
interrupts = <23>;
/* Disable dmac1 until we have something that uses it */
status = "disabled";
};
uhc: uhc@13430000 { uhc: uhc@13430000 {
compatible = "generic-ohci"; compatible = "generic-ohci";
reg = <0x13430000 0x1000>; reg = <0x13430000 0x1000>;
......
...@@ -266,7 +266,8 @@ nemc: nemc@13410000 { ...@@ -266,7 +266,8 @@ nemc: nemc@13410000 {
dma: dma@13420000 { dma: dma@13420000 {
compatible = "ingenic,jz4780-dma"; compatible = "ingenic,jz4780-dma";
reg = <0x13420000 0x10000>; reg = <0x13420000 0x400
0x13421000 0x40>;
#dma-cells = <2>; #dma-cells = <2>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
...@@ -143,7 +143,7 @@ config DMA_JZ4740 ...@@ -143,7 +143,7 @@ config DMA_JZ4740
config DMA_JZ4780 config DMA_JZ4780
tristate "JZ4780 DMA support" tristate "JZ4780 DMA support"
depends on MACH_JZ4780 || COMPILE_TEST depends on MIPS || COMPILE_TEST
select DMA_ENGINE select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS select DMA_VIRTUAL_CHANNELS
help help
......
This diff is collapsed.
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