Merge branch 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / da850-lcdk.dts

diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts
index 7b8ab21fed6c8afdbffcc1969dc53bc6f1c674b1..afcb4821deb18ffb71356a4a9c03f1e945728426 100644 (file)
--- 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";
 };
 
@@ -158,6 +159,14 @@
        rx-num-evt = <32>;
 };
 
+&usb_phy {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+};
+
 &aemif {
        pinctrl-names = "default";
        pinctrl-0 = <&nand_pins>;
@@ -219,3 +228,11 @@
                };
        };
 };
+
+&prictrl {
+       status = "okay";
+};
+
+&memctrl {
+       status = "okay";
+};