[PATCH v3 08/13] usb: phy: msm: Drop default usb_dr_mode from platform data.
From: Ivan T. Ivanov <hidden>
Date: 2013-10-14 15:28:39
Also in:
linux-arm-msm, linux-devicetree, lkml
Subsystem:
the rest, usb subsystem · Maintainers:
Linus Torvalds, Greg Kroah-Hartman
From: "Ivan T. Ivanov" <redacted> USB DT bindings states: "...In case this attribute isn't passed via DT, USB DRD controllers should default to OTG...", so remove redundand field. Signed-off-by: Ivan T. Ivanov <redacted> --- drivers/usb/phy/phy-msm-usb.c | 7 ------- include/linux/usb/msm_hsusb.h | 3 --- 2 files changed, 10 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 2aca042..4a23cfa 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c@@ -1067,15 +1067,8 @@ static void msm_otg_init_sm(struct msm_otg *motg) else clear_bit(B_SESS_VLD, &motg->inputs); } else if (pdata->otg_control == OTG_USER_CONTROL) { - if (pdata->default_mode == USB_DR_MODE_PERIPHERAL) { - set_bit(ID, &motg->inputs); - set_bit(B_SESS_VLD, &motg->inputs); - } else if (pdata->default_mode == USB_DR_MODE_HOST) { - clear_bit(ID, &motg->inputs); - } else { set_bit(ID, &motg->inputs); clear_bit(B_SESS_VLD, &motg->inputs); - } } break; case USB_DR_MODE_HOST:
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index f9d512e..72c5830 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h@@ -106,8 +106,6 @@ enum usb_chg_type { * @power_budget: VBUS power budget in mA (0 will be treated as 500mA). * @mode: Supported mode (OTG/peripheral/host). * @otg_control: OTG switch controlled by user/Id pin - * @default_mode: Default operational mode. Applicable only if - * OTG switch is controller by user. * @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k * dfab_usb_hs_clk in case of 8660 and 8960. */
@@ -117,7 +115,6 @@ struct msm_otg_platform_data { unsigned power_budget; enum usb_dr_mode mode; enum otg_control_type otg_control; - enum usb_dr_mode default_mode; enum msm_usb_phy_type phy_type; void (*setup_gpio)(enum usb_otg_state state); char *pclk_src_name;
--
1.7.9.5