Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap4-panda-common.dtsi

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 2b48e51c372ab70122e13ee13d4f4a11722cd632..5501d1b4e6cdfa152804b7cbb5b277fcdc0417f6 100644 (file)
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -13,6 +13,10 @@
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
 
+       chosen {
+               stdout-path = &uart3;
+       };
+
        aliases {
                display0 = &dvi0;
                display1 = &hdmi0;
@@ -85,6 +89,7 @@
        hsusb1_phy: hsusb1_phy {
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;   /* gpio_62 */
+               #phy-cells = <0>;
                vcc-supply = <&hsusb1_power>;
                clocks = <&auxclk3_ck>;
                clock-names = "main_clk";