Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / rk3066a-marsboard.dts

diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts
index 0a7304beb417713c82d25a6a35b5daafef5c4e76..bae965c123c165d38fb8d8836667ae749893f283 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rk3066a-marsboard.dts
@@ -48,6 +48,7 @@
        compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
 
        memory {
+               device_type = "memory";
                reg = <0x60000000 0x40000000>;
        };
 
@@ -201,6 +202,18 @@
        status = "okay";
 };
 
+&usbphy {
+       status = "okay";
+};
+
+&usb_host {
+       status = "okay";
+};
+
+&usb_otg {
+       status = "okay";
+};
+
 &wdt {
        status = "okay";
 };