Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
81c3ee02
Commit
81c3ee02
authored
Oct 24, 2018
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/jz' into for-linus
parents
b29cf443
d426c517
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
261 additions
and
84 deletions
+261
-84
Documentation/devicetree/bindings/dma/jz4780-dma.txt
Documentation/devicetree/bindings/dma/jz4780-dma.txt
+10
-4
arch/mips/boot/dts/ingenic/jz4740.dtsi
arch/mips/boot/dts/ingenic/jz4740.dtsi
+15
-0
arch/mips/boot/dts/ingenic/jz4770.dtsi
arch/mips/boot/dts/ingenic/jz4770.dtsi
+30
-0
arch/mips/boot/dts/ingenic/jz4780.dtsi
arch/mips/boot/dts/ingenic/jz4780.dtsi
+2
-1
drivers/dma/Kconfig
drivers/dma/Kconfig
+1
-1
drivers/dma/dma-jz4780.c
drivers/dma/dma-jz4780.c
+203
-78
No files found.
Documentation/devicetree/bindings/dma/jz4780-dma.txt
View file @
81c3ee02
...
@@ -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>;
...
...
arch/mips/boot/dts/ingenic/jz4740.dtsi
View file @
81c3ee02
...
@@ -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>;
...
...
arch/mips/boot/dts/ingenic/jz4770.dtsi
View file @
81c3ee02
...
@@ -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>;
...
...
arch/mips/boot/dts/ingenic/jz4780.dtsi
View file @
81c3ee02
...
@@ -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>;
...
...
drivers/dma/Kconfig
View file @
81c3ee02
...
@@ -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 M
ACH_JZ4780
|| COMPILE_TEST
depends on M
IPS
|| COMPILE_TEST
select DMA_ENGINE
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
select DMA_VIRTUAL_CHANNELS
help
help
...
...
drivers/dma/dma-jz4780.c
View file @
81c3ee02
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment