usb: chipidea: Hook into mux framework to toggle usb switch
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/4 usb: chipidea: Hook into mux framework to toggle usb switch
On the db410c 96boards platform we have a TC7USB40MU on the board to mux the D+/D- lines coming from the controller between a micro usb "device" port and a USB hub for "host" roles[1]. During a role switch, we need to toggle this mux to forward the D+/D- lines to either the port or the hub. Add the necessary code to do the role switch in chipidea core via the generic mux framework. Board configurations like on db410c are expected to change roles via the sysfs API described in Documentation/ABI/testing/sysfs-platform-chipidea-usb2.
--- Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 6 ++++++ drivers/usb/chipidea/Kconfig | 2 ++ drivers/usb/chipidea/core.c | 6 ++++++ drivers/usb/chipidea/host.c | 7 +++++++ drivers/usb/chipidea/udc.c | 13 ++++++++++++- include/linux/usb/chipidea.h | 2 ++ 6 files changed, 35 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +6 -0
@@ -76,6 +76,10 @@ Optional properties: needs to make sure it does not send more than 90% maximum_periodic_data_per_frame. The use case is multiple transactions, but less frame rate. +- mux-controls: The mux control for toggling host/device output of this + controller. It's expected that a mux state of 0 indicates device mode and a + mux state of 1 indicates host mode. +- mux-control-names: Shall be "usb_switch" if mux-controls is specified. i.mx specific properties - fsl,usbmisc: phandler of non-core register device, with one
@@ -102,4 +106,6 @@ Example: rx-burst-size-dword = <0x10>; extcon = <0>, <&usb_id>; phy-clkgate-delay-us = <400>; + mux-controls = <&usb_switch>; + mux-control-names = "usb_switch"; };
drivers/usb/chipidea/Kconfig +2 -0
@@ -3,6 +3,8 @@ config USB_CHIPIDEA depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)) && HAS_DMA select EXTCON select RESET_CONTROLLER + select MULTIPLEXER + select MUX_GPIO help Say Y here if your system has a dual role high speed USB controller based on ChipIdea silicon IP. It supports:
drivers/usb/chipidea/core.c +6 -0
@@ -64,6 +64,7 @@#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/usb/ehci_def.h> +#include <linux/mux/consumer.h> #include "ci.h" #include "udc.h"
@@ -690,6 +691,11 @@ static int ci_get_platdata(struct device *dev,if (of_find_property (dev->of_node,"non-zero-ttctrl-ttha" ,NULL )) platdata->flags |=CI_HDRC_SET_NON_ZERO_TTHA ; + platdata->usb_switch =devm_mux_control_get_optional (dev,"usb_switch" ); +if (IS_ERR (platdata->usb_switch)){ +return PTR_ERR (platdata->usb_switch); + } + ext_id =ERR_PTR (-ENODEV ); ext_vbus =ERR_PTR (-ENODEV );if (of_property_read_bool (dev->of_node,"extcon" )) {
drivers/usb/chipidea/host.c +7 -0
@@ -25,6 +25,7 @@#include <linux/usb/hcd.h> #include <linux/usb/chipidea.h> #include <linux/regulator/consumer.h> +#include <linux/mux/consumer.h> #include "../host/ehci.h"
@@ -175,6 +176,10 @@ static int host_start(struct ci_hdrc *ci)if (ci_otg_is_fsm_mode (ci)) { otg->host = &hcd->self; hcd->self.otg_port =1 ; + }else { + ret =mux_control_select (ci->platdata->usb_switch,1 ); +if (ret) + goto disable_reg; } }
@@ -195,6 +200,8 @@ static void host_stop(struct ci_hdrc *ci)struct usb_hcd *hcd = ci->hcd;if (hcd) { +if (!ci_otg_is_fsm_mode (ci)) +mux_control_deselect (ci->platdata->usb_switch);if (ci->platdata->notify_event) ci->platdata->notify_event (ci,CI_HDRC_CONTROLLER_STOPPED_EVENT );
drivers/usb/chipidea/udc.c +12 -1
@@ -22,6 +22,7 @@#include <linux/usb/gadget.h> #include <linux/usb/otg-fsm.h> #include <linux/usb/chipidea.h> +#include <linux/mux/consumer.h> #include "ci.h" #include "udc.h"
@@ -1964,16 +1965,26 @@ void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)static int udc_id_switch_for_device (struct ci_hdrc *ci) { +int ret =0 ; +if (ci->is_otg)/* Clear and enable BSV irq */ hw_write_otgsc (ci,OTGSC_BSVIS |OTGSC_BSVIE ,OTGSC_BSVIS |OTGSC_BSVIE ); -return 0 ; +if (!ci_otg_is_fsm_mode (ci)) + ret =mux_control_select (ci->platdata->usb_switch,0 ); + +if (ci->is_otg && ret) +hw_write_otgsc (ci,OTGSC_BSVIE |OTGSC_BSVIS ,OTGSC_BSVIS ); + +return ret; }static void udc_id_switch_for_host (struct ci_hdrc *ci) { +mux_control_deselect (ci->platdata->usb_switch); +/* * host doesn't care B_SESSION_VALID event * so clear and disbale BSV irq
include/linux/usb/chipidea.h +2 -0
@@ -9,6 +9,7 @@#include <linux/usb/otg.h> struct ci_hdrc ; +struct mux_control ;/** * struct ci_hdrc_cable - structure for external connector cable state tracking
@@ -75,6 +76,7 @@ struct ci_hdrc_platform_data {/* VBUS and ID signal state tracking, using extcon framework */ struct ci_hdrc_cable vbus_extcon;struct ci_hdrc_cable id_extcon; +struct mux_control *usb_switch;u32 phy_clkgate_delay_us; };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 151 lines
Signed-off-by Yossi Mansharoff <[email protected]>--- Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 6 ++++++ drivers/usb/chipidea/Kconfig | 2 ++ drivers/usb/chipidea/core.c | 6 ++++++ drivers/usb/chipidea/host.c | 7 +++++++ drivers/usb/chipidea/udc.c | 13 ++++++++++++- include/linux/usb/chipidea.h | 2 ++ 6 files changed, 35 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +5
-0@@ -76,6 +76,10 @@ Optional properties: needs to make sure it does not send more than 90% maximum_periodic_data_per_frame. The use case is multiple transactions, but less frame rate. +- mux-controls: The mux control for toggling host/device output of this + controller. It's expected that a mux state of 0 indicates device mode +and a + mux state of 1 indicates host mode. +- mux-control-names: Shall be "usb_switch" if mux-controls is specified. i.mx specific properties - fsl,usbmisc: phandler of non-core register device, with one @@ -102,4 +106,6@@ Example:
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +2
-0rx-burst-size-dword = <0x10>; extcon = <0>, <&usb_id>; phy-clkgate-delay-us = <400>; + mux-controls = <&usb_switch>; + mux-control-names = "usb_switch"; };drivers/usb/chipidea/Kconfig index renamed from drivers/usb/chipidea/Kconfig +0
-051f4157..72aadfa 100644
drivers/usb/chipidea/Kconfig +0
-0@@ -3,6 +3,8 @@ config USB_CHIPIDEA depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD&& !USB_GADGET) || (!USB_EHCI_HCD &&
USB_GADGET)) &&HAS_DMAdrivers/usb/chipidea/Kconfig +2
-0select EXTCON select RESET_CONTROLLER + select MULTIPLEXER + select MUX_GPIO help Say Y here if your system has a dual role high speed USB controller based on ChipIdea silicon IP. It supports:drivers/usb/chipidea/core.c index renamed from drivers/usb/chipidea/core.c +0
-043ea5fb..aa71b96 100644
drivers/usb/chipidea/core.c +6
-0@@ -64,6 +64,7 @@#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/usb/ehci_def.h> +#include <linux/mux/consumer.h> #include "ci.h" #include "udc.h" @@ -690,6 +691,11 @@ static int ci_get_platdata(struct device *dev,if (of_find_property (dev->of_node,"non-zero-ttctrl-ttha" ,NULL )) platdata->flags |=CI_HDRC_SET_NON_ZERO_TTHA ; + platdata->usb_switch =devm_mux_control_get_optional (dev,"usb_switch" ); +if (IS_ERR (platdata->usb_switch)){ +return PTR_ERR (platdata->usb_switch); + } + ext_id =ERR_PTR (-ENODEV ); ext_vbus =ERR_PTR (-ENODEV ); if (of_property_read_bool(dev->of_node, "extcon")) { diff --git
a/drivers/usb/chipidea/host.cb/drivers/usb/chipidea/host.cindex 18cb8e4..9ef3ecf 100644drivers/usb/chipidea/host.c +7
-0@@ -25,6 +25,7 @@#include <linux/usb/hcd.h> #include <linux/usb/chipidea.h> #include <linux/regulator/consumer.h> +#include <linux/mux/consumer.h> #include "../host/ehci.h" @@ -175,6 +176,10 @@ static int host_start(struct ci_hdrc *ci)if (ci_otg_is_fsm_mode (ci)) { otg->host = &hcd->self; hcd->self.otg_port =1 ; + }else { + ret =mux_control_select (ci->platdata->usb_switch,1 ); +if (ret) + goto disable_reg; } }@@ -195,6 +200,8 @@ static void host_stop(struct ci_hdrc *ci)struct usb_hcd *hcd = ci->hcd;if (hcd) { +if (!ci_otg_is_fsm_mode (ci)) +mux_control_deselect (ci->platdata->usb_switch);if (ci->platdata->notify_event) ci->platdata->notify_event (ci,CI_HDRC_CONTROLLER_STOPPED_EVENT );drivers/usb/chipidea/udc.c index renamed from drivers/usb/chipidea/udc.c +0
-0fe8a905..17f22e2 100644
drivers/usb/chipidea/udc.c +12
-1@@ -22,6 +22,7 @@#include <linux/usb/gadget.h> #include <linux/usb/otg-fsm.h> #include <linux/usb/chipidea.h> +#include <linux/mux/consumer.h> #include "ci.h" #include "udc.h" @@ -1964,16 +1965,26 @@ void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)static int udc_id_switch_for_device (struct ci_hdrc *ci) { +int ret =0 ; +if (ci->is_otg)/* Clear and enable BSV irq */ hw_write_otgsc (ci,OTGSC_BSVIS |OTGSC_BSVIE ,OTGSC_BSVIS |OTGSC_BSVIE ); -return 0 ; +if (!ci_otg_is_fsm_mode (ci)) + ret =mux_control_select (ci->platdata->usb_switch,0 ); + +if (ci->is_otg && ret) +hw_write_otgsc (ci,OTGSC_BSVIE |OTGSC_BSVIS ,OTGSC_BSVIS ); + +return ret; }static void udc_id_switch_for_host (struct ci_hdrc *ci) { +mux_control_deselect (ci->platdata->usb_switch); +/* * host doesn't care B_SESSION_VALID event * so clear and disbale BSV irq include/linux/usb/chipidea.h index renamed from include/linux/usb/chipidea.h +0
-0d725cff..7e5d008 100644
include/linux/usb/chipidea.h line 13
Quoted 5 lines
include/linux/usb/chipidea.h +1
-0@@ -9,6 +9,7 @@#include <linux/usb/otg.h> struct ci_hdrc ; +struct mux_control ;
I am ok with this patch, would you please send series to linux-usb, then I can save and test it.
Peter
Quoted 153 lines · Peter Chen
Quoted 153 lines
Signed-off-by Yossi Mansharoff <[email protected]>--- Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 6 ++++++ drivers/usb/chipidea/Kconfig | 2 ++ drivers/usb/chipidea/core.c | 6 ++++++ drivers/usb/chipidea/host.c | 7 +++++++ drivers/usb/chipidea/udc.c | 13 ++++++++++++- include/linux/usb/chipidea.h | 2 ++ 6 files changed, 35 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +5
-0@@ -76,6 +76,10 @@ Optional properties: needs to make sure it does not send more than 90% maximum_periodic_data_per_frame. The use case is multiple transactions, but less frame rate. +- mux-controls: The mux control for toggling host/device output of this + controller. It's expected that a mux state of 0 indicates device mode +and a + mux state of 1 indicates host mode. +- mux-control-names: Shall be "usb_switch" if mux-controls is specified. i.mx specific properties - fsl,usbmisc: phandler of non-core register device, with one @@ -102,4 +106,6@@ Example:
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +2
-0rx-burst-size-dword = <0x10>; extcon = <0>, <&usb_id>; phy-clkgate-delay-us = <400>; + mux-controls = <&usb_switch>; + mux-control-names = "usb_switch"; };drivers/usb/chipidea/Kconfig index renamed from drivers/usb/chipidea/Kconfig +0
-051f4157..72aadfa 100644
drivers/usb/chipidea/Kconfig +0
-0@@ -3,6 +3,8 @@ config USB_CHIPIDEA depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD&& !USB_GADGET) || (!USB_EHCI_HCD &&
USB_GADGET)) &&HAS_DMAdrivers/usb/chipidea/Kconfig +2
-0select EXTCON select RESET_CONTROLLER + select MULTIPLEXER + select MUX_GPIO help Say Y here if your system has a dual role high speed USB controller based on ChipIdea silicon IP. It supports:drivers/usb/chipidea/core.c index renamed from drivers/usb/chipidea/core.c +0
-043ea5fb..aa71b96 100644
drivers/usb/chipidea/core.c +6
-0@@ -64,6 +64,7 @@#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/usb/ehci_def.h> +#include <linux/mux/consumer.h> #include "ci.h" #include "udc.h" @@ -690,6 +691,11 @@ static int ci_get_platdata(struct device *dev,if (of_find_property (dev->of_node,"non-zero-ttctrl-ttha" ,NULL )) platdata->flags |=CI_HDRC_SET_NON_ZERO_TTHA ; + platdata->usb_switch =devm_mux_control_get_optional (dev,"usb_switch" ); +if (IS_ERR (platdata->usb_switch)){ +return PTR_ERR (platdata->usb_switch); + } + ext_id =ERR_PTR (-ENODEV ); ext_vbus =ERR_PTR (-ENODEV ); if (of_property_read_bool(dev->of_node, "extcon")) { diff --git
a/drivers/usb/chipidea/host.cb/drivers/usb/chipidea/host.cindex 18cb8e4..9ef3ecf 100644drivers/usb/chipidea/host.c +7
-0@@ -25,6 +25,7 @@#include <linux/usb/hcd.h> #include <linux/usb/chipidea.h> #include <linux/regulator/consumer.h> +#include <linux/mux/consumer.h> #include "../host/ehci.h" @@ -175,6 +176,10 @@ static int host_start(struct ci_hdrc *ci)if (ci_otg_is_fsm_mode (ci)) { otg->host = &hcd->self; hcd->self.otg_port =1 ; + }else { + ret =mux_control_select (ci->platdata->usb_switch,1 ); +if (ret) + goto disable_reg; } }@@ -195,6 +200,8 @@ static void host_stop(struct ci_hdrc *ci)struct usb_hcd *hcd = ci->hcd;if (hcd) { +if (!ci_otg_is_fsm_mode (ci)) +mux_control_deselect (ci->platdata->usb_switch);if (ci->platdata->notify_event) ci->platdata->notify_event (ci,CI_HDRC_CONTROLLER_STOPPED_EVENT );drivers/usb/chipidea/udc.c index renamed from drivers/usb/chipidea/udc.c +0
-0fe8a905..17f22e2 100644
drivers/usb/chipidea/udc.c +12
-1@@ -22,6 +22,7 @@#include <linux/usb/gadget.h> #include <linux/usb/otg-fsm.h> #include <linux/usb/chipidea.h> +#include <linux/mux/consumer.h> #include "ci.h" #include "udc.h" @@ -1964,16 +1965,26 @@ void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)static int udc_id_switch_for_device (struct ci_hdrc *ci) { +int ret =0 ; +if (ci->is_otg)/* Clear and enable BSV irq */ hw_write_otgsc (ci,OTGSC_BSVIS |OTGSC_BSVIE ,OTGSC_BSVIS |OTGSC_BSVIE ); -return 0 ; +if (!ci_otg_is_fsm_mode (ci)) + ret =mux_control_select (ci->platdata->usb_switch,0 ); + +if (ci->is_otg && ret) +hw_write_otgsc (ci,OTGSC_BSVIE |OTGSC_BSVIS ,OTGSC_BSVIS ); + +return ret; }static void udc_id_switch_for_host (struct ci_hdrc *ci) { +mux_control_deselect (ci->platdata->usb_switch); +/* * host doesn't care B_SESSION_VALID event * so clear and disbale BSV irq include/linux/usb/chipidea.h index renamed from include/linux/usb/chipidea.h +0
-0d725cff..7e5d008 100644
include/linux/usb/chipidea.h +0
-0@@ -9,6 +9,7 @@#include <linux/usb/otg.h>
Quoted 7 lines
include/linux/usb/chipidea.h line 13
Quoted 3 lines
include/linux/usb/chipidea.h +1
-0struct ci_hdrc ; +struct mux_control ;I am ok with this patch, would you please send series to linux-usb, then I can save and test it.
Peter
You should be aware that the binding assumes that mux state 0 and mux state 1 are connected to the two functions "device" and "host" respectively. If some future HW designer uses a mux where the states are different some kind of mapping needs to be invented. I.e. similar to how active-low is used for GPIO, but in the mux case the mapping possibilities are endless, and a single bit is not enough to cover all bases.
I.e. some kind of dt property like
mux-control-mapping = <2 6>;
to transform the mux "device" state to state number 2 (and 6 for "host").
Just a heads up.
/peda