Commit bfd5d21a authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson

arm64: dts: qcom: msm8916: Move common USB properties to msm8916.dtsi

Right now we define "hnp-disable", "srp-disable", "adp-disable"
separately for every MSM8916 board that has USB working.

They are needed for USB to work properly if CONFIG_USB_OTG_FSM
is enabled. This is because the chipidea OTG FSM code waits for
interrupts regarding the VBUS state (AVVIS). Those never happen
on MSM8916 because VBUS is always connected to the PMIC instead
of the USB controller.

There was a patch [1] to work around this but ultimately it was
decided that it's easier to disable the OTG FSM altogether using
these properties. This works fine for most use cases, because the
OTG FSM isn't needed for simple dual role host/gadget operation.

Given that these properties are needed for every MSM8916 device,
move them to msm8916.dtsi so we can avoid some more duplication.

[1]: https://lore.kernel.org/lkml/20160707222114.1673-10-stephen.boyd@linaro.org/Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200720085406.6716-11-stephan@gerhold.netSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent b0d330c2
...@@ -379,9 +379,6 @@ codec { ...@@ -379,9 +379,6 @@ codec {
&usb { &usb {
status = "okay"; status = "okay";
extcon = <&usb_id>, <&usb_id>; extcon = <&usb_id>, <&usb_id>;
adp-disable;
hnp-disable;
srp-disable;
pinctrl-names = "default", "device"; pinctrl-names = "default", "device";
pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>; pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>;
......
...@@ -87,10 +87,6 @@ &usb { ...@@ -87,10 +87,6 @@ &usb {
status = "okay"; status = "okay";
dr_mode = "peripheral"; dr_mode = "peripheral";
extcon = <&usb_vbus>; extcon = <&usb_vbus>;
hnp-disable;
srp-disable;
adp-disable;
}; };
&usb_hs_phy { &usb_hs_phy {
......
...@@ -153,10 +153,6 @@ &sdhc_2 { ...@@ -153,10 +153,6 @@ &sdhc_2 {
&usb { &usb {
status = "okay"; status = "okay";
extcon = <&muic>, <&muic>; extcon = <&muic>, <&muic>;
hnp-disable;
srp-disable;
adp-disable;
}; };
&usb_hs_phy { &usb_hs_phy {
......
...@@ -802,6 +802,9 @@ usb: usb@78d9000 { ...@@ -802,6 +802,9 @@ usb: usb@78d9000 {
reset-names = "core"; reset-names = "core";
phy_type = "ulpi"; phy_type = "ulpi";
dr_mode = "otg"; dr_mode = "otg";
hnp-disable;
srp-disable;
adp-disable;
ahb-burst-config = <0>; ahb-burst-config = <0>;
phy-names = "usb-phy"; phy-names = "usb-phy";
phys = <&usb_hs_phy>; phys = <&usb_hs_phy>;
......
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