git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
Documentation
/
powerpc
/
dts-bindings
/
fsl
/
dma.txt
diff --git
a/Documentation/powerpc/dts-bindings/fsl/dma.txt
b/Documentation/powerpc/dts-bindings/fsl/dma.txt
index
cc45311
..
0732cdd
100644
(file)
--- a/
Documentation/powerpc/dts-bindings/fsl/dma.txt
+++ b/
Documentation/powerpc/dts-bindings/fsl/dma.txt
@@
-35,30
+35,30
@@
Example:
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
- reg = <82a8 4>;
- ranges = <0
8100
1a4>;
+ reg = <
0x
82a8 4>;
+ ranges = <0
0x8100 0x
1a4>;
interrupt-parent = <&ipic>;
interrupt-parent = <&ipic>;
- interrupts = <
47
8>;
+ interrupts = <
71
8>;
cell-index = <0>;
dma-channel@0 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <0>;
cell-index = <0>;
dma-channel@0 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <0>;
- reg = <0 80>;
+ reg = <0
0x
80>;
};
dma-channel@80 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <1>;
};
dma-channel@80 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <1>;
- reg = <
80
80>;
+ reg = <
0x80 0x
80>;
};
dma-channel@100 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <2>;
};
dma-channel@100 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <2>;
- reg = <
100
80>;
+ reg = <
0x100 0x
80>;
};
dma-channel@180 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <3>;
};
dma-channel@180 {
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
cell-index = <3>;
- reg = <
180
80>;
+ reg = <
0x180 0x
80>;
};
};
};
};
@@
-93,36
+93,36
@@
Example:
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
- reg = <21300 4>;
- ranges = <0
21100
200>;
+ reg = <
0x
21300 4>;
+ ranges = <0
0x21100 0x
200>;
cell-index = <0>;
dma-channel@0 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
cell-index = <0>;
dma-channel@0 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
- reg = <0 80>;
+ reg = <0
0x
80>;
cell-index = <0>;
interrupt-parent = <&mpic>;
cell-index = <0>;
interrupt-parent = <&mpic>;
- interrupts = <
14
2>;
+ interrupts = <
20
2>;
};
dma-channel@80 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
};
dma-channel@80 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
- reg = <
80
80>;
+ reg = <
0x80 0x
80>;
cell-index = <1>;
interrupt-parent = <&mpic>;
cell-index = <1>;
interrupt-parent = <&mpic>;
- interrupts = <
15
2>;
+ interrupts = <
21
2>;
};
dma-channel@100 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
};
dma-channel@100 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
- reg = <
100
80>;
+ reg = <
0x100 0x
80>;
cell-index = <2>;
interrupt-parent = <&mpic>;
cell-index = <2>;
interrupt-parent = <&mpic>;
- interrupts = <
16
2>;
+ interrupts = <
22
2>;
};
dma-channel@180 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
};
dma-channel@180 {
compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
- reg = <
180
80>;
+ reg = <
0x180 0x
80>;
cell-index = <3>;
interrupt-parent = <&mpic>;
cell-index = <3>;
interrupt-parent = <&mpic>;
- interrupts = <
17
2>;
+ interrupts = <
23
2>;
};
};
};
};