Merge commit 'v3.15' into next

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / k2hk-evm.dts

diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts
index 1a1335b4a0b1d25fc0e2cbfcacaca3a7b3c9c330..c93d06f9f2a8db17e9d05b65766136c803247cff 100644 (file)
--- a/arch/arm/boot/dts/k2hk-evm.dts
+++ b/arch/arm/boot/dts/k2hk-evm.dts
@@ -13,7 +13,7 @@
 #include "k2hk.dtsi"
 
 / {
-       compatible =  "ti,k2hk-evm";
+       compatible =  "ti,k2hk-evm","ti,keystone";
        model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
 
        soc {
@@ -133,7 +133,7 @@
 
                        partition@180000 {
                                label = "ubifs";
-                               reg = <0x180000 0x7E80000>;
+                               reg = <0x180000 0x1fe80000>;
                        };
                };
        };