Change for v6: UPdate otg caps by disable flags even if otg_rev is not passed, this is needed in case user wants to disable whole OTG(or just want to ID pin detect). Check property of usb hardware to get otg version and if SRP, HNP and ADP are disabled. Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx> --- drivers/usb/common/common.c | 27 +++++++++++++++++++++++++++ include/linux/usb/of.h | 7 +++++++ 2 files changed, 34 insertions(+) diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index b530fd4..12f5d28 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -154,6 +154,33 @@ bool of_usb_host_tpl_support(struct device_node *np) return false; } EXPORT_SYMBOL_GPL(of_usb_host_tpl_support); + +/** + * of_usb_get_set_caps - to set usb otg capabilities according to + * the passed properties in DT. + * @np: Pointer to the given device_node + * @otg_caps: Pointer to the target usb_otg_caps to be set + * + * The function gets and sets the otg capabilities + */ +void of_usb_set_otg_caps(struct device_node *np, struct usb_otg_caps *otg_caps) +{ + u32 otg_rev; + + if (!otg_caps) + return; + + if (!of_property_read_u32(np, "otg-rev", &otg_rev)) + otg_caps->otg_rev = otg_rev; + if (of_find_property(np, "hnp-disable", NULL)) + otg_caps->hnp_support = false; + if (of_find_property(np, "srp-disable", NULL)) + otg_caps->srp_support = false; + if (of_find_property(np, "adp-disable", NULL)) + otg_caps->adp_support = false; +} +EXPORT_SYMBOL_GPL(of_usb_set_otg_caps); + #endif MODULE_LICENSE("GPL"); diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h index cfe0528..6339799 100644 --- a/include/linux/usb/of.h +++ b/include/linux/usb/of.h @@ -15,6 +15,8 @@ enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np); enum usb_device_speed of_usb_get_maximum_speed(struct device_node *np); bool of_usb_host_tpl_support(struct device_node *np); +void of_usb_set_otg_caps(struct device_node *np, + struct usb_otg_caps *otg_caps); #else static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np) { @@ -30,6 +32,11 @@ static inline bool of_usb_host_tpl_support(struct device_node *np) { return false; } +static inline void of_usb_set_otg_caps(struct device_node *np, + struct usb_otg_caps *otg_caps) +{ + +} #endif #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_SUPPORT) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html