usb: dwc3: meson: add OTG support for GXL/GXM
Subsystems (5)
v2 cover usb: dwc3: meson: add OTG support for GXL/GXM
The USB support was initialy done with a set of PHYs and dwc3-of-simple because the architecture of the USB complex was not understood correctly at the time (and proper documentation was missing...).
But with the G12A family, the USB complex was correctly understood and implemented correctly.
But seems the G12A architecture was derived for the GXL USB architecture, with minor differences and looks we can share most of the USB DWC3 glue driver.
This patchset refactors and adds callbacks to handle the architecture difference while keeping the main code shared.
The main difference is that on GXL/GXM the USB2 PHY control registers are mixed with the PHY registers (we already handle correctly), and the GLUE registers are allmost (99%) the same as G12A.
But, the GXL/GXM HW is buggy, here are the quirks :
- for the DWC2 controller to reset correctly, the GLUE mux must be switched to peripheral when the DWC2 controller probes. For now it's handled by simply switching to device when probing the subnodes, but it may be not enough
- when manually switching from Host to Device when the USB port is not populated (should not happen with proper Micro-USB/USB-C OTG switch), it makes the DWC3 to crash. The only way to avoid that is to use the Host Disconnect bit to disconnect the DWC3 controller from the port, but we can't recover the Host functionnality unless resetting the DWC3 controller. This bit is set when only manual switch is done, and a warning is printed on manual switching.
The patches 1-9 should be applied first, then either waiting the next release or if the usb maintainer can provide us a stable tag, we can use it to merge the DT and bindings.
Changes since v1 at [1]:
- Fixed DT bindings to take in account usb2-phy2 on GXM
- Added comment in patch2
- Fixed patch 5 and moved fix out
- Collected tags
- Lower DT patch changes, switch p20x-q20x port B as OTG by default
[1] http://lkml.kernel.org/r/[email protected]
Martin Blumenstingl (4):
arm64: dts: amlogic: use the new USB control driver for GXL and GXM
phy: amlogic: meson-gxl-usb3: remove code for non-existing PHY
usb: dwc3: of-simple: remove Amlogic GXL and AXG compatibles
dt-bindings: usb: dwc3: remove old DWC3 wrapper
Neil Armstrong (10):
dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic GXL and
GXM Families USB Glue Bindings
usb: dwc3: meson-g12a: specify phy names in soc data
usb: dwc3: meson-g12a: handle the phy and glue registers separately
usb: dwc3: meson-g12a: get the reset as shared
usb: dwc3: meson-g12a: check return of dwc3_meson_g12a_usb_init
usb: dwc3: meson-g12a: refactor usb2 phy init
usb: dwc3: meson-g12a: refactor usb init
usb: dwc3: meson-g12a: support the GXL/GXM DWC3 host phy disconnect
usb: dwc3: meson-g12a: add support for GXL and GXM SoCs
doc: dt: bindings: usb: dwc3: remove amlogic compatible entries
.../bindings/phy/meson-gxl-usb3-phy.txt | 31 -- .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 -- .../usb/amlogic,meson-g12a-usb-ctrl.yaml | 73 ++- .../devicetree/bindings/usb/dwc3.txt | 2 - .../dts/amlogic/meson-gx-libretech-pc.dtsi | 3 +- .../boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 +- .../amlogic/meson-gxl-s805x-libretech-ac.dts | 3 +- .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 +- .../amlogic/meson-gxl-s905d-phicomm-n1.dts | 4 + .../boot/dts/amlogic/meson-gxl-s905w-p281.dts | 4 + .../dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 4 + .../amlogic/meson-gxl-s905x-khadas-vim.dts | 4 + .../amlogic/meson-gxl-s905x-libretech-cc.dts | 3 +- .../amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +- .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 45 +- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- .../boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +- .../boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 7 +- drivers/phy/amlogic/Kconfig | 12 - drivers/phy/amlogic/Makefile | 1 - drivers/phy/amlogic/phy-meson-gxl-usb3.c | 283 ------------ drivers/usb/dwc3/dwc3-meson-g12a.c | 415 ++++++++++++++---- drivers/usb/dwc3/dwc3-of-simple.c | 30 +- 25 files changed, 477 insertions(+), 511 deletions(-) delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt delete mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt delete mode 100644 drivers/phy/amlogic/phy-meson-gxl-usb3.c
Signature · 1 line
2.22.0
PATCH v2 1/14 dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic GXL and GXM Families USB Glue Bindings
The Amlogic GXL and GXM is slightly different from the Amlogic G12A Glue.
The GXL SoCs only embeds 2 USB2 PHYs and no USB3 PHYs, and the GXM SoCs embeds 3 USB2 PHYs.
--- .../usb/amlogic,meson-g12a-usb-ctrl.yaml | 73 ++++++++++++++++++- 1 file changed, 69 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml +69 -4
@@ -25,9 +25,13 @@ description: | The Amlogic A1 embeds a DWC3 USB IP Core configured for USB2 in host-only mode. + The Amlogic GXL & GXM SoCs doesn't embed an USB3 PHY. + properties: compatible: enum: + - amlogic,meson-gxl-usb-ctrl + - amlogic,meson-gxm-usb-ctrl - amlogic,meson-g12a-usb-ctrl - amlogic,meson-a1-usb-ctrl
@@ -41,6 +45,11 @@ properties: clocks: minItems: 1 + maxItems: 3 + + clock-names: + minItems: 1 + maxItems: 3 resets: minItems: 1
@@ -52,10 +61,8 @@ properties: maxItems: 1 phy-names: - items: - - const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used - - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used - - const: usb3-phy0 # USB3 PHY if USB3_0 is used + minItems: 1 + maxItems: 3 phys: minItems: 1
@@ -89,6 +96,61 @@ required: - dr_mode allOf: + - if: + properties: + compatible: + enum: + - amlogic,meson-g12a-usb-ctrl + + then: + properties: + phy-names: + items: + - const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used + - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used + - const: usb3-phy0 # USB3 PHY if USB3_0 is used + - if: + properties: + compatible: + enum: + - amlogic,meson-gxl-usb-ctrl + + then: + properties: + clocks: + minItems: 2 + clock-names: + items: + - const: usb_ctrl + - const: ddr + phy-names: + items: + - const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used + - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used + required: + - clock-names + - if: + properties: + compatible: + enum: + - amlogic,meson-gxm-usb-ctrl + + then: + properties: + clocks: + minItems: 2 + clock-names: + items: + - const: usb_ctrl + - const: ddr + phy-names: + items: + - const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used + - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used + - const: usb2-phy2 # USB2 PHY2 if USBOTG_C port is used + + required: + - clock-names - if: properties: compatible:
@@ -97,6 +159,9 @@ allOf: then: properties: + phy-names: + items: + - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used clocks: minItems: 3 clock-names:
Signature · 1 line
2.22.0
Re: [PATCH v2 01/14] dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic GXL and GXM Families USB Glue Bindings
Quoted 11 lines · Neil Armstrong
The Amlogic GXL and GXM is slightly different from the Amlogic G12A Glue.
The GXL SoCs only embeds 2 USB2 PHYs and no USB3 PHYs, and the GXM SoCs embeds 3 USB2 PHYs.
Reviewed-by Martin Blumenstingl <[email protected]>Signed-off-by Neil Armstrong <[email protected]>--- .../usb/amlogic,meson-g12a-usb-ctrl.yaml | 73 ++++++++++++++++++- 1 file changed, 69 insertions(+), 4 deletions(-)
PATCH v2 2/14 usb: dwc3: meson-g12a: specify phy names in soc data
In reply to Neil ArmstrongTo handle the variable USB2 PHY counts on GXL and GXM SoCs, add the possible PHY names for each SoC in the compatible match data.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 47 +++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +33 -14
@@ -96,16 +96,8 @@#define USB_R5_ID_DIG_TH_MASK GENMASK(15, 8)#define USB_R5_ID_DIG_CNT_MASK GENMASK(23, 16) -enum { -USB2_HOST_PHY =0 , -USB2_OTG_PHY , -USB3_HOST_PHY , -PHY_COUNT , -}; - -static const char *phy_names[PHY_COUNT ] = { -"usb2-phy0" ,"usb2-phy1" ,"usb3-phy0" , -}; +#define PHY_COUNT 3 +#define USB2_OTG_PHY 1static struct clk_bulk_data meson_g12a_clocks[] = { { .id =NULL },
@@ -117,22 +109,44 @@ static struct clk_bulk_data meson_a1_clocks[] = { { .id = "xtal_usb_ctrl" }, }; +static const char *meson_g12a_phy_names[] = { +"usb2-phy0" ,"usb2-phy1" ,"usb3-phy0" , +}; + +/* +* Amlogic A1 has a single physical PHY, in slot 1, but still has the +* two U2 PHY controls register blocks like G12A. +* Handling the first PHY on slot 1 would need a large amount of code +* changes, and the current management is generic enough to handle it +* correctly when only the "usb2-phy1" phy is specified on-par with the +* DT bindings. +*/ +static const char *meson_a1_phy_names[] = { +"usb2-phy0" ,"usb2-phy1" +}; +struct dwc3_meson_g12a_drvdata {bool otg_switch_supported;struct clk_bulk_data *clks;int num_clks; +const char **phy_names; +int num_phys; };static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .otg_switch_supported = true, .clks = meson_g12a_clocks, .num_clks =ARRAY_SIZE (meson_g12a_clocks), + .phy_names = meson_g12a_phy_names, + .num_phys =ARRAY_SIZE (meson_g12a_phy_names), };static struct dwc3_meson_g12a_drvdata a1_drvdata = { .otg_switch_supported = false, .clks = meson_a1_clocks, .num_clks =ARRAY_SIZE (meson_a1_clocks), + .phy_names = meson_a1_phy_names, + .num_phys =ARRAY_SIZE (meson_a1_phy_names), };struct dwc3_meson_g12a {
@@ -171,10 +185,13 @@ static int dwc3_meson_g12a_usb2_init(struct dwc3_meson_g12a *priv)else priv->otg_phy_mode =PHY_MODE_USB_HOST ; -for (i =0 ; i <USB3_HOST_PHY ; ++i) { +for (i =0 ; i < priv->drvdata->num_phys; ++i) {if (!priv->phys[i])continue ; +if (!strstr (priv->drvdata->phy_names[i],"usb2" )) +continue ; +regmap_update_bits (priv->regmap,U2P_R0 + (U2P_REG_SIZE * i),U2P_R0_POWER_ON_RESET ,U2P_R0_POWER_ON_RESET );
@@ -284,17 +301,19 @@ static const struct regmap_config phy_meson_g12a_usb3_regmap_conf = {static int dwc3_meson_g12a_get_phys (struct dwc3_meson_g12a *priv) { +const char *phy_name;int i; -for (i =0 ; i <PHY_COUNT ; ++i) { - priv->phys[i] =devm_phy_optional_get (priv->dev, phy_names[i]); +for (i =0 ; i < priv->drvdata->num_phys ; ++i) { + phy_name = priv->drvdata->phy_names[i]; + priv->phys[i] =devm_phy_optional_get (priv->dev, phy_name);if (!priv->phys[i])continue ;if (IS_ERR (priv->phys[i]))return PTR_ERR (priv->phys[i]); -if (i ==USB3_HOST_PHY ) +if (strstr (phy_name,"usb3" )) priv->usb3_ports++;else priv->usb2_ports++;
Signature · 1 line
2.22.0
PATCH v2 3/14 usb: dwc3: meson-g12a: handle the phy and glue registers separately
In reply to Neil ArmstrongOn the Amlogic GXL/GXM SoCs, only the USB control registers are available, the PHY mode being handled in the PHY registers.
Thus, handle the PHY mode registers in separate regmaps and prepare support for Amlogic GXL/GXM SoCs by moving the regmap setup in a callback set in the SoC match data.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 124 ++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 39 deletions(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +85 -39
@@ -30,7 +30,7 @@#include <linux/usb/role.h> #include <linux/regulator/consumer.h> -/* USB2 Ports Control Registers */ +/* USB2 Ports Control Registers, offsets are per-port */ #define U2P_REG_SIZE 0x20
@@ -50,14 +50,16 @@/* USB Glue Control Registers */ -#define USB_R0 0x80 +#define G12A_GLUE_OFFSET 0x80 + +#define USB_R0 0x00#define USB_R0_P30_LANE0_TX2RX_LOOPBACK BIT(17)#define USB_R0_P30_LANE0_EXT_PCLK_REQ BIT(18)#define USB_R0_P30_PCS_RX_LOS_MASK_VAL_MASK GENMASK(28, 19)#define USB_R0_U2D_SS_SCALEDOWN_MODE_MASK GENMASK(30, 29)#define USB_R0_U2D_ACT BIT(31) -#define USB_R1 0x84 +#define USB_R1 0x04#define USB_R1_U3H_BIGENDIAN_GS BIT(0)#define USB_R1_U3H_PME_ENABLE BIT(1)#define USB_R1_U3H_HUB_PORT_OVERCURRENT_MASK GENMASK(4, 2)
@@ -69,23 +71,23 @@#define USB_R1_U3H_FLADJ_30MHZ_REG_MASK GENMASK(24, 19)#define USB_R1_P30_PCS_TX_SWING_FULL_MASK GENMASK(31, 25) -#define USB_R2 0x88 +#define USB_R2 0x08#define USB_R2_P30_PCS_TX_DEEMPH_3P5DB_MASK GENMASK(25, 20)#define USB_R2_P30_PCS_TX_DEEMPH_6DB_MASK GENMASK(31, 26) -#define USB_R3 0x8c +#define USB_R3 0x0c#define USB_R3_P30_SSC_ENABLE BIT(0)#define USB_R3_P30_SSC_RANGE_MASK GENMASK(3, 1)#define USB_R3_P30_SSC_REF_CLK_SEL_MASK GENMASK(12, 4)#define USB_R3_P30_REF_SSP_EN BIT(13) -#define USB_R4 0x90 +#define USB_R4 0x10#define USB_R4_P21_PORT_RESET_0 BIT(0)#define USB_R4_P21_SLEEP_M0 BIT(1)#define USB_R4_MEM_PD_MASK GENMASK(3, 2)#define USB_R4_P21_ONLY BIT(4) -#define USB_R5 0x94 +#define USB_R5 0x14#define USB_R5_ID_DIG_SYNC BIT(0)#define USB_R5_ID_DIG_REG BIT(1)#define USB_R5_ID_DIG_CFG_MASK GENMASK(3, 2)
@@ -125,20 +127,27 @@ static const char *meson_a1_phy_names[] = {"usb2-phy0" ,"usb2-phy1" }; +struct dwc3_meson_g12a ; +struct dwc3_meson_g12a_drvdata {bool otg_switch_supported;struct clk_bulk_data *clks;int num_clks;const char **phy_names;int num_phys; +int (*setup_regmaps)(struct dwc3_meson_g12a *priv,void __iomem *base); }; +static int dwc3_meson_g12a_setup_regmaps (struct dwc3_meson_g12a *priv, +void __iomem *base); +static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .otg_switch_supported = true, .clks = meson_g12a_clocks, .num_clks =ARRAY_SIZE (meson_g12a_clocks), .phy_names = meson_g12a_phy_names, .num_phys =ARRAY_SIZE (meson_g12a_phy_names), + .setup_regmaps = dwc3_meson_g12a_setup_regmaps, }; static struct dwc3_meson_g12a_drvdata a1_drvdata = {
@@ -147,11 +156,13 @@ static struct dwc3_meson_g12a_drvdata a1_drvdata = { .num_clks = ARRAY_SIZE(meson_a1_clocks), .phy_names = meson_a1_phy_names, .num_phys = ARRAY_SIZE(meson_a1_phy_names), + .setup_regmaps = dwc3_meson_g12a_setup_regmaps, };struct dwc3_meson_g12a {struct device *dev; -struct regmap *regmap; +struct regmap *u2p_regmap[PHY_COUNT ]; +struct regmap *usb_glue_regmap;struct reset_control *reset;struct phy *phys[PHY_COUNT ];enum usb_dr_mode otg_mode;
@@ -168,11 +179,11 @@ static void dwc3_meson_g12a_usb2_set_mode(struct dwc3_meson_g12a *priv, int i, enum phy_mode mode) {if (mode ==PHY_MODE_USB_HOST ) -regmap_update_bits (priv->regmap,U2P_R0 + (U2P_REG_SIZE * i), +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 ,U2P_R0_HOST_DEVICE ,U2P_R0_HOST_DEVICE );else -regmap_update_bits (priv->regmap,U2P_R0 + (U2P_REG_SIZE * i), +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 ,U2P_R0_HOST_DEVICE ,0 ); }
@@ -192,13 +203,12 @@ static int dwc3_meson_g12a_usb2_init(struct dwc3_meson_g12a *priv)if (!strstr (priv->drvdata->phy_names[i],"usb2" ))continue ; -regmap_update_bits (priv->regmap,U2P_R0 + (U2P_REG_SIZE * i), +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 ,U2P_R0_POWER_ON_RESET ,U2P_R0_POWER_ON_RESET );if (priv->drvdata->otg_switch_supported && i ==USB2_OTG_PHY ) { -regmap_update_bits (priv->regmap, -U2P_R0 + (U2P_REG_SIZE * i), +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 ,U2P_R0_ID_PULLUP |U2P_R0_DRV_VBUS ,U2P_R0_ID_PULLUP |U2P_R0_DRV_VBUS );
@@ -208,7 +218,7 @@ static int dwc3_meson_g12a_usb2_init(struct dwc3_meson_g12a *priv)dwc3_meson_g12a_usb2_set_mode (priv, i,PHY_MODE_USB_HOST ); -regmap_update_bits (priv->regmap,U2P_R0 + (U2P_REG_SIZE * i), +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 ,U2P_R0_POWER_ON_RESET ,0 ); }
@@ -217,7 +227,7 @@ static int dwc3_meson_g12a_usb2_init(struct dwc3_meson_g12a *priv)static void dwc3_meson_g12a_usb3_init (struct dwc3_meson_g12a *priv) { - regmap_update_bits(priv->regmap, USB_R3, + regmap_update_bits(priv->usb_glue_regmap, USB_R3, USB_R3_P30_SSC_RANGE_MASK | USB_R3_P30_REF_SSP_EN, USB_R3_P30_SSC_ENABLE |
@@ -225,21 +235,21 @@ static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv) USB_R3_P30_REF_SSP_EN);udelay (2 ); -regmap_update_bits (priv->regmap,USB_R2 , +regmap_update_bits (priv->usb_glue_regmap,USB_R2 ,USB_R2_P30_PCS_TX_DEEMPH_3P5DB_MASK ,FIELD_PREP (USB_R2_P30_PCS_TX_DEEMPH_3P5DB_MASK ,0x15 )); -regmap_update_bits (priv->regmap,USB_R2 , +regmap_update_bits (priv->usb_glue_regmap,USB_R2 ,USB_R2_P30_PCS_TX_DEEMPH_6DB_MASK ,FIELD_PREP (USB_R2_P30_PCS_TX_DEEMPH_6DB_MASK ,0x20 ));udelay (2 ); -regmap_update_bits (priv->regmap,USB_R1 , +regmap_update_bits (priv->usb_glue_regmap,USB_R1 ,USB_R1_U3H_HOST_PORT_POWER_CONTROL_PRESENT ,USB_R1_U3H_HOST_PORT_POWER_CONTROL_PRESENT ); -regmap_update_bits (priv->regmap,USB_R1 , +regmap_update_bits (priv->usb_glue_regmap,USB_R1 ,USB_R1_P30_PCS_TX_SWING_FULL_MASK ,FIELD_PREP (USB_R1_P30_PCS_TX_SWING_FULL_MASK ,127 )); }
@@ -247,16 +257,16 @@ static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv)static void dwc3_meson_g12a_usb_otg_apply_mode (struct dwc3_meson_g12a *priv) {if (priv->otg_phy_mode ==PHY_MODE_USB_DEVICE ) { -regmap_update_bits (priv->regmap,USB_R0 , +regmap_update_bits (priv->usb_glue_regmap,USB_R0 ,USB_R0_U2D_ACT ,USB_R0_U2D_ACT ); -regmap_update_bits (priv->regmap,USB_R0 , +regmap_update_bits (priv->usb_glue_regmap,USB_R0 ,USB_R0_U2D_SS_SCALEDOWN_MODE_MASK ,0 ); -regmap_update_bits (priv->regmap,USB_R4 , +regmap_update_bits (priv->usb_glue_regmap,USB_R4 ,USB_R4_P21_SLEEP_M0 ,USB_R4_P21_SLEEP_M0 ); }else { -regmap_update_bits (priv->regmap,USB_R0 , +regmap_update_bits (priv->usb_glue_regmap,USB_R0 ,USB_R0_U2D_ACT ,0 ); -regmap_update_bits (priv->regmap,USB_R4 , +regmap_update_bits (priv->usb_glue_regmap,USB_R4 ,USB_R4_P21_SLEEP_M0 ,0 ); } }
@@ -269,17 +279,17 @@ static int dwc3_meson_g12a_usb_init(struct dwc3_meson_g12a *priv)if (ret)return ret; -regmap_update_bits (priv->regmap,USB_R1 , +regmap_update_bits (priv->usb_glue_regmap,USB_R1 ,USB_R1_U3H_FLADJ_30MHZ_REG_MASK ,FIELD_PREP (USB_R1_U3H_FLADJ_30MHZ_REG_MASK ,0x20 )); -regmap_update_bits (priv->regmap,USB_R5 , +regmap_update_bits (priv->usb_glue_regmap,USB_R5 ,USB_R5_ID_DIG_EN_0 ,USB_R5_ID_DIG_EN_0 ); -regmap_update_bits (priv->regmap,USB_R5 , +regmap_update_bits (priv->usb_glue_regmap,USB_R5 ,USB_R5_ID_DIG_EN_1 ,USB_R5_ID_DIG_EN_1 ); -regmap_update_bits (priv->regmap,USB_R5 , +regmap_update_bits (priv->usb_glue_regmap,USB_R5 ,USB_R5_ID_DIG_TH_MASK ,FIELD_PREP (USB_R5_ID_DIG_TH_MASK ,0xff ));
@@ -292,7 +302,8 @@ static int dwc3_meson_g12a_usb_init(struct dwc3_meson_g12a *priv)return 0 ; } -static const struct regmap_config phy_meson_g12a_usb3_regmap_conf = { +static const struct regmap_config phy_meson_g12a_usb_glue_regmap_conf = { + .name ="usb-glue" , .reg_bits =8 , .val_bits =32 , .reg_stride =4 ,
@@ -329,7 +340,7 @@ static enum phy_mode dwc3_meson_g12a_get_id(struct dwc3_meson_g12a *priv) {u32 reg; -regmap_read (priv->regmap,USB_R5 , ®); +regmap_read (priv->usb_glue_regmap,USB_R5 , ®);if (reg & (USB_R5_ID_DIG_SYNC |USB_R5_ID_DIG_REG ))return PHY_MODE_USB_DEVICE ;
@@ -404,7 +415,8 @@ static irqreturn_t dwc3_meson_g12a_irq_thread(int irq, void *data)dev_warn (priv->dev,"Failed to switch OTG mode\n" ); } -regmap_update_bits (priv->regmap,USB_R5 ,USB_R5_ID_DIG_IRQ ,0 ); +regmap_update_bits (priv->usb_glue_regmap,USB_R5 , +USB_R5_ID_DIG_IRQ ,0 );return IRQ_HANDLED ; }
@@ -439,7 +451,7 @@ static int dwc3_meson_g12a_otg_init(struct platform_device *pdev,if (priv->otg_mode ==USB_DR_MODE_OTG ) {/* Ack irq before registering */ -regmap_update_bits (priv->regmap,USB_R5 , +regmap_update_bits (priv->usb_glue_regmap,USB_R5 ,USB_R5_ID_DIG_IRQ ,0 ); irq =platform_get_irq (pdev,0 );
@@ -474,6 +486,41 @@ static int dwc3_meson_g12a_otg_init(struct platform_device *pdev,return 0 ; } +static int dwc3_meson_g12a_setup_regmaps (struct dwc3_meson_g12a *priv, +void __iomem *base) +{ +int i; + + priv->usb_glue_regmap =devm_regmap_init_mmio (priv->dev, + base +G12A_GLUE_OFFSET , + &phy_meson_g12a_usb_glue_regmap_conf); +if (IS_ERR (priv->usb_glue_regmap)) +return PTR_ERR (priv->usb_glue_regmap); + +/* Create a regmap for each USB2 PHY control register set */ +for (i =0 ; i < priv->usb2_ports; i++) { +struct regmap_config u2p_regmap_config = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =U2P_R1 , + }; + + u2p_regmap_config.name =devm_kasprintf (priv->dev,GFP_KERNEL , +"u2p-%d" , i); +if (!u2p_regmap_config.name) +return -ENOMEM ; + + priv->u2p_regmap[i] =devm_regmap_init_mmio (priv->dev, + base + (i *U2P_REG_SIZE ), + &u2p_regmap_config); +if (IS_ERR (priv->u2p_regmap[i])) +return PTR_ERR (priv->u2p_regmap[i]); + } + +return 0 ; +} +static int dwc3_meson_g12a_probe (struct platform_device *pdev) {struct dwc3_meson_g12a *priv;
@@ -490,10 +537,12 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)if (IS_ERR (base))return PTR_ERR (base); - priv->regmap =devm_regmap_init_mmio (dev, base, - &phy_meson_g12a_usb3_regmap_conf); -if (IS_ERR (priv->regmap)) -return PTR_ERR (priv->regmap); + priv->drvdata =of_device_get_match_data (&pdev->dev); + + priv->dev = dev; + ret = priv->drvdata->setup_regmaps (priv, base); +if (ret) +return ret; priv->vbus =devm_regulator_get_optional (dev,"vbus" );if (IS_ERR (priv->vbus)) {
@@ -502,8 +551,6 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) priv->vbus =NULL ; } - priv->drvdata =of_device_get_match_data (&pdev->dev); - ret =devm_clk_bulk_get (dev, priv->drvdata->num_clks, priv->drvdata->clks);
@@ -516,7 +563,6 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)return ret;platform_set_drvdata (pdev, priv); - priv->dev = dev; priv->reset =devm_reset_control_get (dev,NULL );if (IS_ERR (priv->reset)) {
Signature · 1 line
2.22.0
PATCH v2 4/14 usb: dwc3: meson-g12a: get the reset as shared
In reply to Neil ArmstrongIn order to support the Amlogic GXL/GXM SoCs, the reset line must be handled as shared since also used by the PHYs.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +1 -1
@@ -564,7 +564,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); - priv->reset =devm_reset_control_get (dev,NULL ); + priv->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (priv->reset)) { ret =PTR_ERR (priv->reset);dev_err (dev,"failed to get device reset, err=%d\n" , ret);
Signature · 1 line
2.22.0
PATCH v2 5/14 usb: dwc3: meson-g12a: check return of dwc3_meson_g12a_usb_init
In reply to Neil ArmstrongThe dwc3_meson_g12a_usb_init function can return an error, check it.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +3 -1
@@ -588,7 +588,9 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)/* Get dr_mode */ priv->otg_mode =usb_get_dr_mode (dev); -dwc3_meson_g12a_usb_init (priv); + ret =dwc3_meson_g12a_usb_init (priv); +if (ret) + goto err_disable_clks;/* Init PHYs */ for (i =0 ; i <PHY_COUNT ; ++i) {
Signature · 1 line
2.22.0
Re: [PATCH v2 05/14] usb: dwc3: meson-g12a: check return of dwc3_meson_g12a_usb_init
Quoted 4 lines · Neil Armstrong
The
dwc3_meson_g12a_usb_initfunction can return an error, check it.Fixes e3e716e6b889 ("usb: dwc3: Add Amlogic A1 DWC3 glue")
I think this should be:
(because I don't see where e3e716e6b889 modifies dwc3_meson_g12a_usb_init)
Quoted 1 line
Signed-off-by Neil Armstrong <[email protected]>
and with that:
Martin
PATCH v2 6/14 usb: dwc3: meson-g12a: refactor usb2 phy init
In reply to Neil ArmstrongRefactor the USB2 PHY init code patch to handle the Amlogic GXL/GXM not having the PHY mode control registers in the Glue but in the PHY registers.
The Amlogic GXL/GXM will call phy_set_mode() instead of programming the PHY mode control registers, thus add two new callbacks to the SoC match data.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 74 +++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 21 deletions(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +53 -21
@@ -136,11 +136,21 @@ struct dwc3_meson_g12a_drvdata {const char **phy_names;int num_phys;int (*setup_regmaps)(struct dwc3_meson_g12a *priv,void __iomem *base); +int (*usb2_init_phy)(struct dwc3_meson_g12a *priv,int i, +enum phy_mode mode); +int (*set_phy_mode)(struct dwc3_meson_g12a *priv,int i, +enum phy_mode mode); };static int dwc3_meson_g12a_setup_regmaps (struct dwc3_meson_g12a *priv,void __iomem *base); +static int dwc3_meson_g12a_usb2_init_phy (struct dwc3_meson_g12a *priv,int i, +enum phy_mode mode); + +static int dwc3_meson_g12a_set_phy_mode (struct dwc3_meson_g12a *priv, +int i,enum phy_mode mode); +static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .otg_switch_supported = true, .clks = meson_g12a_clocks,
@@ -148,6 +158,8 @@ static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .phy_names = meson_g12a_phy_names, .num_phys = ARRAY_SIZE(meson_g12a_phy_names), .setup_regmaps = dwc3_meson_g12a_setup_regmaps, + .usb2_init_phy = dwc3_meson_g12a_usb2_init_phy, + .set_phy_mode = dwc3_meson_g12a_set_phy_mode, };static struct dwc3_meson_g12a_drvdata a1_drvdata = {
@@ -157,6 +169,8 @@ static struct dwc3_meson_g12a_drvdata a1_drvdata = { .phy_names = meson_a1_phy_names, .num_phys = ARRAY_SIZE(meson_a1_phy_names), .setup_regmaps = dwc3_meson_g12a_setup_regmaps, + .usb2_init_phy = dwc3_meson_g12a_usb2_init_phy, + .set_phy_mode = dwc3_meson_g12a_set_phy_mode, };struct dwc3_meson_g12a {
@@ -175,8 +189,8 @@ struct dwc3_meson_g12a {const struct dwc3_meson_g12a_drvdata *drvdata; }; -static void dwc3_meson_g12a_usb2_set_mode (struct dwc3_meson_g12a *priv, -int i,enum phy_mode mode) +static int dwc3_meson_g12a_set_phy_mode (struct dwc3_meson_g12a *priv, +int i,enum phy_mode mode) {if (mode ==PHY_MODE_USB_HOST ) regmap_update_bits(priv->u2p_regmap[i], U2P_R0,
@@ -185,11 +199,41 @@ static void dwc3_meson_g12a_usb2_set_mode(struct dwc3_meson_g12a *priv,else regmap_update_bits (priv->u2p_regmap[i],U2P_R0 ,U2P_R0_HOST_DEVICE ,0 ); + +return 0 ; +} + +static int dwc3_meson_g12a_usb2_init_phy (struct dwc3_meson_g12a *priv,int i, +enum phy_mode mode) +{ +int ret; + +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 , +U2P_R0_POWER_ON_RESET , +U2P_R0_POWER_ON_RESET ); + +if (priv->drvdata->otg_switch_supported && i ==USB2_OTG_PHY ) { +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 , +U2P_R0_ID_PULLUP |U2P_R0_DRV_VBUS , +U2P_R0_ID_PULLUP |U2P_R0_DRV_VBUS ); + + ret = priv->drvdata->set_phy_mode (priv, i, mode); + }else + ret = priv->drvdata->set_phy_mode (priv, i, +PHY_MODE_USB_HOST ); + +if (ret) +return ret; + +regmap_update_bits (priv->u2p_regmap[i],U2P_R0 , +U2P_R0_POWER_ON_RESET ,0 ); + +return 0 ; }static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv) { -int i; +int i, ret;if (priv->otg_mode ==USB_DR_MODE_PERIPHERAL ) priv->otg_phy_mode =PHY_MODE_USB_DEVICE ;
@@ -203,23 +247,9 @@ static int dwc3_meson_g12a_usb2_init(struct dwc3_meson_g12a *priv)if (!strstr (priv->drvdata->phy_names[i],"usb2" ))continue ; -regmap_update_bits (priv->u2p_regmap[i],U2P_R0 , -U2P_R0_POWER_ON_RESET , -U2P_R0_POWER_ON_RESET ); - -if (priv->drvdata->otg_switch_supported && i ==USB2_OTG_PHY ) { -regmap_update_bits (priv->u2p_regmap[i],U2P_R0 , -U2P_R0_ID_PULLUP |U2P_R0_DRV_VBUS , -U2P_R0_ID_PULLUP |U2P_R0_DRV_VBUS ); - -dwc3_meson_g12a_usb2_set_mode (priv, i, - priv->otg_phy_mode); - }else -dwc3_meson_g12a_usb2_set_mode (priv, i, -PHY_MODE_USB_HOST ); - -regmap_update_bits (priv->u2p_regmap[i],U2P_R0 , -U2P_R0_POWER_ON_RESET ,0 ); + ret = priv->drvdata->usb2_init_phy (priv, i, priv->otg_phy_mode); +if (ret) +return ret; }return 0 ;
@@ -372,7 +402,9 @@ static int dwc3_meson_g12a_otg_mode_set(struct dwc3_meson_g12a *priv, priv->otg_phy_mode = mode; -dwc3_meson_g12a_usb2_set_mode (priv,USB2_OTG_PHY , mode); + ret = priv->drvdata->set_phy_mode (priv,USB2_OTG_PHY , mode); +if (ret) +return ret;dwc3_meson_g12a_usb_otg_apply_mode (priv);
Signature · 1 line
2.22.0
Re: [PATCH v2 06/14] usb: dwc3: meson-g12a: refactor usb2 phy init
Hi Neil,
Quoted 10 lines · Neil Armstrong
Refactor the USB2 PHY init code patch to handle the Amlogic GXL/GXM not having the PHY mode control registers in the Glue but in the PHY registers.
The Amlogic GXL/GXM will call
phy_set_mode()instead of programming the PHY mode control registers, thus add two new callbacks to the SoC match data.Signed-off-by Neil Armstrong <[email protected]>
checkpatch reports that five lines need to be checked.
these all look valid (for example: "Alignment should match open parenthesis")
with these addressed:
Re: [PATCH v2 06/14] usb: dwc3: meson-g12a: refactor usb2 phy init
Hi,
Quoted 12 lines · Martin Blumenstingl
Hi Neil,
Quoted 9 lines · Neil Armstrong
Refactor the USB2 PHY init code patch to handle the Amlogic GXL/GXM not having the PHY mode control registers in the Glue but in the PHY registers.
The Amlogic GXL/GXM will call
phy_set_mode()instead of programming the PHY mode control registers, thus add two new callbacks to the SoC match data.
Quoted 6 lines
Quoted 1 line
Signed-off-by Neil Armstrong <[email protected]>checkpatch reports that five lines need to be checked.
these all look valid (for example: "Alignment should match open parenthesis")with these addressed:
Reviewed-by Martin Blumenstingl <[email protected]>
That's a CHECK, only shows with --strict. drivers/usb/ ignores those for the most part.
Signature · 1 line
balbi
PATCH v2 7/14 usb: dwc3: meson-g12a: refactor usb init
In reply to Neil ArmstrongRefactor the USB init code patch to handle the Amlogic GXL/GXM needing to initialize the OTG port as Peripheral mode for the DWC2 IP to probe correctly.
A secondary, post_init callback is added to setup the OTG PHY mode after the sub-nodes probe.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 46 +++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 13 deletions(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +33 -13
@@ -140,6 +140,8 @@ struct dwc3_meson_g12a_drvdata { enum phy_mode mode);int (*set_phy_mode)(struct dwc3_meson_g12a *priv,int i,enum phy_mode mode); +int (*usb_init)(struct dwc3_meson_g12a *priv); +int (*usb_post_init)(struct dwc3_meson_g12a *priv); }; static int dwc3_meson_g12a_setup_regmaps(struct dwc3_meson_g12a *priv,
@@ -151,6 +153,8 @@ static int dwc3_meson_g12a_usb2_init_phy(struct dwc3_meson_g12a *priv, int i,static int dwc3_meson_g12a_set_phy_mode (struct dwc3_meson_g12a *priv,int i,enum phy_mode mode); +static int dwc3_meson_g12a_usb_init (struct dwc3_meson_g12a *priv); +static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .otg_switch_supported = true, .clks = meson_g12a_clocks,
@@ -160,6 +164,7 @@ static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .setup_regmaps = dwc3_meson_g12a_setup_regmaps, .usb2_init_phy = dwc3_meson_g12a_usb2_init_phy, .set_phy_mode = dwc3_meson_g12a_set_phy_mode, + .usb_init = dwc3_meson_g12a_usb_init, };static struct dwc3_meson_g12a_drvdata a1_drvdata = {
@@ -171,6 +176,7 @@ static struct dwc3_meson_g12a_drvdata a1_drvdata = { .setup_regmaps = dwc3_meson_g12a_setup_regmaps, .usb2_init_phy = dwc3_meson_g12a_usb2_init_phy, .set_phy_mode = dwc3_meson_g12a_set_phy_mode, + .usb_init = dwc3_meson_g12a_usb_init, };struct dwc3_meson_g12a {
@@ -231,15 +237,11 @@ static int dwc3_meson_g12a_usb2_init_phy(struct dwc3_meson_g12a *priv, int i,return 0 ; } -static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv) +static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv, +enum phy_mode mode) {int i, ret; -if (priv->otg_mode ==USB_DR_MODE_PERIPHERAL ) - priv->otg_phy_mode =PHY_MODE_USB_DEVICE ; -else - priv->otg_phy_mode =PHY_MODE_USB_HOST ; -for (i =0 ; i < priv->drvdata->num_phys; ++i) {if (!priv->phys[i])continue ;
@@ -284,9 +286,10 @@ static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv) FIELD_PREP(USB_R1_P30_PCS_TX_SWING_FULL_MASK, 127)); } -static void dwc3_meson_g12a_usb_otg_apply_mode (struct dwc3_meson_g12a *priv) +static void dwc3_meson_g12a_usb_otg_apply_mode (struct dwc3_meson_g12a *priv, +enum phy_mode mode) { -if (priv->otg_phy_mode ==PHY_MODE_USB_DEVICE ) { +if (mode ==PHY_MODE_USB_DEVICE ) {regmap_update_bits (priv->usb_glue_regmap,USB_R0 ,USB_R0_U2D_ACT ,USB_R0_U2D_ACT ); regmap_update_bits(priv->usb_glue_regmap, USB_R0,
@@ -301,11 +304,12 @@ static void dwc3_meson_g12a_usb_otg_apply_mode(struct dwc3_meson_g12a *priv) } } -static int dwc3_meson_g12a_usb_init (struct dwc3_meson_g12a *priv) +static int dwc3_meson_g12a_usb_init_glue (struct dwc3_meson_g12a *priv, +enum phy_mode mode) {int ret; - ret =dwc3_meson_g12a_usb2_init (priv); + ret =dwc3_meson_g12a_usb2_init (priv, mode);if (ret)return ret;
@@ -327,7 +331,7 @@ static int dwc3_meson_g12a_usb_init(struct dwc3_meson_g12a *priv)if (priv->usb3_ports)dwc3_meson_g12a_usb3_init (priv); -dwc3_meson_g12a_usb_otg_apply_mode (priv); +dwc3_meson_g12a_usb_otg_apply_mode (priv, mode);return 0 ; }
@@ -406,7 +410,7 @@ static int dwc3_meson_g12a_otg_mode_set(struct dwc3_meson_g12a *priv,if (ret)return ret; -dwc3_meson_g12a_usb_otg_apply_mode (priv); +dwc3_meson_g12a_usb_otg_apply_mode (priv, mode);return 0 ; }
@@ -553,6 +557,11 @@ static int dwc3_meson_g12a_setup_regmaps(struct dwc3_meson_g12a *priv,return 0 ; } +static int dwc3_meson_g12a_usb_init (struct dwc3_meson_g12a *priv) +{ +return dwc3_meson_g12a_usb_init_glue (priv, priv->otg_phy_mode); +} +static int dwc3_meson_g12a_probe (struct platform_device *pdev) {struct dwc3_meson_g12a *priv;
@@ -620,7 +629,12 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)/* Get dr_mode */ priv->otg_mode =usb_get_dr_mode (dev); - ret =dwc3_meson_g12a_usb_init (priv); +if (priv->otg_mode ==USB_DR_MODE_PERIPHERAL ) + priv->otg_phy_mode =PHY_MODE_USB_DEVICE ; +else + priv->otg_phy_mode =PHY_MODE_USB_HOST ; + + ret = priv->drvdata->usb_init (priv);if (ret) goto err_disable_clks;
@@ -642,6 +656,12 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)if (ret) goto err_phys_power; +if (priv->drvdata->usb_post_init) { + ret = priv->drvdata->usb_post_init (priv); +if (ret) + goto err_phys_power; + } + ret =dwc3_meson_g12a_otg_init (pdev, priv);if (ret) goto err_phys_power;
Signature · 1 line
2.22.0
Martin Blumenstingl
reviewerRe: [PATCH v2 07/14] usb: dwc3: meson-g12a: refactor usb init
Hi Neil,
On Thu, Mar 26, 2020 at 2:45 PM Neil Armstrong <[email protected]> wrote:
[...]
Quoted 15 lines
drivers/usb/dwc3/dwc3-meson-g12a.c +2
-6-static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv) +static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv, +enum phy_mode mode) {int i, ret; -if (priv->otg_mode ==USB_DR_MODE_PERIPHERAL ) - priv->otg_phy_mode =PHY_MODE_USB_DEVICE ; -else - priv->otg_phy_mode =PHY_MODE_USB_HOST ; -for (i =0 ; i < priv->drvdata->num_phys; ++i) {if (!priv->phys[i])continue ;
drivers/usb/dwc3/dwc3-meson-g12a.c static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv) · line 287
Quoted 2 lines
drivers/usb/dwc3/dwc3-meson-g12a.c +0
-0@@ -284,9 +286,10 @@ static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv) FIELD_PREP(USB_R1_P30_PCS_TX_SWING_FULL_MASK, 127)); }
There is something strange with dwc3_meson_g12a_usb2_init. enum phy_mode mode is added here but it's not used inside this function
I also think that we should not pass enum phy_mode to dwc3_meson_g12a_usb_otg_apply_mode
I'm aware that the original function used enum phy_mode inside but this doesn't seem right:
we're not configuring a PHY there
instead we're setting up the OTG switch so I think we should use enum usb_role instead
[...]
not part of this patch but should be:
there's a still a direct call to dwc3_meson_g12a_usb_init() in dwc3_meson_g12a_resume()
I think that needs to be changed to priv->drvdata->usb_init(priv); as well
Re: [PATCH v2 07/14] usb: dwc3: meson-g12a: refactor usb init
Quoted 10 lines · Martin Blumenstingl
Hi Neil,
On Thu, Mar 26, 2020 at 2:45 PM Neil Armstrong <[email protected]> wrote:
[...]Quoted 6 lines
drivers/usb/dwc3/dwc3-meson-g12a.c +2
-1-static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv) +static int dwc3_meson_g12a_usb2_init (struct dwc3_meson_g12a *priv, +enum phy_mode mode) {int i, ret;
Quoted 13 lines
drivers/usb/dwc3/dwc3-meson-g12a.c static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv) · line 287
Quoted 11 lines
drivers/usb/dwc3/dwc3-meson-g12a.c +0
-5-if (priv->otg_mode ==USB_DR_MODE_PERIPHERAL ) - priv->otg_phy_mode =PHY_MODE_USB_DEVICE ; -else - priv->otg_phy_mode =PHY_MODE_USB_HOST ; -for (i =0 ; i < priv->drvdata->num_phys; ++i) {if (!priv->phys[i])continue ;@@ -284,9 +286,10 @@ static void dwc3_meson_g12a_usb3_init(struct dwc3_meson_g12a *priv) FIELD_PREP(USB_R1_P30_PCS_TX_SWING_FULL_MASK, 127)); }There is something strange with
dwc3_meson_g12a_usb2_init. enumphy_modemode is added here but it's not used inside this function
You are right...
Quoted 8 lines
I also think that we should not pass enum
phy_modetodwc3_meson_g12a_usb_otg_apply_mode
I'm aware that the original function used enumphy_modeinside but this doesn't seem right:
we're not configuring a PHY there
instead we're setting up the OTG switch so I think we should use enumusb_roleinstead
Indirectly yes, we setup how the phy_mode is set in the glue, and passing usb_role will need an useless conversion in dwc3_meson_g12a_usb_init_glue also calling dwc3_meson_g12a_usb_otg_apply_mode.
Quoted 7 lines
[...]
not part of this patch but should be:
there's a still a direct call todwc3_meson_g12a_usb_init()indwc3_meson_g12a_resume()
I think that needs to be changed topriv->drvdata->usb_init(priv); as well
Indeed, I'll fix that.
Again, thanks for reviewing !
Neil
PATCH v2 8/14 usb: dwc3: meson-g12a: support the GXL/GXM DWC3 host phy disconnect
In reply to Neil ArmstrongOn the Amlogic GXL/GXM SoCs, the OTG PHY status signals are always connected to the DWC3 controller, thus crashing the controller when switching to OTG mode when port is not populated with a device/cable to Host.
Amlogic added a bit to disconnect the OTG PHY status signals from the DWC3 to be used when switching the OTG PHY as Device to the DWC2 controller.
The drawback is that it makes the DWC3 port state machine stall and needs a full reset of the DWC3 controller to get connect status to the port connected to the OTG PHY, but not the other one.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/usb/dwc3/dwc3-meson-g12a.c +34 -0
@@ -131,6 +131,7 @@ struct dwc3_meson_g12a;struct dwc3_meson_g12a_drvdata {bool otg_switch_supported; +bool otg_phy_host_port_disable;struct clk_bulk_data *clks;int num_clks;const char **phy_names;
@@ -155,6 +156,19 @@ static int dwc3_meson_g12a_set_phy_mode(struct dwc3_meson_g12a *priv,static int dwc3_meson_g12a_usb_init (struct dwc3_meson_g12a *priv); +/* +* For GXL and GXM SoCs: +* USB Phy muxing between the DWC2 Device controller and the DWC3 Host +* controller is buggy when switching from Device to Host when USB port +* is unpopulated, it causes the DWC3 to hard crash. +* When populated (including OTG switching with ID pin), the switch works +* like a charm like on the G12A platforms. +* In order to still switch from Host to Device on an USB Type-A port, +* an U2_PORT_DISABLE bit has been added to disconnect the DWC3 Host +* controller from the port, but when used the DWC3 controller must be +* reset to recover usage of the port. +*/ +static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .otg_switch_supported = true, .clks = meson_g12a_clocks,
@@ -290,6 +304,13 @@ static void dwc3_meson_g12a_usb_otg_apply_mode(struct dwc3_meson_g12a *priv, enum phy_mode mode) {if (mode ==PHY_MODE_USB_DEVICE ) { +if (priv->otg_mode !=USB_DR_MODE_OTG && + priv->drvdata->otg_phy_host_port_disable) +/* Isolate the OTG PHY port from the Host Controller */ +regmap_update_bits (priv->usb_glue_regmap,USB_R1 , +USB_R1_U3H_HOST_U2_PORT_DISABLE_MASK , +FIELD_PREP (USB_R1_U3H_HOST_U2_PORT_DISABLE_MASK , +BIT (USB2_OTG_PHY )));regmap_update_bits (priv->usb_glue_regmap,USB_R0 ,USB_R0_U2D_ACT ,USB_R0_U2D_ACT ); regmap_update_bits(priv->usb_glue_regmap, USB_R0,
@@ -297,6 +318,12 @@ static void dwc3_meson_g12a_usb_otg_apply_mode(struct dwc3_meson_g12a *priv,regmap_update_bits (priv->usb_glue_regmap,USB_R4 ,USB_R4_P21_SLEEP_M0 ,USB_R4_P21_SLEEP_M0 ); }else { +if (priv->otg_mode !=USB_DR_MODE_OTG && + priv->drvdata->otg_phy_host_port_disable) { +regmap_update_bits (priv->usb_glue_regmap,USB_R1 , +USB_R1_U3H_HOST_U2_PORT_DISABLE_MASK ,0 ); +msleep (500 ); + }regmap_update_bits (priv->usb_glue_regmap,USB_R0 ,USB_R0_U2D_ACT ,0 ); regmap_update_bits(priv->usb_glue_regmap, USB_R4,
@@ -429,6 +456,13 @@ static int dwc3_meson_g12a_role_set(struct device *dev, enum usb_role role)if (mode == priv->otg_phy_mode)return 0 ; +if (priv->drvdata->otg_phy_host_port_disable) +dev_warn_once (priv->dev,"Manual OTG switch is broken on this " \ +"SoC, when manual switching from " \ +"Host to device, DWC3 controller " \ +"will need to be resetted in order " \ +"to recover usage of the Host port" ); +return dwc3_meson_g12a_otg_mode_set (priv, mode); }
Signature · 1 line
2.22.0
PATCH v2 9/14 usb: dwc3: meson-g12a: add support for GXL and GXM SoCs
In reply to Neil ArmstrongIn order to add support for the Amlogic GXL/GXM USB Glue, this adds the corresponding :
- PHY names
- clock names
- USB2 PHY init and mode set
- regmap setup
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 102 ++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +101 -1
@@ -101,6 +101,11 @@#define PHY_COUNT 3#define USB2_OTG_PHY 1 +static struct clk_bulk_data meson_gxl_clocks[] = { + { .id ="usb_ctrl" }, + { .id ="ddr" }, +}; +static struct clk_bulk_data meson_g12a_clocks[] = { { .id =NULL }, };
@@ -111,6 +116,10 @@ static struct clk_bulk_data meson_a1_clocks[] = { { .id = "xtal_usb_ctrl" }, }; +static const char *meson_gxm_phy_names[] = { +"usb2-phy0" ,"usb2-phy1" ,"usb2-phy2" , +}; +static const char *meson_g12a_phy_names[] = {"usb2-phy0" ,"usb2-phy1" ,"usb3-phy0" , };
@@ -145,16 +154,53 @@ struct dwc3_meson_g12a_drvdata {int (*usb_post_init)(struct dwc3_meson_g12a *priv); }; +static int dwc3_meson_gxl_setup_regmaps (struct dwc3_meson_g12a *priv, +void __iomem *base);static int dwc3_meson_g12a_setup_regmaps (struct dwc3_meson_g12a *priv,void __iomem *base);static int dwc3_meson_g12a_usb2_init_phy (struct dwc3_meson_g12a *priv,int i, -enum phy_mode mode); +enum phy_mode mode); +static int dwc3_meson_gxl_usb2_init_phy (struct dwc3_meson_g12a *priv,int i, +enum phy_mode mode);static int dwc3_meson_g12a_set_phy_mode (struct dwc3_meson_g12a *priv,int i,enum phy_mode mode); +static int dwc3_meson_gxl_set_phy_mode (struct dwc3_meson_g12a *priv, +int i,enum phy_mode mode);static int dwc3_meson_g12a_usb_init (struct dwc3_meson_g12a *priv); +static int dwc3_meson_gxl_usb_init (struct dwc3_meson_g12a *priv); + +static int dwc3_meson_gxl_usb_post_init (struct dwc3_meson_g12a *priv); + +static struct dwc3_meson_g12a_drvdata gxl_drvdata = { + .otg_switch_supported = true, + .otg_phy_host_port_disable = true, + .clks = meson_gxl_clocks, + .num_clks =ARRAY_SIZE (meson_g12a_clocks), + .phy_names = meson_a1_phy_names, + .num_phys =ARRAY_SIZE (meson_a1_phy_names), + .setup_regmaps = dwc3_meson_gxl_setup_regmaps, + .usb2_init_phy = dwc3_meson_gxl_usb2_init_phy, + .set_phy_mode = dwc3_meson_gxl_set_phy_mode, + .usb_init = dwc3_meson_gxl_usb_init, + .usb_post_init = dwc3_meson_gxl_usb_post_init, +}; + +static struct dwc3_meson_g12a_drvdata gxm_drvdata = { + .otg_switch_supported = true, + .otg_phy_host_port_disable = true, + .clks = meson_gxl_clocks, + .num_clks =ARRAY_SIZE (meson_g12a_clocks), + .phy_names = meson_gxm_phy_names, + .num_phys =ARRAY_SIZE (meson_gxm_phy_names), + .setup_regmaps = dwc3_meson_gxl_setup_regmaps, + .usb2_init_phy = dwc3_meson_gxl_usb2_init_phy, + .set_phy_mode = dwc3_meson_gxl_set_phy_mode, + .usb_init = dwc3_meson_gxl_usb_init, + .usb_post_init = dwc3_meson_gxl_usb_post_init, +};/* * For GXL and GXM SoCs:
@@ -209,6 +255,21 @@ struct dwc3_meson_g12a {const struct dwc3_meson_g12a_drvdata *drvdata; }; +static int dwc3_meson_gxl_set_phy_mode (struct dwc3_meson_g12a *priv, +int i,enum phy_mode mode) +{ +return phy_set_mode (priv->phys[i], mode); +} + +static int dwc3_meson_gxl_usb2_init_phy (struct dwc3_meson_g12a *priv,int i, +enum phy_mode mode) +{ +/* On GXL PHY must be started in device mode for DWC2 init */ +return priv->drvdata->set_phy_mode (priv, i, + (i ==USB2_OTG_PHY ) ?PHY_MODE_USB_DEVICE + :PHY_MODE_USB_HOST ); +} +static int dwc3_meson_g12a_set_phy_mode (struct dwc3_meson_g12a *priv,int i,enum phy_mode mode) {
@@ -556,6 +617,18 @@ static int dwc3_meson_g12a_otg_init(struct platform_device *pdev,return 0 ; } +static int dwc3_meson_gxl_setup_regmaps (struct dwc3_meson_g12a *priv, +void __iomem *base) +{ +/* GXL controls the PHY mode in the PHY registers unlike G12A */ + priv->usb_glue_regmap =devm_regmap_init_mmio (priv->dev, base, + &phy_meson_g12a_usb_glue_regmap_conf); +if (IS_ERR (priv->usb_glue_regmap)) +return PTR_ERR (priv->usb_glue_regmap); + +return 0 ; +} +static int dwc3_meson_g12a_setup_regmaps (struct dwc3_meson_g12a *priv,void __iomem *base) {
@@ -596,6 +669,25 @@ static int dwc3_meson_g12a_usb_init(struct dwc3_meson_g12a *priv)return dwc3_meson_g12a_usb_init_glue (priv, priv->otg_phy_mode); } +static int dwc3_meson_gxl_usb_init (struct dwc3_meson_g12a *priv) +{ +return dwc3_meson_g12a_usb_init_glue (priv,PHY_MODE_USB_DEVICE ); +} + +static int dwc3_meson_gxl_usb_post_init (struct dwc3_meson_g12a *priv) +{ +int ret; + + ret = priv->drvdata->set_phy_mode (priv,USB2_OTG_PHY , + priv->otg_phy_mode); +if (ret) +return ret; + +dwc3_meson_g12a_usb_otg_apply_mode (priv, priv->otg_phy_mode); + +return 0 ; +} +static int dwc3_meson_g12a_probe (struct platform_device *pdev) {struct dwc3_meson_g12a *priv;
@@ -825,6 +917,14 @@ static const struct dev_pm_ops dwc3_meson_g12a_dev_pm_ops = { };static const struct of_device_id dwc3_meson_g12a_match[] = { + { + .compatible ="amlogic,meson-gxl-usb-ctrl" , + .data = &gxl_drvdata, + }, + { + .compatible ="amlogic,meson-gxm-usb-ctrl" , + .data = &gxm_drvdata, + }, { .compatible ="amlogic,meson-g12a-usb-ctrl" , .data = &g12a_drvdata,
Signature · 1 line
2.22.0
PATCH v2 10/14 arm64: dts: amlogic: use the new USB control driver for GXL and GXM
In reply to Neil ArmstrongFrom: Martin Blumenstingl <[email protected]>
Add the correcly architectured USB Glue node and adapt all the Amlogic GXL and GXM board to the new organization.
--- .../dts/amlogic/meson-gx-libretech-pc.dtsi | 3 +- .../boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 +- .../amlogic/meson-gxl-s805x-libretech-ac.dts | 3 +- .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 +- .../amlogic/meson-gxl-s905d-phicomm-n1.dts | 4 ++ .../boot/dts/amlogic/meson-gxl-s905w-p281.dts | 4 ++ .../dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 4 ++ .../amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++ .../amlogic/meson-gxl-s905x-libretech-cc.dts | 3 +- .../amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +- .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 45 ++++++++++--------- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- .../boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +- .../boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 ++ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 7 ++- 16 files changed, 68 insertions(+), 31 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi +2 -1
@@ -360,8 +360,9 @@ status = "okay"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; }; &usb2_phy0 {
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +2 -1
@@ -223,6 +223,7 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "otg"; };
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts +2 -1
@@ -243,6 +243,7 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; };
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts +2 -1
@@ -216,6 +216,7 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; };
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts +4 -0
@@ -29,3 +29,7 @@ &cvbs_vdac_port { status = "disabled"; }; + +&usb { + dr_mode = "host"; +};
arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dts +4 -0
@@ -20,3 +20,7 @@ reg = <0x0 0x0 0x0 0x40000000>; }; }; + +&usb { + dr_mode = "host"; +};
arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts +4 -0
@@ -24,3 +24,7 @@ &ir { linux,rc-map-name = "rc-tanix-tx3mini"; }; + +&usb { + dr_mode = "host"; +};
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +4 -0
@@ -207,3 +207,7 @@ pinctrl-0 = <&uart_ao_b_pins>; pinctrl-names = "default"; }; + +&usb { + dr_mode = "peripheral"; +};
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +2 -1
@@ -272,8 +272,9 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; }; &usb2_phy0 {
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts +2 -1
@@ -218,6 +218,7 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; };
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +2 -1
@@ -188,8 +188,9 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; }; &usb2_phy0 {
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +25 -20
69 lines not on this page · raw message
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +2 -1
@@ -437,6 +437,7 @@ vref-supply = <&vddio_ao18>; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "peripheral"; };
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +2 -1
@@ -179,6 +179,7 @@ pinctrl-names = "default"; }; -&usb0 { +&usb { status = "okay"; + dr_mode = "host"; };
arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts +4 -0
@@ -39,3 +39,7 @@ &ir { linux,rc-map-name = "rc-vega-s9x"; }; + +&usb { + dr_mode = "host"; +};
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +5 -2
@@ -141,8 +141,11 @@ compatible = "amlogic,meson-gxm-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; }; -&dwc3 { - phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>; +&usb { + compatible = "amlogic,meson-gxm-usb-ctrl"; + + phy-names = "usb2-phy0", "usb2-phy1", "usb2-phy2"; + phys = <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>; }; &vdec {
Signature · 1 line
2.22.0
Kevin Hilman
maintainerRe: [PATCH v2 10/14] arm64: dts: amlogic: use the new USB control driver for GXL and GXM
Quoted 7 lines · Neil Armstrong
From: Martin Blumenstingl <[email protected]>
Add the correcly architectured USB Glue node and adapt all the Amlogic GXL and GXM board to the new organization.
Signed-off-by Martin Blumenstingl <[email protected]>Signed-off-by Neil Armstrong <[email protected]>
Queued for v5.8,
Kevin
PATCH v2 11/14 phy: amlogic: meson-gxl-usb3: remove code for non-existing PHY
In reply to Neil ArmstrongFrom: Martin Blumenstingl <[email protected]>
The registers which are managed by the meson-gxl-usb3 PHY driver are actually "USB control" registers (which are "glue" registers which manage OTG detection and routing of the OTG capable port between the DWC2 peripheral-only controller and the DWC3 host-only controller).
Drop the meson-gxl-usb3 PHY driver now that the dwc3-meson-g12a-usb driver supports the USB control registers on GXL and GXM SoCs (these were previously managed by the meson-gxl-usb3 PHY driver).
--- .../bindings/phy/meson-gxl-usb3-phy.txt | 31 -- drivers/phy/amlogic/Kconfig | 12 - drivers/phy/amlogic/Makefile | 1 - drivers/phy/amlogic/phy-meson-gxl-usb3.c | 283 ------------------ 4 files changed, 327 deletions(-) delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt delete mode 100644 drivers/phy/amlogic/phy-meson-gxl-usb3.c
Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt deleted +0 -31
@@ -1,31 +0,0 @@ -* Amlogic Meson GXL and GXM USB3 PHY and OTG detection binding - -Required properties: -- compatible: Should be "amlogic,meson-gxl-usb3-phy" -- #phys-cells: must be 0 (see phy-bindings.txt in this directory) -- reg: The base address and length of the registers -- interrupts: the interrupt specifier for the OTG detection -- clocks: phandles to the clocks for - - the USB3 PHY - - and peripheral mode/OTG detection -- clock-names: must contain "phy" and "peripheral" -- resets: phandle to the reset lines for: - - the USB3 PHY and - - peripheral mode/OTG detection -- reset-names: must contain "phy" and "peripheral" - -Optional properties: -- phy-supply: see phy-bindings.txt in this directory - - -Example: - usb3_phy0: phy@78080 { - compatible = "amlogic,meson-gxl-usb3-phy"; - #phy-cells = <0>; - reg = <0x0 0x78080 0x0 0x20>; - interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clkc CLKID_USB_OTG>, <&clkc_AO CLKID_AO_CEC_32K>; - clock-names = "phy", "peripheral"; - resets = <&reset RESET_USB_OTG>, <&reset RESET_USB_OTG>; - reset-names = "phy", "peripheral"; - };
drivers/phy/amlogic/Kconfig +0 -12
@@ -26,18 +26,6 @@ config PHY_MESON_GXL_USB2 GXL and GXM SoCs. If unsure, say N. -config PHY_MESON_GXL_USB3 - tristate "Meson GXL and GXM USB3 PHY drivers" - default ARCH_MESON - depends on OF && (ARCH_MESON || COMPILE_TEST) - depends on USB_SUPPORT - select GENERIC_PHY - select REGMAP_MMIO - help - Enable this to support the Meson USB3 PHY and OTG detection - IP block found in Meson GXL and GXM SoCs. - If unsure, say N. - config PHY_MESON_G12A_USB2 tristate "Meson G12A USB2 PHY driver" default ARCH_MESON
drivers/phy/amlogic/Makefile +0 -1
@@ -2,5 +2,4 @@ obj-$(CONFIG_PHY_MESON8B_USB2) += phy-meson8b-usb2.o obj-$(CONFIG_PHY_MESON_GXL_USB2) += phy-meson-gxl-usb2.o obj-$(CONFIG_PHY_MESON_G12A_USB2) += phy-meson-g12a-usb2.o -obj-$(CONFIG_PHY_MESON_GXL_USB3) += phy-meson-gxl-usb3.o obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o
drivers/phy/amlogic/phy-meson-gxl-usb3.c deleted +0 -283
283 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v2 12/14 usb: dwc3: of-simple: remove Amlogic GXL and AXG compatibles
In reply to Neil ArmstrongFrom: Martin Blumenstingl <[email protected]>
There is now a dedicated driver for these SoCs making the old compatible obsolete.
--- drivers/usb/dwc3/dwc3-of-simple.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-)
drivers/usb/dwc3/dwc3-of-simple.c +6 -24
@@ -27,7 +27,6 @@ struct dwc3_of_simple {struct clk_bulk_data *clks;int num_clocks;struct reset_control *resets; -bool pulse_resets;bool need_reset; };
@@ -38,7 +37,6 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;int ret; -bool shared_resets = false; simple =devm_kzalloc (dev,sizeof (*simple),GFP_KERNEL );if (!simple)
@@ -54,13 +52,7 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)if (of_device_is_compatible (np,"rockchip,rk3399-dwc3" )) simple->need_reset = true; -if (of_device_is_compatible (np,"amlogic,meson-axg-dwc3" ) || -of_device_is_compatible (np,"amlogic,meson-gxl-dwc3" )) { - shared_resets = true; - simple->pulse_resets = true; - } - - simple->resets =of_reset_control_array_get (np, shared_resets, true, + simple->resets =of_reset_control_array_get (np, false, true, true);if (IS_ERR (simple->resets)) { ret =PTR_ERR (simple->resets);
@@ -68,15 +60,9 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)return ret; } -if (simple->pulse_resets) { - ret =reset_control_reset (simple->resets); -if (ret) - goto err_resetc_put; - }else { - ret =reset_control_deassert (simple->resets); -if (ret) - goto err_resetc_put; - } + ret =reset_control_deassert (simple->resets); +if (ret) + goto err_resetc_put; ret =clk_bulk_get_all (simple->dev, &simple->clks);if (ret <0 )
@@ -102,8 +88,7 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)clk_bulk_put_all (simple->num_clocks, simple->clks); err_resetc_assert: -if (!simple->pulse_resets) -reset_control_assert (simple->resets); +reset_control_assert (simple->resets); err_resetc_put:reset_control_put (simple->resets);
@@ -118,8 +103,7 @@ static void __dwc3_of_simple_teardown(struct dwc3_of_simple *simple)clk_bulk_put_all (simple->num_clocks, simple->clks); simple->num_clocks =0 ; -if (!simple->pulse_resets) -reset_control_assert (simple->resets); +reset_control_assert (simple->resets);reset_control_put (simple->resets);
@@ -191,8 +175,6 @@ static const struct of_device_id of_dwc3_simple_match[] = { { .compatible = "xlnx,zynqmp-dwc3" }, { .compatible = "cavium,octeon-7130-usb-uctl" }, { .compatible = "sprd,sc9860-dwc3" }, - { .compatible = "amlogic,meson-axg-dwc3" }, - { .compatible = "amlogic,meson-gxl-dwc3" }, { .compatible = "allwinner,sun50i-h6-dwc3" }, {/* Sentinel */ } };
Signature · 1 line
2.22.0
PATCH v2 13/14 doc: dt: bindings: usb: dwc3: remove amlogic compatible entries
In reply to Neil Armstrong--- Documentation/devicetree/bindings/usb/dwc3.txt | 2 -- 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/usb/dwc3.txt +0 -2
@@ -14,8 +14,6 @@ Required properties: Exception for clocks: clocks are optional if the parent node (i.e. glue-layer) is compatible to one of the following: - "amlogic,meson-axg-dwc3" - "amlogic,meson-gxl-dwc3" "cavium,octeon-7130-usb-uctl" "qcom,dwc3" "samsung,exynos5250-dwusb3"
Signature · 1 line
2.22.0
Re: [PATCH v2 13/14] doc: dt: bindings: usb: dwc3: remove amlogic compatible entries
Quoted 5 lines · Neil Armstrong
Signed-off-by Neil Armstrong <[email protected]>--- Documentation/devicetree/bindings/usb/dwc3.txt | 2 -- 1 file changed, 2 deletions(-)
PATCH v2 14/14 dt-bindings: usb: dwc3: remove old DWC3 wrapper
In reply to Neil ArmstrongFrom: Martin Blumenstingl <[email protected]>
There is now an updated bindings for these SoCs making the old compatible obsolete.
--- .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt
Documentation/devicetree/bindings/usb/amlogic,dwc3.txt deleted +0 -42
@@ -1,42 +0,0 @@ -Amlogic Meson GX DWC3 USB SoC controller - -Required properties: -- compatible: depending on the SoC this should contain one of: - * amlogic,meson-axg-dwc3 - * amlogic,meson-gxl-dwc3 -- clocks: a handle for the "USB general" clock -- clock-names: must be "usb_general" -- resets: a handle for the shared "USB OTG" reset line -- reset-names: must be "usb_otg" - -Required child node: -A child node must exist to represent the core DWC3 IP block. The name of -the node is not important. The content of the node is defined in dwc3.txt. - -PHY documentation is provided in the following places: -- Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt -- Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt - -Example device nodes: - usb0: usb@ff500000 { - compatible = "amlogic,meson-axg-dwc3"; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - clocks = <&clkc CLKID_USB>; - clock-names = "usb_general"; - resets = <&reset RESET_USB_OTG>; - reset-names = "usb_otg"; - - dwc3: dwc3@ff500000 { - compatible = "snps,dwc3"; - reg = <0x0 0xff500000 0x0 0x100000>; - interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; - dr_mode = "host"; - maximum-speed = "high-speed"; - snps,dis_u2_susphy_quirk; - phys = <&usb3_phy>, <&usb2_phy0>; - phy-names = "usb2-phy", "usb3-phy"; - }; - };
Signature · 1 line
2.22.0
Re: [PATCH v2 14/14] dt-bindings: usb: dwc3: remove old DWC3 wrapper
Quoted 5 lines · Neil Armstrong
From: Martin Blumenstingl <[email protected]>
There is now an updated bindings for these SoCs making the old compatible obsolete.
Quoted 7 lines
Signed-off-by Martin Blumenstingl <[email protected]>Signed-off-by Neil Armstrong <[email protected]>--- .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt
Hi,
Quoted 33 lines · Neil Armstrong
The USB support was initialy done with a set of PHYs and dwc3-of-simple because the architecture of the USB complex was not understood correctly at the time (and proper documentation was missing...).
But with the G12A family, the USB complex was correctly understood and implemented correctly.
But seems the G12A architecture was derived for the GXL USB architecture, with minor differences and looks we can share most of the USB DWC3 glue driver.This patchset refactors and adds callbacks to handle the architecture difference while keeping the main code shared.
The main difference is that on GXL/GXM the USB2 PHY control registers are mixed with the PHY registers (we already handle correctly), and the GLUE registers are allmost (99%) the same as G12A.
But, the GXL/GXM HW is buggy, here are the quirks :
- for the DWC2 controller to reset correctly, the GLUE mux must be switched to peripheral when the DWC2 controller probes. For now it's handled by simply switching to device when probing the subnodes, but it may be not enough
- when manually switching from Host to Device when the USB port is not populated (should not happen with proper Micro-USB/USB-C OTG switch), it makes the DWC3 to crash. The only way to avoid that is to use the Host Disconnect bit to disconnect the DWC3 controller from the port, but we can't recover the Host functionnality unless resetting the DWC3 controller. This bit is set when only manual switch is done, and a warning is printed on manual switching.The patches 1-9 should be applied first, then either waiting the next release or if the usb maintainer can provide us a stable tag, we can use it to merge the DT and bindings.
Quoted 6 lines
Changes since v1 at [1]:
- Fixed DT bindings to take in account usb2-phy2 on GXM
- Added comment in patch2
- Fixed patch 5 and moved fix out
- Collected tags
- Lower DT patch changes, switch p20x-q20x port B as OTG by default
patches 1-6 are applied to my testing/next
Signature · 1 line
balbi
Quoted 37 lines · Felipe Balbi
Hi,
Quoted 33 lines · Neil Armstrong
The USB support was initialy done with a set of PHYs and dwc3-of-simple because the architecture of the USB complex was not understood correctly at the time (and proper documentation was missing...).
But with the G12A family, the USB complex was correctly understood and implemented correctly.
But seems the G12A architecture was derived for the GXL USB architecture, with minor differences and looks we can share most of the USB DWC3 glue driver.This patchset refactors and adds callbacks to handle the architecture difference while keeping the main code shared.
The main difference is that on GXL/GXM the USB2 PHY control registers are mixed with the PHY registers (we already handle correctly), and the GLUE registers are allmost (99%) the same as G12A.
But, the GXL/GXM HW is buggy, here are the quirks :
- for the DWC2 controller to reset correctly, the GLUE mux must be switched to peripheral when the DWC2 controller probes. For now it's handled by simply switching to device when probing the subnodes, but it may be not enough
- when manually switching from Host to Device when the USB port is not populated (should not happen with proper Micro-USB/USB-C OTG switch), it makes the DWC3 to crash. The only way to avoid that is to use the Host Disconnect bit to disconnect the DWC3 controller from the port, but we can't recover the Host functionnality unless resetting the DWC3 controller. This bit is set when only manual switch is done, and a warning is printed on manual switching.The patches 1-9 should be applied first, then either waiting the next release or if the usb maintainer can provide us a stable tag, we can use it to merge the DT and bindings.
Quoted 9 lines
Quoted 6 lines
Changes since v1 at [1]:
- Fixed DT bindings to take in account usb2-phy2 on GXM
- Added comment in patch2
- Fixed patch 5 and moved fix out
- Collected tags
- Lower DT patch changes, switch p20x-q20x port B as OTG by defaultpatches 1-6 are applied to my testing/next
Thanks !
Neil