arm64: dts: qcom: Fix usb entries for SA8155p adp board

SA8155p adp board has two USB A-type receptacles called
USB-portB and USB-portC respectively.

While USB-portB is a USB High-Speed connector/interface, the
USB-portC one is a USB 3.1 Super-Speed connector/interface.

Also the USB-portB is used as the USB emergency
download port (for image download purposes).

Enable both the ports on the board in USB Host mode (since all
the USB interfaces are brought out to USB Type A
connectors).

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Link: https://lore.kernel.org/r/20210627114616.717101-4-bhupesh.sharma@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
index 0da7a3b8d1bf31633df5cc22a0cb014cdacc82a1..5ae2ddc65f7e4944ba4959817a9cc5d2917e3126 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
@@ -307,10 +307,6 @@
        status = "okay";
 };
 
-&tlmm {
-       gpio-reserved-ranges = <0 4>;
-};
-
 &uart2 {
        status = "okay";
 };
@@ -337,6 +333,16 @@
        vdda-pll-max-microamp = <18300>;
 };
 
+&usb_1 {
+       status = "okay";
+};
+
+&usb_1_dwc3 {
+       dr_mode = "host";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&usb2phy_ac_en1_default>;
+};
 
 &usb_1_hsphy {
        status = "okay";
@@ -346,15 +352,51 @@
 };
 
 &usb_1_qmpphy {
+       status = "disabled";
+};
+
+&usb_2 {
        status = "okay";
-       vdda-phy-supply = <&vreg_l8c_1p2>;
-       vdda-pll-supply = <&vdda_usb_ss_dp_core_1>;
 };
 
-&usb_1 {
+&usb_2_dwc3 {
+       dr_mode = "host";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&usb2phy_ac_en2_default>;
+};
+
+&usb_2_hsphy {
        status = "okay";
+       vdda-pll-supply = <&vdd_usb_hs_core>;
+       vdda33-supply = <&vdda_usb_hs_3p1>;
+       vdda18-supply = <&vdda_usb_hs_1p8>;
 };
 
-&usb_1_dwc3 {
-       dr_mode = "peripheral";
+&usb_2_qmpphy {
+       status = "okay";
+       vdda-phy-supply = <&vreg_l8c_1p2>;
+       vdda-pll-supply = <&vdda_usb_ss_dp_core_1>;
+};
+
+&tlmm {
+       gpio-reserved-ranges = <0 4>;
+
+       usb2phy_ac_en1_default: usb2phy_ac_en1_default {
+               mux {
+                       pins = "gpio113";
+                       function = "usb2phy_ac";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+       };
+
+       usb2phy_ac_en2_default: usb2phy_ac_en2_default {
+               mux {
+                       pins = "gpio123";
+                       function = "usb2phy_ac";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+       };
 };