diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 03:46:01 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 03:46:01 +0300 |
commit | 0ed537b5fd18c38b526fd0e6837a00f96aee30c4 (patch) | |
tree | 01744d89b09aaaaad77696265fb4732ef9a8fc32 /Documentation/devicetree/bindings/dma/apm-xgene-dma.txt | |
parent | 72e624de6e6f0d5a638fbc23842aa76ae048e9e7 (diff) | |
parent | 50a3cb04a5f9cd5323a76db9ee409a7f3004259a (diff) | |
download | linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.tar.xz |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'Documentation/devicetree/bindings/dma/apm-xgene-dma.txt')
-rw-r--r-- | Documentation/devicetree/bindings/dma/apm-xgene-dma.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt index d3058768b23d..c53e0b08032f 100644 --- a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt +++ b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt @@ -35,7 +35,7 @@ Example: device_type = "dma"; reg = <0x0 0x1f270000 0x0 0x10000>, <0x0 0x1f200000 0x0 0x10000>, - <0x0 0x1b008000 0x0 0x2000>, + <0x0 0x1b000000 0x0 0x400000>, <0x0 0x1054a000 0x0 0x100>; interrupts = <0x0 0x82 0x4>, <0x0 0xb8 0x4>, |