On Wed, Jan 08, 2014 at 05:06:17PM +0800, Li Jun wrote:
> This patch adds OTG fsm related initizations when do otg init,
> add a seperate file for OTG fsm related utilities.
>
> Signed-off-by: Li Jun <[email protected]>
> ---
> drivers/usb/chipidea/Makefile | 1 +
> drivers/usb/chipidea/ci.h | 1 +
> drivers/usb/chipidea/otg.c | 6 +++
> drivers/usb/chipidea/otg_fsm.c | 70
> ++++++++++++++++++++++++++++++++++++++++
> drivers/usb/chipidea/otg_fsm.h | 27 +++++++++++++++
> 5 files changed, 105 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> index 7345d21..5e1ecc5 100644
> --- a/drivers/usb/chipidea/Makefile
> +++ b/drivers/usb/chipidea/Makefile
> @@ -6,6 +6,7 @@ ci_hdrc-y := core.o otg.o
> ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o
> ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o
> ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG) += debug.o
> +ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o
>
> # Glue/Bridge layers go here
>
> diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> index 1c94fc5..0f1abc1 100644
> --- a/drivers/usb/chipidea/ci.h
> +++ b/drivers/usb/chipidea/ci.h
> @@ -144,6 +144,7 @@ struct ci_hdrc {
> struct ci_role_driver *roles[CI_ROLE_END];
> enum ci_role role;
> bool is_otg;
> + struct otg_fsm *fsm;
> struct work_struct work;
> struct workqueue_struct *wq;
>
> diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
> index 39bd7ec..2e13f2f 100644
> --- a/drivers/usb/chipidea/otg.c
> +++ b/drivers/usb/chipidea/otg.c
> @@ -95,6 +95,12 @@ static void ci_otg_work(struct work_struct *work)
> */
> int ci_hdrc_otg_init(struct ci_hdrc *ci)
> {
> + int retval = 0;
> +
> + retval = ci_hdrc_otg_fsm_init(ci);
> + if (retval)
> + return retval;
> +
> INIT_WORK(&ci->work, ci_otg_work);
> ci->wq = create_singlethread_workqueue("ci_otg");
> if (!ci->wq) {
> diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
> new file mode 100644
> index 0000000..1f8907d
> --- /dev/null
> +++ b/drivers/usb/chipidea/otg_fsm.c
> @@ -0,0 +1,70 @@
> +/*
> + * otg_fsm.c - ChipIdea USB IP core OTG FSM driver
> + *
> + * Copyright (C) 2014 Freescale Semiconductor, Inc.
> + *
> + * Author: Jun Li
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +/*
> + * This file mainly handles otgsc register, it may include OTG operation
> + * in the future.
> + */
Please update description for both this file and otg.c.
> +
> +#include <linux/usb/otg.h>
> +#include <linux/usb/otg-fsm.h>
> +#include <linux/usb/gadget.h>
> +#include <linux/usb/chipidea.h>
> +
> +#include "ci.h"
> +#include "bits.h"
> +#include "otg.h"
> +#include "otg_fsm.h"
> +
> +int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
> +{
> + if (ci->transceiver == NULL)
> + return -EPROBE_DEFER;
> +
Since ci_usb_phy_init is run before that, this check should be there.
I will have a patch for that.
> + ci->transceiver->otg = devm_kzalloc(ci->dev,
> + sizeof(struct usb_otg), GFP_KERNEL);
> + if (!ci->transceiver->otg) {
> + dev_err(ci->dev,
> + "Failed to allocate usb_otg structure for ci hdrc otg!\n");
> + return -ENOMEM;
> + }
> +
> + ci->fsm = devm_kzalloc(ci->dev,
> + sizeof(struct otg_fsm), GFP_KERNEL);
> + if (!ci->fsm) {
> + dev_err(ci->dev,
> + "Failed to allocate otg_fsm structure for ci hdrc otg!\n");
> + return -ENOMEM;
> + }
> +
> + ci->fsm->power_up = 1;
> + ci->fsm->id = hw_read(ci, OP_OTGSC, OTGSC_ID);
> + ci->fsm->otg = ci->transceiver->otg;
> + ci->fsm->otg->phy = ci->transceiver;
> + ci->fsm->otg->gadget = &ci->gadget;
> + ci->transceiver->state = OTG_STATE_UNDEFINED;
> +
> + mutex_init(&ci->fsm->lock);
> +
> + /* enable ID and A vbus valid irq */
> + hw_write(ci, OP_OTGSC, OTGSC_INT_EN_BITS | OTGSC_INT_STATUS_BITS,
> + OTGSC_IDIE | OTGSC_AVVIE);
One or two TAB between two lines for one statement is better.
Peter
> +
> + if (ci->fsm->id) {
> + ci->fsm->b_ssend_srp =
> + hw_read(ci, OP_OTGSC, OTGSC_BSV) ? 0 : 1;
> + ci->fsm->b_sess_vld =
> + hw_read(ci, OP_OTGSC, OTGSC_BSV) ? 1 : 0;
> + }
> +
> + return 0;
> +}
> diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h
> new file mode 100644
> index 0000000..1a7ca11
> --- /dev/null
> +++ b/drivers/usb/chipidea/otg_fsm.h
> @@ -0,0 +1,27 @@
> +/*
> + * Copyright (C) 2014 Freescale Semiconductor, Inc.
> + *
> + * Author: Jun Li
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
> +#define __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
> +
> +#ifdef CONFIG_USB_OTG_FSM
> +
> +int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci);
> +
> +#else
> +
> +static inline int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
> +{
> + return 0;
> +}
> +
> +#endif
> +
> +#endif /* __DRIVERS_USB_CHIPIDEA_OTG_FSM_H */
> --
> 1.7.8
>
>
--
Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
