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]
A message that is not in the archive (sent off-list or not yet received): 1518351341-6740-1-git-send-email-yossim-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
RFC 2/3 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
@@ -61,6 +61,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"
@@ -687,6 +688,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
@@ -13,6 +13,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"
@@ -163,6 +164,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; } }
@@ -183,6 +188,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
@@ -19,6 +19,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"
@@ -1965,16 +1966,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
@@ -10,6 +10,7 @@#include <linux/usb/otg.h> struct ci_hdrc ; +struct mux_control ;/** * struct ci_hdrc_cable - structure for external connector cable state tracking
@@ -76,6 +77,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 · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerQuoted 33 lines · Yossi Mansharoff
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.Cc Peter Rosin <[email protected]>Cc Peter Chen <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc <[email protected]>Signed-off-by Stephen Boyd <[email protected]>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 +0
-0
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt Optional properties: · line 82
Quoted 7 lines
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +4
-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.
Kind of pointless to have -names when there is only one.
Otherwise, the binding looks okay to me.
Quoted 10 lines
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +2
-0i.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"; };