Merge tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm4708-netgear-r6250.dts

diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index ca92bba6a8c5b2002eb4a63daeaebfb78c2da44a..1049ab108b3271be85c314b906ea03e53c6c990c 100644 (file)
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -17,24 +17,13 @@
        model = "Netgear R6250 V1 (BCM4708)";
 
        chosen {
-               bootargs = "console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200 earlycon";
        };
 
        memory {
                reg = <0x00000000 0x08000000>;
        };
 
-       axi@18000000 {
-               usb3@23000 {
-                       reg = <0x00023000 0x1000>;
-
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -97,3 +86,7 @@
 &uart0 {
        status = "okay";
 };
+
+&usb3 {
+       vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
+};