Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[pandora-kernel.git] / arch / arm / boot / dts / spear13xx.dtsi

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 4382547..40accc8 100644 (file)
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -83,8 +83,8 @@
                #size-cells = <1>;
                compatible = "simple-bus";
                ranges = <0x50000000 0x50000000 0x10000000
-                         0xb0000000 0xb0000000 0x10000000
-                         0xd0000000 0xd0000000 0x02000000
+                         0x80000000 0x80000000 0x20000000
+                         0xb0000000 0xb0000000 0x22000000
                          0xd8000000 0xd8000000 0x01000000
                          0xe0000000 0xe0000000 0x10000000>;
 
@@ -117,7 +117,7 @@
                        chan_priority = <1>;
                        block_size = <0xfff>;
                        dma-masters = <2>;
-                       data_width = <3 3 0 0>;
+                       data_width = <3 3>;
                };
 
                dma@eb000000 {
@@ -133,7 +133,7 @@
                        chan_allocation_order = <1>;
                        chan_priority = <1>;
                        block_size = <0xfff>;
-                       data_width = <3 3 0 0>;
+                       data_width = <3 3>;
                };
 
                fsmc: flash@b0000000 {
@@ -220,6 +220,11 @@
                                  0xd8000000 0xd8000000 0x01000000
                                  0xe0000000 0xe0000000 0x10000000>;
 
+                       misc: syscon@e0700000 {
+                               compatible = "st,spear1340-misc", "syscon";
+                               reg = <0xe0700000 0x1000>;
+                       };
+
                        gpio0: gpio@e0600000 {
                                compatible = "arm,pl061", "arm,primecell";
                                reg = <0xe0600000 0x1000>;