Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dts: am57xx-beagle-x15: mark full 2GB as valid memory.

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>

diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
index 971a7ca,7a5973d..9dcff38
--- 1/arch/arm/boot/dts/am57xx-beagle-x15.dts
--- 2/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@@ -24,43 -24,9 +24,43 @@@
  
        memory {
                device_type = "memory";
-               reg = <0x80000000 0x40000000>; /* 1GB to start. Target 2GB */
+               reg = <0x80000000 0x80000000>;
        };
  
 +      reserved-memory {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              ipu2_cma_pool: ipu2_cma@95800000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x95800000 0x3800000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              dsp1_cma_pool: dsp1_cma@99000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x99000000 0x4000000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              ipu1_cma_pool: ipu1_cma@9d000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x9d000000 0x2000000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              dsp2_cma_pool: dsp2_cma@9f000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x9f000000 0x800000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +      };
 +
        vdd_3v3: fixedregulator-vdd_3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_3v3";