From: Roger Quadros <rogerq@ti.com> To: <peter.chen@freescale.com> Cc: <balbi@kernel.org>, <tony@atomide.com>, <gregkh@linuxfoundation.org>, <dan.j.williams@intel.com>, <mathias.nyman@linux.intel.com>, <Joao.Pinto@synopsys.com>, <sergei.shtylyov@cogentembedded.com>, <jun.li@freescale.com>, <grygorii.strashko@ti.com>, <yoshihiro.shimoda.uh@renesas.com>, <robh@kernel.org>, <nsekhar@ti.com>, <b-liu@ti.com>, <linux-usb@vger.kernel.org>, <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v8 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Date: Fri, 13 May 2016 13:03:21 +0300 [thread overview] Message-ID: <1463133808-10630-8-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1463133808-10630-1-git-send-email-rogerq@ti.com> Let's use CONFIG_USB_OTG as a single config option to enable USB OTG and the OTG FSM. This makes things a lot less confusing. Update all users of CONFIG_USB_OTG_FSM to CONFIG_USB_OTG. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Peter Chen <peter.chen@nxp.com> --- Documentation/usb/chipidea.txt | 2 +- drivers/usb/chipidea/Makefile | 2 +- drivers/usb/chipidea/ci.h | 2 +- drivers/usb/chipidea/otg_fsm.h | 2 +- drivers/usb/common/Makefile | 3 ++- drivers/usb/core/Kconfig | 8 -------- drivers/usb/phy/Kconfig | 2 +- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Documentation/usb/chipidea.txt b/Documentation/usb/chipidea.txt index 678741b..3b1f263 100644 --- a/Documentation/usb/chipidea.txt +++ b/Documentation/usb/chipidea.txt @@ -5,7 +5,7 @@ with 2 Freescale i.MX6Q sabre SD boards. 1.1 How to enable OTG FSM in menuconfig --------------------------------------- -Select CONFIG_USB_OTG_FSM, rebuild kernel Image and modules. +Select CONFIG_USB_OTG, rebuild kernel Image and modules. If you want to check some internal variables for otg fsm, mount debugfs, there are 2 files which can show otg fsm variables and some controller registers value: diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile index 518e445..45aa24d 100644 --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o ci_hdrc-y := core.o otg.o debug.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o -ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o +ci_hdrc-$(CONFIG_USB_OTG) += otg_fsm.o # Glue/Bridge layers go here diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h index c523975..1a32b8c 100644 --- a/drivers/usb/chipidea/ci.h +++ b/drivers/usb/chipidea/ci.h @@ -406,7 +406,7 @@ 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 +#ifdef CONFIG_USB_OTG struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps; return ci->is_otg && ci->roles[CI_ROLE_HOST] && diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h index 6366fe3..2d451bb 100644 --- a/drivers/usb/chipidea/otg_fsm.h +++ b/drivers/usb/chipidea/otg_fsm.h @@ -64,7 +64,7 @@ #define TB_AIDL_BDIS (20) /* 4ms ~ 150ms, section 5.2.1 */ -#if IS_ENABLED(CONFIG_USB_OTG_FSM) +#if IS_ENABLED(CONFIG_USB_OTG) int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci); int ci_otg_fsm_work(struct ci_hdrc *ci); diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index 6bbb3ec..f8f2c88 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_USB_COMMON) += usb-common.o usb-common-y += common.o usb-common-$(CONFIG_USB_LED_TRIG) += led.o -obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o obj-$(CONFIG_USB_ULPI_BUS) += ulpi.o +usbotg-y := usb-otg-fsm.o +obj-$(CONFIG_USB_OTG) += usbotg.o diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index dd28010..ae228d0 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -75,14 +75,6 @@ config USB_OTG_BLACKLIST_HUB and software costs by not supporting external hubs. So are "Embedded Hosts" that don't offer OTG support. -config USB_OTG_FSM - tristate "USB 2.0 OTG FSM implementation" - depends on USB && USB_OTG - select USB_PHY - help - Implements OTG Finite State Machine as specified in On-The-Go - and Embedded Host Supplement to the USB Revision 2.0 Specification. - config USB_ULPI_BUS tristate "USB ULPI PHY interface support" depends on USB_SUPPORT diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index c690474..06794e2 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -20,7 +20,7 @@ config AB8500_USB config FSL_USB2_OTG bool "Freescale USB OTG Transceiver Driver" - depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM + depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG && PM select USB_PHY help Enable this to support Freescale USB OTG transceiver. -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: peter.chen@freescale.com Cc: balbi@kernel.org, tony@atomide.com, gregkh@linuxfoundation.org, dan.j.williams@intel.com, mathias.nyman@linux.intel.com, Joao.Pinto@synopsys.com, sergei.shtylyov@cogentembedded.com, jun.li@freescale.com, grygorii.strashko@ti.com, yoshihiro.shimoda.uh@renesas.com, robh@kernel.org, nsekhar@ti.com, b-liu@ti.com, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Roger Quadros <rogerq@ti.com> Subject: [PATCH v8 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Date: Fri, 13 May 2016 13:03:21 +0300 [thread overview] Message-ID: <1463133808-10630-8-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1463133808-10630-1-git-send-email-rogerq@ti.com> Let's use CONFIG_USB_OTG as a single config option to enable USB OTG and the OTG FSM. This makes things a lot less confusing. Update all users of CONFIG_USB_OTG_FSM to CONFIG_USB_OTG. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Peter Chen <peter.chen@nxp.com> --- Documentation/usb/chipidea.txt | 2 +- drivers/usb/chipidea/Makefile | 2 +- drivers/usb/chipidea/ci.h | 2 +- drivers/usb/chipidea/otg_fsm.h | 2 +- drivers/usb/common/Makefile | 3 ++- drivers/usb/core/Kconfig | 8 -------- drivers/usb/phy/Kconfig | 2 +- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Documentation/usb/chipidea.txt b/Documentation/usb/chipidea.txt index 678741b..3b1f263 100644 --- a/Documentation/usb/chipidea.txt +++ b/Documentation/usb/chipidea.txt @@ -5,7 +5,7 @@ with 2 Freescale i.MX6Q sabre SD boards. 1.1 How to enable OTG FSM in menuconfig --------------------------------------- -Select CONFIG_USB_OTG_FSM, rebuild kernel Image and modules. +Select CONFIG_USB_OTG, rebuild kernel Image and modules. If you want to check some internal variables for otg fsm, mount debugfs, there are 2 files which can show otg fsm variables and some controller registers value: diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile index 518e445..45aa24d 100644 --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o ci_hdrc-y := core.o otg.o debug.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o -ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o +ci_hdrc-$(CONFIG_USB_OTG) += otg_fsm.o # Glue/Bridge layers go here diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h index c523975..1a32b8c 100644 --- a/drivers/usb/chipidea/ci.h +++ b/drivers/usb/chipidea/ci.h @@ -406,7 +406,7 @@ 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 +#ifdef CONFIG_USB_OTG struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps; return ci->is_otg && ci->roles[CI_ROLE_HOST] && diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h index 6366fe3..2d451bb 100644 --- a/drivers/usb/chipidea/otg_fsm.h +++ b/drivers/usb/chipidea/otg_fsm.h @@ -64,7 +64,7 @@ #define TB_AIDL_BDIS (20) /* 4ms ~ 150ms, section 5.2.1 */ -#if IS_ENABLED(CONFIG_USB_OTG_FSM) +#if IS_ENABLED(CONFIG_USB_OTG) int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci); int ci_otg_fsm_work(struct ci_hdrc *ci); diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index 6bbb3ec..f8f2c88 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_USB_COMMON) += usb-common.o usb-common-y += common.o usb-common-$(CONFIG_USB_LED_TRIG) += led.o -obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o obj-$(CONFIG_USB_ULPI_BUS) += ulpi.o +usbotg-y := usb-otg-fsm.o +obj-$(CONFIG_USB_OTG) += usbotg.o diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index dd28010..ae228d0 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -75,14 +75,6 @@ config USB_OTG_BLACKLIST_HUB and software costs by not supporting external hubs. So are "Embedded Hosts" that don't offer OTG support. -config USB_OTG_FSM - tristate "USB 2.0 OTG FSM implementation" - depends on USB && USB_OTG - select USB_PHY - help - Implements OTG Finite State Machine as specified in On-The-Go - and Embedded Host Supplement to the USB Revision 2.0 Specification. - config USB_ULPI_BUS tristate "USB ULPI PHY interface support" depends on USB_SUPPORT diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index c690474..06794e2 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -20,7 +20,7 @@ config AB8500_USB config FSL_USB2_OTG bool "Freescale USB OTG Transceiver Driver" - depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM + depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG && PM select USB_PHY help Enable this to support Freescale USB OTG transceiver. -- 2.7.4
next prev parent reply other threads:[~2016-05-13 10:04 UTC|newest] Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-13 10:03 [PATCH v8 00/14] USB OTG/dual-role framework Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 01/14] usb: hcd: Initialize hcd->flags to 0 Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 02/14] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 03/14] usb: hcd.h: Add OTG to HCD interface Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 04/14] usb: otg-fsm: use usb_otg wherever possible Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 06/14] usb: gadget.h: Add OTG to gadget interface Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` Roger Quadros [this message] 2016-05-13 10:03 ` [PATCH v8 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Roger Quadros 2016-05-13 10:03 ` [PATCH v8 08/14] usb: otg: add OTG/dual-role core Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-16 9:00 ` Roger Quadros 2016-05-16 9:00 ` Roger Quadros 2016-05-18 7:45 ` Peter Chen 2016-05-18 12:59 ` Roger Quadros 2016-05-18 12:59 ` Roger Quadros 2016-05-20 8:31 ` Roger Quadros 2016-05-20 8:31 ` Roger Quadros 2016-05-20 9:19 ` Roger Quadros 2016-05-20 9:19 ` Roger Quadros 2016-05-20 9:53 ` Peter Chen 2016-05-20 9:53 ` Peter Chen 2016-05-23 10:06 ` Roger Quadros 2016-05-23 10:06 ` Roger Quadros 2016-05-24 9:45 ` Roger Quadros 2016-05-24 9:45 ` Roger Quadros 2016-05-25 2:44 ` Peter Chen 2016-05-25 3:19 ` Jun Li 2016-05-25 3:19 ` Jun Li 2016-05-25 12:26 ` Roger Quadros 2016-05-25 12:26 ` Roger Quadros 2016-05-25 12:21 ` Roger Quadros 2016-05-25 12:21 ` Roger Quadros 2016-05-25 14:44 ` Jun Li 2016-05-25 14:44 ` Jun Li 2016-05-27 8:03 ` Peter Chen 2016-05-27 8:12 ` Peter Chen 2016-05-13 10:03 ` [PATCH v8 09/14] usb: of: add an API to get OTG device from USB controller node Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-20 9:29 ` [PATCH v9 " Roger Quadros 2016-05-20 9:29 ` Roger Quadros 2016-05-23 21:06 ` Rob Herring 2016-05-13 10:03 ` [PATCH v8 10/14] usb: otg: add hcd companion support Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 18:13 ` Rob Herring 2016-05-13 18:13 ` Rob Herring 2016-05-16 8:12 ` Roger Quadros 2016-05-16 8:12 ` Roger Quadros 2016-05-20 9:32 ` [PATCH v9 " Roger Quadros 2016-05-20 9:32 ` Roger Quadros 2016-05-23 21:07 ` Rob Herring 2016-05-13 10:03 ` [PATCH v8 11/14] usb: otg: use dev_dbg() instead of VDBG() Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 12/14] usb: hcd: Adapt to OTG core Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 13/14] usb: gadget: udc: adapt " Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-16 7:02 ` Peter Chen 2016-05-16 8:26 ` Roger Quadros 2016-05-16 8:26 ` Roger Quadros 2016-05-16 9:23 ` Peter Chen 2016-05-16 9:23 ` Peter Chen 2016-05-16 9:51 ` Roger Quadros 2016-05-16 9:51 ` Roger Quadros 2016-05-17 7:38 ` Jun Li 2016-05-17 7:38 ` Jun Li 2016-05-17 8:08 ` Roger Quadros 2016-05-17 8:08 ` Roger Quadros 2016-05-17 8:28 ` Jun Li 2016-05-17 8:28 ` Jun Li 2016-05-18 12:42 ` Roger Quadros 2016-05-18 12:42 ` Roger Quadros 2016-05-18 13:12 ` Jun Li 2016-05-18 13:12 ` Jun Li 2016-05-18 13:43 ` Roger Quadros 2016-05-18 13:43 ` Roger Quadros 2016-05-18 14:46 ` Jun Li 2016-05-18 14:46 ` Jun Li 2016-05-19 7:32 ` Roger Quadros 2016-05-19 7:32 ` Roger Quadros 2016-05-21 2:29 ` Peter Chen 2016-05-21 2:29 ` Peter Chen 2016-05-23 3:21 ` Peter Chen 2016-05-23 3:21 ` Peter Chen 2016-05-23 10:11 ` Roger Quadros 2016-05-23 10:11 ` Roger Quadros 2016-05-23 10:34 ` Jun Li 2016-05-23 10:34 ` Jun Li 2016-05-23 10:36 ` Roger Quadros 2016-05-23 10:36 ` Roger Quadros 2016-05-24 2:53 ` Peter Chen 2016-05-24 2:53 ` Peter Chen 2016-06-08 7:32 ` Roger Quadros 2016-06-08 7:32 ` Roger Quadros 2016-06-08 9:05 ` Peter Chen 2016-06-08 9:05 ` Peter Chen 2016-05-18 3:18 ` Peter Chen 2016-05-18 12:45 ` Roger Quadros 2016-05-18 12:45 ` Roger Quadros 2016-05-20 1:39 ` Peter Chen 2016-05-20 1:39 ` Peter Chen 2016-05-20 7:26 ` Roger Quadros 2016-05-20 7:26 ` Roger Quadros 2016-05-21 2:44 ` Peter Chen 2016-05-21 2:44 ` Peter Chen 2016-06-01 7:38 ` Peter Chen 2016-06-02 11:07 ` Roger Quadros 2016-06-02 11:07 ` Roger Quadros 2016-05-13 10:03 ` [PATCH v8 14/14] usb: host: xhci-plat: Add otg device to platform data Roger Quadros 2016-05-13 10:03 ` Roger Quadros 2016-05-30 9:29 ` [PATCH v8 00/14] USB OTG/dual-role framework Peter Chen 2016-05-30 9:29 ` Peter Chen 2016-05-30 14:04 ` Roger Quadros 2016-05-30 14:04 ` Roger Quadros
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1463133808-10630-8-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=Joao.Pinto@synopsys.com \ --cc=b-liu@ti.com \ --cc=balbi@kernel.org \ --cc=dan.j.williams@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=grygorii.strashko@ti.com \ --cc=jun.li@freescale.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=mathias.nyman@linux.intel.com \ --cc=nsekhar@ti.com \ --cc=peter.chen@freescale.com \ --cc=robh@kernel.org \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=tony@atomide.com \ --cc=yoshihiro.shimoda.uh@renesas.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.