usb: common: allow dr_mode to come from gpio-id based usb-connector
Subsystems (3)
PATCH v3 1/2 usb: common: allow dr_mode to come from gpio-id based usb-connector
If a usb host with dr_mode of "otg" has a usb-connector using a GPIO ID pin use this to determine host vs peripheral.
Signed-off-by Tim Harvey <[email protected]>
---
v3:
- use function from ofnode_graph.h
- use log_debug instead of debug and pr_debug
v2:
- do not display error if 'port' node not found
- change print to debug
--- drivers/usb/common/common.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/usb/common/common.c +25 -1
@@ -8,6 +8,8 @@#include <dm.h> #include <asm/global_data.h> +#include <asm/gpio.h> +#include <dm/ofnode_graph.h> #include <linux/printk.h> #include <linux/usb/otg.h> #include <linux/usb/ch9.h>
@@ -22,6 +24,28 @@ static const char *const usb_dr_modes[] = { [USB_DR_MODE_OTG] = "otg", }; +static enum usb_dr_mode get_connector_drmode (ofnode node) +{ +ofnode conn =ofnode_graph_get_remote_node (node,-1 ,-1 ); +enum usb_dr_mode dr_mode =USB_DR_MODE_OTG ; +struct gpio_desc id; + +if (ofnode_valid (conn) && +ofnode_device_is_compatible (conn,"gpio-usb-b-connector" ) && + !gpio_request_by_name_nodev (conn,"id-gpios" ,0 , &id,GPIOD_IS_IN )) { +if (dm_gpio_get_value (&id)) + dr_mode =USB_DR_MODE_PERIPHERAL ; +else + dr_mode =USB_DR_MODE_HOST ; +gpio_free_list_nodev (&id,1 ); +log_debug ("%s got dr_mode from connector %s dr_mode=%s\n" , __func__, +ofnode_get_name (node), + dr_mode ==USB_DR_MODE_HOST ?"host" :"peripheral" ); + } + +return dr_mode; +} +enum usb_dr_mode usb_get_dr_mode (ofnode node) {const char *dr_mode;
@@ -35,7 +59,7 @@ enum usb_dr_mode usb_get_dr_mode(ofnode node)for (i =0 ; i <ARRAY_SIZE (usb_dr_modes); i++)if (!strcmp (dr_mode, usb_dr_modes[i])) -return i; +return (i ==USB_DR_MODE_OTG ) ?get_connector_drmode (node) : i;return USB_DR_MODE_UNKNOWN ; }
Signature · 1 line
2.25.1
PATCH v3 2/2 imx8mp-venice: enable USB device mode
Now that we can determine device role via a usb-connector ID pin, remove the host-only mode dt override and enable additional USB device mode support.
Signed-off-by Tim Harvey <[email protected]>
--- arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi | 5 ----- arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi | 5 ----- arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi | 5 ----- arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi | 5 ----- configs/imx8mp_venice_defconfig | 7 +++++++ 5 files changed, 7 insertions(+), 20 deletions(-)
arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi +0 -5
@@ -54,8 +54,3 @@ line-name = "pci_wdis#"; }; }; - -/* gpio-usb-con not supported yet in U-Boot so make this a host for now */ -&usb_dwc3_0 { - dr_mode = "host"; -};
arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi +0 -5
@@ -89,8 +89,3 @@ line-name = "pci_wdis#"; }; }; - -/* gpio-usb-con not supported yet in U-Boot so make this a host for now */ -&usb_dwc3_0 { - dr_mode = "host"; -};
arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi +0 -5
@@ -95,8 +95,3 @@ line-name = "pci_wdis#"; }; }; - -/* gpio-usb-con not supported yet in U-Boot so make this a host for now */ -&usb_dwc3_0 { - dr_mode = "host"; -};
arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi +0 -5
@@ -250,8 +250,3 @@ &wdog1 { bootph-pre-ram; }; - -/* gpio-usb-con not supported yet in U-Boot so make this a host for now */ -&usb_dwc3_0 { - dr_mode = "host"; -};
configs/imx8mp_venice_defconfig +7 -0
@@ -70,6 +70,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_CAT=y CONFIG_CMD_SETEXPR_FMT=y CONFIG_CMD_XXD=y
@@ -162,6 +163,7 @@ CONFIG_DM_THERMAL=y # CONFIG_TPM_V1 is not set CONFIG_TPM2_TIS_SPI=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
@@ -177,6 +179,11 @@ CONFIG_USB_ETHER_LAN78XX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Gateworks" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_IMX_WATCHDOG=y CONFIG_TPM=y # CONFIG_SPL_SHA512 is not set
Signature · 1 line
2.25.1