Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5420-arndale-octa.dts

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index f509e8fc290f59541100de086594f788b8beec93..80a3bf4c59865e0403a4197abb5ae6f0bc00d363 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -16,7 +16,7 @@
 
 / {
        model = "Insignal Arndale Octa evaluation board based on EXYNOS5420";
-       compatible = "insignal,arndale-octa", "samsung,exynos5420";
+       compatible = "insignal,arndale-octa", "samsung,exynos5420", "samsung,exynos5";
 
        memory {
                reg = <0x20000000 0x80000000>;
@@ -113,6 +113,7 @@
                                        regulator-name = "PVDD_APIO_MMCON_1V8";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
+                                       regulator-always-on;
                                };
 
                                ldo4_reg: LDO4 {
@@ -150,6 +151,7 @@
                                        regulator-name = "PVDD_USB_3V3";
                                        regulator-min-microvolt = <3000000>;
                                        regulator-max-microvolt = <3000000>;
+                                       regulator-always-on;
                                };
 
                                ldo10_reg: LDO10 {
@@ -218,6 +220,7 @@
                                        regulator-name = "PVDD_MIFS_1V1";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
+                                       regulator-always-on;
                                };
 
                                ldo24_reg: LDO24 {
@@ -361,4 +364,16 @@
                        gpio-key,wakeup;
                };
        };
+
+       amba {
+               mdma1: mdma@11C10000 {
+                       /*
+                        * MDMA1 can support both secure and non-secure
+                        * AXI transactions. When this is enabled in the kernel
+                        * for boards that run in secure mode, we are getting
+                        * imprecise external aborts causing the kernel to oops.
+                        */
+                       status = "disabled";
+               };
+       };
 };