Date: Mon, 13 Jul 2015 09:58:00 +0800
From: Peter Chen <peter.chen@freescale.com>
To: Roger Quadros <rogerq@ti.com>
CC: <stern@rowland.harvard.edu>, <balbi@ti.com>, <gregkh@linuxfoundation.org>,
        <dan.j.williams@intel.com>, <jun.li@freescale.com>,
        <mathias.nyman@linux.intel.com>, <tony@atomide.com>,
        <Joao.Pinto@synopsys.com>, <linux-usb@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>
Subject: Re: [PATCH v3 04/11] otg-fsm: move usb_bus_start_enum into
 otg-fsm->ops
Message-ID: <20150713015759.GC27710@shlinux2>
References: <1436350777-28056-1-git-send-email-rogerq@ti.com>
 <1436350777-28056-5-git-send-email-rogerq@ti.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <1436350777-28056-5-git-send-email-rogerq@ti.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
BN3PR0301MB1219: X-MS-Exchange-Organization-RulesExecuted
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2015 03:07:03.5925
 (UTC)
X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1219
X-Microsoft-Exchange-Diagnostics: 1;BN3PR0301MB0836;2:6ZMJYGETmiKwNG+Ix/4WVVue0AMn6Kj1rEsMkEaeuQo5E5MFxHKB8qKGtuQBmWgw;3:cDXTsMTmcjMsyQ0/z3Yvo0bdey0YzGNuf/ZcsEQK9DIS1eMi5cXJipcyyTDEP8uKhTS5qIX8A3kfLCTdLgJkqvyREAi0NbZOF91nDPmI37vT5rcL9K5RPglPhWuutdTssjlKYwxM+c7QUPZ4I9rT4HESi5BMjIJeGvGUiiTx8ZJeaVjf0EbbkocUWJ49uTQc5xP/6wgF/fxclHA5kr0x+l+l9up5JrVfCz27/CZlzbM=;25:LcBOdv+pmA9ToxPeiNdBnzjc33rvIuNW+nQsc5S5A29z+vloBlAtzyNMt6ubsKILdWOIdO8xiY1Bx4dCpDHuPf4CgWiZs+eco/JUaJ0qkEcmD+BbbmWirt7b6qrWbhvQF+wKABl/TqPgAjcNzj5wNhG+XyPDAtrV/zpvhR3S6SNAZQ23WuVL7PQaN0yP8y0R7tgE9Z2+5WBfgKIn6VGZBJaE5rQpnC3EQxAvy6EYIfwTyp8I3bd+tG32RIn/QKshXFbAw9paw3nkR+8zaD3HbQ==;23:glA/9g3kqNw80jyFcmazkJ+H3QqNUFZEsrljFwqo/97iKORFztrNRg5oel2goGqKsZ0sRRv2SiDIxIrAkyBF6Y60UmMQaUxrr0Ppxa7lm1jJLYXJJriUBi5nCorjchhFIz7seVU0GaCK+JxFT2GaKyvn3Sd3vP2lZD3TlgVuUpGTSEU8aLLRq6/qq3PsGGg55xzGu8q7ivrapKEttEX9MEe4O6n1LzmGrQFWfJjLsZGdYEAjY4lWvIy0RLwkwdCT
X-OriginatorOrg: freescale.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2374
Lines: 71

On Wed, Jul 08, 2015 at 01:19:30PM +0300, Roger Quadros wrote:
> This is to prevent missing symbol build error if OTG is
> enabled (built-in) and HCD core (CONFIG_USB) is module.
> 

We may let the OTG-DRD/OTG-FSM depends on CONFIG_USB to fix it.

Peter

> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  drivers/usb/common/usb-otg-fsm.c | 6 ++++--
>  drivers/usb/phy/phy-fsl-usb.c    | 2 ++
>  include/linux/usb/otg-fsm.h      | 1 +
>  3 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
> index 1873eb3..156fd25 100644
> --- a/drivers/usb/common/usb-otg-fsm.c
> +++ b/drivers/usb/common/usb-otg-fsm.c
> @@ -166,8 +166,10 @@ static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
>  		otg_loc_conn(fsm, 0);
>  		otg_loc_sof(fsm, 1);
>  		otg_set_protocol(fsm, PROTO_HOST);
> -		usb_bus_start_enum(fsm->otg->host,
> -				fsm->otg->host->otg_port);
> +		if (fsm->ops->start_enum) {
> +			fsm->ops->start_enum(fsm->otg->host,
> +					     fsm->otg->host->otg_port);
> +		}
>  		break;
>  	case OTG_STATE_A_IDLE:
>  		otg_drv_vbus(fsm, 0);
> diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
> index ee3f2c2..19541ed 100644
> --- a/drivers/usb/phy/phy-fsl-usb.c
> +++ b/drivers/usb/phy/phy-fsl-usb.c
> @@ -783,6 +783,8 @@ static struct otg_fsm_ops fsl_otg_ops = {
>  
>  	.start_host = fsl_otg_start_host,
>  	.start_gadget = fsl_otg_start_gadget,
> +
> +	.start_enum = usb_bus_start_enum,
>  };
>  
>  /* Initialize the global variable fsl_otg_dev and request IRQ for OTG */
> diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
> index c631dde..22d8baa 100644
> --- a/include/linux/usb/otg-fsm.h
> +++ b/include/linux/usb/otg-fsm.h
> @@ -198,6 +198,7 @@ struct otg_fsm_ops {
>  	void	(*del_timer)(struct otg_fsm *fsm, enum otg_fsm_timer timer);
>  	int	(*start_host)(struct otg_fsm *fsm, int on);
>  	int	(*start_gadget)(struct otg_fsm *fsm, int on);
> +	int	(*start_enum)(struct usb_bus *bus, unsigned port_num);
>  };
>  
>  
> -- 
> 2.1.4
> 

-- 

Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/