On Thu, Jul 09, 2015 at 03:18:46PM +0800, Li Jun wrote:
> After introduce usb otg properties, update ci_otg_is_fsm_mode conditions
> to be depending on both usb hardware properties and usb driver config,
> also resolve a compile issue in debug.c after the API change.
>
> Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx>
> ---
> drivers/usb/chipidea/ci.h | 5 ++++-
> drivers/usb/chipidea/debug.c | 1 +
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> index 6d6200e..f243f0b 100644
> --- a/drivers/usb/chipidea/ci.h
> +++ b/drivers/usb/chipidea/ci.h
> @@ -406,8 +406,11 @@ static inline u32 hw_test_and_write(struct ci_hdrc *ci, enum ci_hw_regs reg,
> static inline bool ci_otg_is_fsm_mode(struct ci_hdrc *ci)
> {
> #ifdef CONFIG_USB_OTG_FSM
> + struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps;
> +
> return ci->is_otg && ci->roles[CI_ROLE_HOST] &&
> - ci->roles[CI_ROLE_GADGET];
> + ci->roles[CI_ROLE_GADGET] && (otg_caps->srp_support ||
> + otg_caps->hnp_support || otg_caps->adp_support);
> #else
> return false;
> #endif
> diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
> index 5b7061a..3869c6d 100644
> --- a/drivers/usb/chipidea/debug.c
> +++ b/drivers/usb/chipidea/debug.c
> @@ -10,6 +10,7 @@
> #include <linux/usb/phy.h>
> #include <linux/usb/otg.h>
> #include <linux/usb/otg-fsm.h>
> +#include <linux/usb/chipidea.h>
>
> #include "ci.h"
> #include "udc.h"
> --
> 1.9.1
>
Acked-by: Peter Chen <peter.chen@xxxxxxxxxxxxx>
--
Best Regards,
Peter Chen
--
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
