Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits)
  [POWERPC] Remove build warnings in windfarm_core
  [POWERPC] Pass per-file CFLAGs for platform specific op codes
  [POWERPC] Correct #endif comment
  [POWERPC] Fix ppc_rtas_progress_show()
  [POWERPC] Fix sed command lines for zlib source construction
  [POWERPC] Specify GNUTARGET on $(AR) invocations
  [POWERPC] Make sure device node type/name is not NULL on hot-added nodes
  [POWERPC] Small fixes for the Ebony device tree
  [POWERPC] Fix warning on UP
  [POWERPC] cell_defconfig: Disable cpufreq and pmi
  [POWERPC] Fix IO space on PCI buses created from of_platform
  [POWERPC] Add spinlock to request_phb_iospace()
  [POWERPC] Fix make rules for treeImage.initrd
  [POWERPC] Remove warning in mpic.c
  [POWERPC] Update pasemi_defconfig
  [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed
  [POWERPC] Update iseries_defconfig
  [POWERPC] Wire up some more syscalls
  [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()
  [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
  ...

1 files changed, 16 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 6b084605bb4b..3033599e74e8 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -48,6 +48,22 @@
                 reg = <e0000000 00100000>;      // CCSRBAR 1M
                 bus-frequency = <0>;            // Filled out by uboot.
 
+                memory-controller@2000 {
+                        compatible = "fsl,8544-memory-controller";
+                        reg = <2000 1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <2 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8544-l2-cache-controller";
+                        reg = <20000 1000>;
+                        cache-line-size = <20>; // 32 bytes
+                        cache-size = <40000>;   // L2, 256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0 2>;
+                };
+
                 i2c@3000 {
                         device_type = "i2c";
                         compatible = "fsl-i2c";