Commit b880bf09 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'zynq-dt-for-4.6' of https://github.com/Xilinx/linux-xlnx into next/dt

Merge "ARM: Xilinx Zynq dt patches for v4.6" from Michal Simek

- Add usb phy for Zybo
- Use earlycon instead of earlyprintk

* tag 'zynq-dt-for-4.6' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Use earlycon instead of earlyprintk
  ARM: dts: zynq: Enable USB and USB PHY for ZYBO
parents 8be31869 07bf429d
...@@ -34,7 +34,7 @@ memory { ...@@ -34,7 +34,7 @@ memory {
}; };
chosen { chosen {
bootargs = "earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; bootargs = "earlycon root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
}; };
......
...@@ -30,7 +30,7 @@ memory { ...@@ -30,7 +30,7 @@ memory {
}; };
chosen { chosen {
bootargs = "earlyprintk"; bootargs = "earlycon";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
......
...@@ -30,7 +30,7 @@ memory { ...@@ -30,7 +30,7 @@ memory {
}; };
chosen { chosen {
bootargs = "earlyprintk"; bootargs = "earlycon";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
......
...@@ -29,7 +29,7 @@ memory { ...@@ -29,7 +29,7 @@ memory {
}; };
chosen { chosen {
bootargs = "earlyprintk"; bootargs = "earlycon";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
......
...@@ -29,10 +29,15 @@ memory { ...@@ -29,10 +29,15 @@ memory {
}; };
chosen { chosen {
bootargs = "earlyprintk"; bootargs = "earlycon";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
usb_phy0: phy0 {
#phy-cells = <0>;
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio0 46 1>;
};
}; };
&clkc { &clkc {
...@@ -56,3 +61,9 @@ &sdhci0 { ...@@ -56,3 +61,9 @@ &sdhci0 {
&uart1 { &uart1 {
status = "okay"; status = "okay";
}; };
&usb0 {
status = "okay";
dr_mode = "host";
usb-phy = <&usb_phy0>;
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment