usb: dwc-meson-g12a: Add support for USB on S400 board
Subsystems (5)
v2 cover usb: dwc-meson-g12a: Add support for USB on S400 board
The Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
It needs the same init sequence as GXL & GXM, but it seems it doesn't need the host disconnect bit.
The Glue driver reuses the already implemented GXL & GXM work.
The USB2 PHY driver needs a slight tweak to keep the OTG detection working.
Changes since v1 at [1]:
- s/close from/close to/g
- collected review tags
- added small comment about phy management in patch 3
- removed status = "okay" in patch 4
- removed invalid phy-supply of phy1 in patch 5
[1] http://lore.kernel.org/r/[email protected]
Neil Armstrong (5):
phy: amlogic: phy-meson-gxl-usb2: keep ID pull-up even in Host mode
dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic AXG
Families USB Glue Bindings
usb: dwc-meson-g12a: Add support for USB on AXG SoCs
arm64: dts: meson-axg: add USB nodes
arm64: dts: meson-axg-s400: enable USB OTG
.../usb/amlogic,meson-g12a-usb-ctrl.yaml | 22 +++++++- .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 50 +++++++++++++++++++ drivers/phy/amlogic/phy-meson-gxl-usb2.c | 3 +- drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++++ 5 files changed, 97 insertions(+), 2 deletions(-)
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v2 1/5 phy: amlogic: phy-meson-gxl-usb2: keep ID pull-up even in Host mode
In order to keep OTG ID detection even when in Host mode, the ID line of the PHY (if the current phy is an OTG one) pull-up should be kept enable in both modes.
This fixes OTG switch on GXL, GXM & AXG platforms, otherwise once switched to Host, the ID detection doesn't work anymore to switch back to Device.
--- drivers/phy/amlogic/phy-meson-gxl-usb2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/phy/amlogic/phy-meson-gxl-usb2.c +2 -1
@@ -158,7 +158,8 @@ static int phy_meson_gxl_usb2_set_mode(struct phy *phy, U2P_R0_DM_PULLDOWN);regmap_update_bits (priv->regmap,U2P_R0 ,U2P_R0_DP_PULLDOWN ,U2P_R0_DP_PULLDOWN ); -regmap_update_bits (priv->regmap,U2P_R0 ,U2P_R0_ID_PULLUP ,0 ); +regmap_update_bits (priv->regmap,U2P_R0 ,U2P_R0_ID_PULLUP , +U2P_R0_ID_PULLUP );break ;case PHY_MODE_USB_DEVICE :
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v2 2/5 dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic AXG Families USB Glue Bindings
In reply to Neil ArmstrongThe Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
--- .../usb/amlogic,meson-g12a-usb-ctrl.yaml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml +21 -1
@@ -25,13 +25,14 @@ 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. + The Amlogic GXL, GXM & AXG SoCs doesn't embed an USB3 PHY. properties: compatible: enum: - amlogic,meson-gxl-usb-ctrl - amlogic,meson-gxm-usb-ctrl + - amlogic,meson-axg-usb-ctrl - amlogic,meson-g12a-usb-ctrl - amlogic,meson-a1-usb-ctrl
@@ -151,6 +152,25 @@ allOf: required: - clock-names + - if: + properties: + compatible: + enum: + - amlogic,meson-axg-usb-ctrl + + then: + properties: + phy-names: + items: + - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used + clocks: + minItems: 2 + clock-names: + items: + - const: usb_ctrl + - const: ddr + required: + - clock-names - if: properties: compatible:
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Re: [PATCH v2 2/5] dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic AXG Families USB Glue Bindings
Quoted 5 lines · Neil Armstrong
The Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
Signed-off-by Neil Armstrong <[email protected]>Reviewed-by Kevin Hilman <[email protected]>
Forgot:
Neil
Quoted 51 lines
--- .../usb/amlogic,meson-g12a-usb-ctrl.yaml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml +21
-1@@ -25,13 +25,14 @@ 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. + The Amlogic GXL, GXM & AXG SoCs doesn't embed an USB3 PHY. properties: compatible: enum: - amlogic,meson-gxl-usb-ctrl - amlogic,meson-gxm-usb-ctrl + - amlogic,meson-axg-usb-ctrl - amlogic,meson-g12a-usb-ctrl - amlogic,meson-a1-usb-ctrl@@ -151,6 +152,25 @@ allOf: required: - clock-names + - if: + properties: + compatible: + enum: + - amlogic,meson-axg-usb-ctrl + + then: + properties: + phy-names: + items: + - const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used + clocks: + minItems: 2 + clock-names: + items: + - const: usb_ctrl + - const: ddr + required: + - clock-names - if: properties: compatible:
PATCH v2 3/5 usb: dwc-meson-g12a: Add support for USB on AXG SoCs
In reply to Neil ArmstrongThe Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
It needs the same init sequence as GXL & GXM, but it seems it doesn't need the host disconnect bit.
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/usb/dwc3/dwc3-meson-g12a.c +18 -0
@@ -127,6 +127,7 @@ static const char *meson_g12a_phy_names[] = {/* * Amlogic A1 has a single physical PHY, in slot 1, but still has the * two U2 PHY controls register blocks like G12A. +* AXG has the similar scheme, thus needs the same tweak. * 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
@@ -215,6 +216,19 @@ static struct dwc3_meson_g12a_drvdata gxm_drvdata = { .usb_post_init = dwc3_meson_gxl_usb_post_init, }; +static struct dwc3_meson_g12a_drvdata axg_drvdata = { + .otg_switch_supported = true, + .clks = meson_gxl_clocks, + .num_clks =ARRAY_SIZE (meson_gxl_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_g12a_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,
@@ -930,6 +944,10 @@ static const struct of_device_id dwc3_meson_g12a_match[] = { .compatible = "amlogic,meson-gxm-usb-ctrl", .data = &gxm_drvdata, }, + { + .compatible = "amlogic,meson-axg-usb-ctrl", + .data = &axg_drvdata, + }, { .compatible = "amlogic,meson-g12a-usb-ctrl", .data = &g12a_drvdata,
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Re: [PATCH v2 3/5] usb: dwc-meson-g12a: Add support for USB on AXG SoCs
Hi Neil,
thanks for updating this patch!
Quoted 8 lines · Neil Armstrong
The Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
It needs the same init sequence as GXL & GXM, but it seems it doesn't need the host disconnect bit.
Signed-off-by Neil Armstrong <[email protected]>Reviewed-by Kevin Hilman <[email protected]>
PATCH v2 4/5 arm64: dts: meson-axg: add USB nodes
In reply to Neil ArmstrongThis adds the USB Glue node, with the USB2 & USB3 controllers along the single USB2 PHY node.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +50 -0
@@ -171,6 +171,46 @@ #size-cells = <2>; ranges; + usb: usb@ffe09080 { + compatible = "amlogic,meson-axg-usb-ctrl"; + reg = <0x0 0xffe09080 0x0 0x20>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1_DDR_BRIDGE>; + clock-names = "usb_ctrl", "ddr"; + resets = <&reset RESET_USB_OTG>; + + dr_mode = "otg"; + + phys = <&usb2_phy1>; + phy-names = "usb2-phy1"; + + dwc2: usb@ff400000 { + compatible = "amlogic,meson-g12a-usb", "snps,dwc2"; + reg = <0x0 0xff400000 0x0 0x40000>; + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clkc CLKID_USB1>; + clock-names = "otg"; + phys = <&usb2_phy1>; + dr_mode = "peripheral"; + g-rx-fifo-size = <192>; + g-np-tx-fifo-size = <128>; + g-tx-fifo-size = <128 128 16 16 16>; + }; + + dwc3: usb@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; + }; + }; + ethmac: ethernet@ff3f0000 { compatible = "amlogic,meson-axg-dwmac", "snps,dwmac-3.70a",
@@ -1734,6 +1774,16 @@ clock-names = "core", "clkin0", "clkin1"; resets = <&reset RESET_SD_EMMC_C>; }; + + usb2_phy1: phy@9020 { + compatible = "amlogic,meson-gxl-usb2-phy"; + #phy-cells = <0>; + reg = <0x0 0x9020 0x0 0x20>; + clocks = <&clkc CLKID_USB>; + clock-names = "phy"; + resets = <&reset RESET_USB_OTG>; + reset-names = "phy"; + }; }; sram: sram@fffc0000 {
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v2 5/5 arm64: dts: meson-axg-s400: enable USB OTG
In reply to Neil ArmstrongThis enables USB OTG on the S400 board.
--- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +6 -0
@@ -584,3 +584,9 @@ pinctrl-0 = <&uart_ao_a_pins>; pinctrl-names = "default"; }; + +&usb { + status = "okay"; + dr_mode = "otg"; + vbus-supply = <&usb_pwr>; +};
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Hi Felipe,
Is there anything to change in this serie ?
Thanks,
Neil
Quoted 33 lines · Neil Armstrong
The Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
It needs the same init sequence as GXL & GXM, but it seems it doesn't need the host disconnect bit.
The Glue driver reuses the already implemented GXL & GXM work.
The USB2 PHY driver needs a slight tweak to keep the OTG detection working.
Changes since v1 at [1]:
- s/close from/close to/g
- collected review tags
- added small comment about phy management in patch 3
- removed status = "okay" in patch 4
- removed invalid phy-supply of phy1 in patch 5[1] http://lore.kernel.org/r/[email protected]
Neil Armstrong (5):
phy: amlogic: phy-meson-gxl-usb2: keep ID pull-up even in Host mode
dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic AXG
Families USB Glue Bindings
usb: dwc-meson-g12a: Add support for USB on AXG SoCs
arm64: dts: meson-axg: add USB nodes
arm64: dts: meson-axg-s400: enable USB OTG.../usb/amlogic,meson-g12a-usb-ctrl.yaml | 22 +++++++- .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 50 +++++++++++++++++++ drivers/phy/amlogic/phy-meson-gxl-usb2.c | 3 +- drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++++ 5 files changed, 97 insertions(+), 2 deletions(-)
Quoted 3 lines · Neil Armstrong
Hi Felipe,
Is there anything to change in this serie ?
I've been waiting for Kishon's review of drivers/phy parts. I can take the rest, but without Kishon's ack, drivers/phy will be left out.
Signature · 1 line
balbi
Quoted 9 lines · Felipe Balbi
Quoted 3 lines · Neil Armstrong
Hi Felipe,
Is there anything to change in this serie ?
I've been waiting for Kishon's review of
drivers/phyparts. I can take the rest, but without Kishon's ack,drivers/phywill be left out.
No problem, please go ahead and take the rest, I'll re-submit the phy change again if Kishon wants some changes.
Thanks,
Neil
Hi Kevin,
Quoted 18 lines · Neil Armstrong
The Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
It needs the same init sequence as GXL & GXM, but it seems it doesn't need the host disconnect bit.
The Glue driver reuses the already implemented GXL & GXM work.
The USB2 PHY driver needs a slight tweak to keep the OTG detection working.
Changes since v1 at [1]:
- s/close from/close to/g
- collected review tags
- added small comment about phy management in patch 3
- removed status = "okay" in patch 4
- removed invalid phy-supply of phy1 in patch 5
Quoted 7 lines
Neil Armstrong (5):
phy: amlogic: phy-meson-gxl-usb2: keep ID pull-up even in Host mode
dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic AXG
Families USB Glue Bindings
usb: dwc-meson-g12a: Add support for USB on AXG SoCs
arm64: dts: meson-axg: add USB nodes
arm64: dts: meson-axg-s400: enable USB OTG
Can you pick the DT patches ?
Thanks,
Neil
Quoted 8 lines
.../usb/amlogic,meson-g12a-usb-ctrl.yaml | 22 +++++++- .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 50 +++++++++++++++++++ drivers/phy/amlogic/phy-meson-gxl-usb2.c | 3 +- drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++++ 5 files changed, 97 insertions(+), 2 deletions(-)
Kevin Hilman
maintainerQuoted 29 lines · Neil Armstrong
Hi Kevin,
Quoted 18 lines · Neil Armstrong
The Amlogic AXG is close to the GXL Glue but with a single OTG PHY.
It needs the same init sequence as GXL & GXM, but it seems it doesn't need the host disconnect bit.
The Glue driver reuses the already implemented GXL & GXM work.
The USB2 PHY driver needs a slight tweak to keep the OTG detection working.
Changes since v1 at [1]:
- s/close from/close to/g
- collected review tags
- added small comment about phy management in patch 3
- removed status = "okay" in patch 4
- removed invalid phy-supply of phy1 in patch 5Quoted 7 lines
Neil Armstrong (5):
phy: amlogic: phy-meson-gxl-usb2: keep ID pull-up even in Host mode
dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic AXG
Families USB Glue Bindings
usb: dwc-meson-g12a: Add support for USB on AXG SoCs
arm64: dts: meson-axg: add USB nodes
arm64: dts: meson-axg-s400: enable USB OTG
Quoted 1 line
Can you pick the DT patches ?
Yes, queued up.
Since we're already at -rc7, this may not make it until v5.11.
Kevin