Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...

1 files changed, 38 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
index f96de398c965..ba88cfd2486f 100644
--- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts
+++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
@@ -17,11 +17,46 @@
         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 {