Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / exynos5440-ssdk5440.dts

diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
index d55042beb5c55f29739a5b8082a6bbed53e89d80..ede772741f81c13a2d6e62d3963b7219cb6196c8 100644 (file)
--- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts
+++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
@@ -10,18 +10,53 @@
 */
 
 /dts-v1/;
-/include/ "exynos5440.dtsi"
+#include "exynos5440.dtsi"
 
 / {
        model = "SAMSUNG SSDK5440 board based on EXYNOS5440";
        compatible = "samsung,ssdk5440", "samsung,exynos5440";
 
        chosen {
-               bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel early_printk no_console_suspend mem=2048M@0x80000000 console=ttySAC0,115200";
+               bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel early_printk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
        };
 
-       spi {
-               status = "disabled";
+       spi_0: spi@D0000 {
+
+               flash: w25q128@0 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "winbond,w25q128";
+                       spi-max-frequency = <15625000>;
+                       reg = <0>;
+                       controller-data {
+                               samsung,spi-feedback-delay = <0>;
+                       };
+
+                       partition@00000 {
+                               label = "BootLoader";
+                               reg = <0x60000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@e0000 {
+                               label = "Recovery-Kernel";
+                               reg = <0xe0000 0x300000>;
+                               read-only;
+                       };
+
+                       partition@3e0000 {
+                               label = "CRAM-FS";
+                               reg = <0x3e0000 0x700000>;
+                               read-only;
+                       };
+
+                       partition@ae0000 {
+                               label = "User-Data";
+                               reg = <0xae0000 0x520000>;
+                       };
+
+               };
+
        };
 
        fixed-rate-clocks {
@@ -30,4 +65,12 @@
                        clock-frequency = <50000000>;
                };
        };
+
+       pcie@290000 {
+               reset-gpio = <&pin_ctrl 5 0>;
+       };
+
+       pcie@2a0000 {
+               reset-gpio = <&pin_ctrl 22 0>;
+       };
 };