evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Enable DRD mode for 2nd USB controller on MSM8996 Auto"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-06 13:21:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3eb3dbc346
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
View file

@ -1238,9 +1238,6 @@
&usb2s { &usb2s {
status = "ok"; status = "ok";
dwc3@7600000 {
dr_mode = "host";
};
}; };
&usb3 { &usb3 {

13
drivers/usb/dwc3/dwc3-msm.c
View file

@ -2671,12 +2671,16 @@ static int dwc3_msm_extcon_register(struct dwc3_msm *mdwc)
{ {
struct device_node *node = mdwc->dev->of_node; struct device_node *node = mdwc->dev->of_node;
struct extcon_dev *edev; struct extcon_dev *edev;
struct dwc3 *dwc;
int ret = 0; int ret = 0;
dwc = platform_get_drvdata(mdwc->dwc3);
if (!of_property_read_bool(node, "extcon")) { if (!of_property_read_bool(node, "extcon")) {
if (usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST) dev_dbg(mdwc->dev, "extcon property doesn't exist\n");
if (usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST
|| dwc->is_drd)
return 0; return 0;
dev_err(mdwc->dev, "extcon property doesn't exist\n"); dev_err(mdwc->dev, "Neither host nor DRD, fail probe\n");
return -EINVAL; return -EINVAL;
} }
@ -3137,8 +3141,9 @@ static int dwc3_msm_probe(struct platform_device *pdev)
device_create_file(&pdev->dev, &dev_attr_speed); device_create_file(&pdev->dev, &dev_attr_speed);
host_mode = usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST; host_mode = usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST;
if (!dwc->is_drd && host_mode) { if (host_mode ||
dev_dbg(&pdev->dev, "DWC3 in host only mode\n"); (dwc->is_drd && !of_property_read_bool(node, "extcon"))) {
dev_dbg(&pdev->dev, "DWC3 in default host mode\n");
mdwc->id_state = DWC3_ID_GROUND; mdwc->id_state = DWC3_ID_GROUND;
dwc3_ext_event_notify(mdwc); dwc3_ext_event_notify(mdwc);
} }