usb: dwc3: meson: add OTG support for GXL/GXM
Subsystems (5)
v3 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 PHYs are powered up.
- 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-3 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 v2 at [2]:
- Removed first 6 applied patches
- rebased on usb/testing/next
- Fixed dwc3_meson_g12a_usb2_init in patch 1
- Fixed leftover usage of dwc3_meson_g12a_usb_init in patch 1
- Moved post_init callback before child node probe to avoid bad dwc3 init
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]
[2] 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 (4):
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 --- .../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 | 188 +++++++++++- drivers/usb/dwc3/dwc3-of-simple.c | 30 +- 24 files changed, 246 insertions(+), 442 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 · 7 lines
2.22.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 1/8 usb: dwc3: meson-g12a: refactor usb init
Refactor 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 powering up the PHYs and before probing the DWC2 and DWC3 controllers.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 52 +++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +37 -15
@@ -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 ;
@@ -247,7 +249,7 @@ static int dwc3_meson_g12a_usb2_init(struct dwc3_meson_g12a *priv)if (!strstr (priv->drvdata->phy_names[i],"usb2" ))continue ; - ret = priv->drvdata->usb2_init_phy (priv, i, priv->otg_phy_mode); + ret = priv->drvdata->usb2_init_phy (priv, i, mode);if (ret)return ret; }
@@ -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 ; }
@@ -555,6 +559,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;
@@ -622,7 +631,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;
@@ -640,6 +654,12 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) goto err_phys_exit; } +if (priv->drvdata->usb_post_init) { + ret = priv->drvdata->usb_post_init (priv); +if (ret) + goto err_phys_power; + } + ret =of_platform_populate (np,NULL ,NULL , dev);if (ret) goto err_phys_power;
@@ -741,7 +761,9 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev)reset_control_deassert (priv->reset); -dwc3_meson_g12a_usb_init (priv); + ret = priv->drvdata->usb_init (priv); +if (ret) +return ret;/* Init PHYs */ for (i =0 ; i <PHY_COUNT ; ++i) {
Signature · 1 line
2.22.0
Re: [PATCH v3 1/8] usb: dwc3: meson-g12a: refactor usb init
Quoted 9 lines · Neil Armstrong
Refactor 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_initcallback is added to setup the OTG PHY mode after powering up the PHYs and before probing the DWC2 and DWC3 controllers.Signed-off-by Neil Armstrong <[email protected]>
PATCH v3 2/8 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,
@@ -430,6 +457,13 @@ static int dwc3_meson_g12a_role_set(struct usb_role_switch *sw,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
Re: [PATCH v3 2/8] usb: dwc3: meson-g12a: support the GXL/GXM DWC3 host phy disconnect
Quoted 6 lines · Neil Armstrong
On 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.
Quoted 8 lines
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.
Signed-off-by Neil Armstrong <[email protected]>
one nit-pick below. apart from that:
[...]
drivers/usb/dwc3/dwc3-meson-g12a.c static void dwc3_meson_g12a_usb_otg_apply_mode(struct dwc3_meson_g12a *priv, · line 313
Quoted 8 lines
if (mode == PHY_MODE_USB_DEVICE) {drivers/usb/dwc3/dwc3-meson-g12a.c +7
-0+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 )));
if you have to re-send for whatever reason then I would like an empty line here to make the code easier to read
drivers/usb/dwc3/dwc3-meson-g12a.c static void dwc3_meson_g12a_usb_otg_apply_mode(struct dwc3_meson_g12a *priv, · line 326
Quoted 13 lines
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,drivers/usb/dwc3/dwc3-meson-g12a.c +6
-0@@ -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 ); + }
same as above - if you have to re-send for whatever reason then please add an empty line here
PATCH v3 3/8 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,25 @@ 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);/* * For GXL and GXM SoCs:
@@ -169,6 +187,34 @@ static int dwc3_meson_g12a_usb_init(struct dwc3_meson_g12a *priv);* reset to recover usage of the port. */ +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, +}; +static struct dwc3_meson_g12a_drvdata g12a_drvdata = { .otg_switch_supported = true, .clks = meson_g12a_clocks,
@@ -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) {
@@ -558,6 +619,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) {
@@ -598,6 +671,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;
@@ -829,6 +921,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 · 7 lines
2.22.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v3 3/8] usb: dwc3: meson-g12a: add support for GXL and GXM SoCs
Quoted 3 lines · Neil Armstrong
In order to add support for the Amlogic GXL/GXM USB Glue, this adds the corresponding :
super nit-pick: if you have to re-send this for whatever reason, then please add "new compatible strings with" before "the corresponding"
Quoted 6 lines
- PHY names
- clock names
- USB2 PHY init and mode set
- regmap setupSigned-off-by Neil Armstrong <[email protected]>
PATCH v3 4/8 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
@@ -195,8 +195,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
@@ -380,6 +380,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
@@ -169,8 +169,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 · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v3 5/8 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,7 +2,6 @@ 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 obj-$(CONFIG_PHY_MESON_AXG_PCIE) += phy-meson-axg-pcie.o obj-$(CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG) += phy-meson-axg-mipi-pcie-analog.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 v3 6/8 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 v3 7/8 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
@@ -15,8 +15,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
PATCH v3 8/8 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