Merge tag 'davinci-for-v4.10/dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Pull "DaVinci DT updates for v4.10 (part 3)" from Sekhar Nori:

Some fixes for device-tree patches already queued.
- Fix SD card detect polarity
- Prevent Ethernet from picking a random mac address
- Fix error messages on platforms which dont use
  bus master and emif priority settings.

* tag 'davinci-for-v4.10/dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850: enable memctrl and mstpri nodes per board
  ARM: dts: da850-lcdk: Add ethernet0 alias to DT
  ARM: dts: da850-lcdk: fix mmc card detect polarity

2 files changed, 12 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts
index 03f9bfda5385..afcb4821deb1 100644
--- a/arch/arm/boot/dts/da850-lcdk.dts
+++ b/arch/arm/boot/dts/da850-lcdk.dts
@@ -13,6 +13,7 @@
 
         aliases {
                 serial2 = &serial2;
+                ethernet0 = &eth0;
         };
 
         chosen {
@@ -122,7 +123,7 @@
         bus-width = <4>;
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
-        cd-gpios = <&gpio 64 GPIO_ACTIVE_HIGH>;
+        cd-gpios = <&gpio 64 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
 
@@ -227,3 +228,11 @@
                 };
         };
 };
+
+&prictrl {
+        status = "okay";
+};
+
+&memctrl {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index ff13e95af298..4070619d823b 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -213,6 +213,7 @@
                 prictrl: priority-controller@14110 {
                         compatible = "ti,da850-mstpri";
                         reg = <0x14110 0x0c>;
+                        status = "disabled";
                 };
                 cfgchip: chip-controller@1417c {
                         compatible = "ti,da830-cfgchip", "syscon", "simple-mfd";
@@ -468,5 +469,6 @@
         memctrl: memory-controller@b0000000 {
                 compatible = "ti,da850-ddr-controller";
                 reg = <0xb0000000 0xe8>;
+                status = "disabled";
         };
 };