* [PATCH 0/2] usb: dwc3: add driver for T-HEAD TH1520 SoC @ 2023-09-27 16:42 Jisheng Zhang 2023-09-27 16:42 ` [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller Jisheng Zhang 2023-09-27 16:42 ` [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver Jisheng Zhang 0 siblings, 2 replies; 10+ messages in thread From: Jisheng Zhang @ 2023-09-27 16:42 UTC (permalink / raw) To: Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv Add the usb driver support for T-HEAD TH1520 SoC. Since the clk part isn't mainlined, so SoC dts(i) changes are not included in this series. However, it can be tested by using fixed-clock. Jisheng Zhang (2): dt-bindings: usb: Add T-HEAD TH1520 USB controller usb: dwc3: add T-HEAD TH1520 usb driver .../bindings/usb/thead,th1520-usb.yaml | 73 +++++++++++ MAINTAINERS | 1 + drivers/usb/dwc3/Kconfig | 9 ++ drivers/usb/dwc3/Makefile | 1 + drivers/usb/dwc3/dwc3-thead.c | 119 ++++++++++++++++++ 5 files changed, 203 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml create mode 100644 drivers/usb/dwc3/dwc3-thead.c -- 2.40.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller 2023-09-27 16:42 [PATCH 0/2] usb: dwc3: add driver for T-HEAD TH1520 SoC Jisheng Zhang @ 2023-09-27 16:42 ` Jisheng Zhang 2023-09-27 20:00 ` Samuel Holland ` (2 more replies) 2023-09-27 16:42 ` [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver Jisheng Zhang 1 sibling, 3 replies; 10+ messages in thread From: Jisheng Zhang @ 2023-09-27 16:42 UTC (permalink / raw) To: Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv T-HEAD TH1520 platform's USB has a wrapper module around the DesignWare USB3 DRD controller. Add binding information doc for it. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- .../bindings/usb/thead,th1520-usb.yaml | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml diff --git a/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml b/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml new file mode 100644 index 000000000000..afb618eb5013 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml @@ -0,0 +1,73 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/thead,th1520-usb.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: T-HEAD TH1520 DWC3 USB Controller Glue + +maintainers: + - Jisheng Zhang <jszhang@kernel.org> + +properties: + compatible: + const: thead,th1520-usb + + reg: + maxItems: 1 + + clocks: + maxItems: 4 + + clock-names: + items: + - const: ref + - const: bus_early + - const: phy + - const: suspend + + ranges: true + + '#address-cells': + enum: [ 1, 2 ] + + '#size-cells': + enum: [ 1, 2 ] + +# Required child node: + +patternProperties: + "^usb@[0-9a-f]+$": + $ref: snps,dwc3.yaml# + +required: + - compatible + - reg + - clocks + - clock-names + - ranges + +additionalProperties: false + +examples: + - | + + usb { + compatible = "thead,th1520-usb"; + reg = <0xec03f000 0x1000>; + clocks = <&clk 1>, + <&clk 2>, + <&clk 3>, + <&clk 4>; + clock-names = "ref", "bus_early", "phy", "suspend"; + ranges; + #address-cells = <1>; + #size-cells = <1>; + + usb@e7040000 { + compatible = "snps,dwc3"; + reg = <0xe7040000 0x10000>; + interrupts = <68>; + dr_mode = "host"; + }; + }; -- 2.40.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller 2023-09-27 16:42 ` [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller Jisheng Zhang @ 2023-09-27 20:00 ` Samuel Holland 2023-10-04 16:32 ` Jisheng Zhang 2023-09-28 5:21 ` Krzysztof Kozlowski 2023-09-28 14:47 ` Rob Herring 2 siblings, 1 reply; 10+ messages in thread From: Samuel Holland @ 2023-09-27 20:00 UTC (permalink / raw) To: Jisheng Zhang Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv, Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen On 2023-09-27 11:42 AM, Jisheng Zhang wrote: > T-HEAD TH1520 platform's USB has a wrapper module around > the DesignWare USB3 DRD controller. Add binding information doc for > it. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > .../bindings/usb/thead,th1520-usb.yaml | 73 +++++++++++++++++++ > 1 file changed, 73 insertions(+) > create mode 100644 Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > > diff --git a/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml b/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > new file mode 100644 > index 000000000000..afb618eb5013 > --- /dev/null > +++ b/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > @@ -0,0 +1,73 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/usb/thead,th1520-usb.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: T-HEAD TH1520 DWC3 USB Controller Glue > + > +maintainers: > + - Jisheng Zhang <jszhang@kernel.org> > + > +properties: > + compatible: > + const: thead,th1520-usb > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 4 > + > + clock-names: > + items: > + - const: ref > + - const: bus_early > + - const: phy > + - const: suspend Except for "phy", these clocks are already documented in snps,dwc3.yaml. Are they necessary for the glue/PHY, or do they belong only in the controller node? They are not used by the driver in patch 2. Also, the PHY clock probably belongs with the PHY node. > + > + ranges: true > + > + '#address-cells': > + enum: [ 1, 2 ] > + > + '#size-cells': > + enum: [ 1, 2 ] > + > +# Required child node: > + > +patternProperties: > + "^usb@[0-9a-f]+$": > + $ref: snps,dwc3.yaml# > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - ranges > + > +additionalProperties: false The driver in patch 2 uses the thead,misc-sysreg and vbus-supply properties, neither of which is documented here. Also, depending on the other bindings, the VBUS supply should be referenced from the USB PHY or connector node, not here. Regards, Samuel > +examples: > + - | > + > + usb { > + compatible = "thead,th1520-usb"; > + reg = <0xec03f000 0x1000>; > + clocks = <&clk 1>, > + <&clk 2>, > + <&clk 3>, > + <&clk 4>; > + clock-names = "ref", "bus_early", "phy", "suspend"; > + ranges; > + #address-cells = <1>; > + #size-cells = <1>; > + > + usb@e7040000 { > + compatible = "snps,dwc3"; > + reg = <0xe7040000 0x10000>; > + interrupts = <68>; > + dr_mode = "host"; > + }; > + }; ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller 2023-09-27 20:00 ` Samuel Holland @ 2023-10-04 16:32 ` Jisheng Zhang 0 siblings, 0 replies; 10+ messages in thread From: Jisheng Zhang @ 2023-10-04 16:32 UTC (permalink / raw) To: Samuel Holland Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv, Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen On Wed, Sep 27, 2023 at 03:00:59PM -0500, Samuel Holland wrote: > On 2023-09-27 11:42 AM, Jisheng Zhang wrote: > > T-HEAD TH1520 platform's USB has a wrapper module around > > the DesignWare USB3 DRD controller. Add binding information doc for > > it. > > > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > > --- > > .../bindings/usb/thead,th1520-usb.yaml | 73 +++++++++++++++++++ > > 1 file changed, 73 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > > > > diff --git a/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml b/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > > new file mode 100644 > > index 000000000000..afb618eb5013 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > > @@ -0,0 +1,73 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/usb/thead,th1520-usb.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: T-HEAD TH1520 DWC3 USB Controller Glue > > + > > +maintainers: > > + - Jisheng Zhang <jszhang@kernel.org> > > + > > +properties: > > + compatible: > > + const: thead,th1520-usb > > + > > + reg: > > + maxItems: 1 > > + > > + clocks: > > + maxItems: 4 > > + > > + clock-names: > > + items: > > + - const: ref > > + - const: bus_early > > + - const: phy > > + - const: suspend > > Except for "phy", these clocks are already documented in snps,dwc3.yaml. Are > they necessary for the glue/PHY, or do they belong only in the controller node? Hi Samuel, Enabling ref, bus_early clks are necessary for the glue layer, because we program the glue registers before calling of_platform_populate() > They are not used by the driver in patch 2. Also, the PHY clock probably belongs > with the PHY node. Except enabling the phy clk, we don't need to touch the phy, so I'm not sure how to handle this if we have a dedicated phy driver thus a phy node. or use the usb-nop-xceiv? Thanks > > > + > > + ranges: true > > + > > + '#address-cells': > > + enum: [ 1, 2 ] > > + > > + '#size-cells': > > + enum: [ 1, 2 ] > > + > > +# Required child node: > > + > > +patternProperties: > > + "^usb@[0-9a-f]+$": > > + $ref: snps,dwc3.yaml# > > + > > +required: > > + - compatible > > + - reg > > + - clocks > > + - clock-names > > + - ranges > > + > > +additionalProperties: false > > The driver in patch 2 uses the thead,misc-sysreg and vbus-supply properties, > neither of which is documented here. Also, depending on the other bindings, the > VBUS supply should be referenced from the USB PHY or connector node, not here. > > Regards, > Samuel > > > +examples: > > + - | > > + > > + usb { > > + compatible = "thead,th1520-usb"; > > + reg = <0xec03f000 0x1000>; > > + clocks = <&clk 1>, > > + <&clk 2>, > > + <&clk 3>, > > + <&clk 4>; > > + clock-names = "ref", "bus_early", "phy", "suspend"; > > + ranges; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + > > + usb@e7040000 { > > + compatible = "snps,dwc3"; > > + reg = <0xe7040000 0x10000>; > > + interrupts = <68>; > > + dr_mode = "host"; > > + }; > > + }; > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller 2023-09-27 16:42 ` [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller Jisheng Zhang 2023-09-27 20:00 ` Samuel Holland @ 2023-09-28 5:21 ` Krzysztof Kozlowski 2023-09-30 15:52 ` Krzysztof Kozlowski 2023-09-28 14:47 ` Rob Herring 2 siblings, 1 reply; 10+ messages in thread From: Krzysztof Kozlowski @ 2023-09-28 5:21 UTC (permalink / raw) To: Jisheng Zhang, Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv On 27/09/2023 18:42, Jisheng Zhang wrote: > T-HEAD TH1520 platform's USB has a wrapper module around > the DesignWare USB3 DRD controller. Add binding information doc for > it. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- ... > + > + '#address-cells': > + enum: [ 1, 2 ] > + > + '#size-cells': > + enum: [ 1, 2 ] > + > +# Required child node: > + > +patternProperties: > + "^usb@[0-9a-f]+$": > + $ref: snps,dwc3.yaml# > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - ranges > + > +additionalProperties: false > + > +examples: > + - | > + Drop stray blank line > + usb { > + compatible = "thead,th1520-usb"; Use 4 spaces for example indentation. > + reg = <0xec03f000 0x1000>; > + clocks = <&clk 1>, > + <&clk 2>, > + <&clk 3>, > + <&clk 4>; > + clock-names = "ref", "bus_early", "phy", "suspend"; > + ranges; Are you sure you do not have W=1 warnings in DTS? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller 2023-09-28 5:21 ` Krzysztof Kozlowski @ 2023-09-30 15:52 ` Krzysztof Kozlowski 0 siblings, 0 replies; 10+ messages in thread From: Krzysztof Kozlowski @ 2023-09-30 15:52 UTC (permalink / raw) To: Jisheng Zhang, Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv On 28/09/2023 07:21, Krzysztof Kozlowski wrote: > Drop stray blank line > >> + usb { >> + compatible = "thead,th1520-usb"; > > Use 4 spaces for example indentation. > >> + reg = <0xec03f000 0x1000>; >> + clocks = <&clk 1>, >> + <&clk 2>, >> + <&clk 3>, >> + <&clk 4>; >> + clock-names = "ref", "bus_early", "phy", "suspend"; >> + ranges; > > Are you sure you do not have W=1 warnings in DTS? Ah, as we can see from bot's report, you have warnings. Please test your DTS with dtbs_check W=1 and fix all (*ALL*) warnings. This looks like missing proper addresses in the ranges. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller 2023-09-27 16:42 ` [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller Jisheng Zhang 2023-09-27 20:00 ` Samuel Holland 2023-09-28 5:21 ` Krzysztof Kozlowski @ 2023-09-28 14:47 ` Rob Herring 2 siblings, 0 replies; 10+ messages in thread From: Rob Herring @ 2023-09-28 14:47 UTC (permalink / raw) To: Jisheng Zhang Cc: linux-riscv, Krzysztof Kozlowski, Rob Herring, Thinh Nguyen, Greg Kroah-Hartman, Fu Wei, Guo Ren, devicetree, linux-kernel, linux-usb, Conor Dooley On Thu, 28 Sep 2023 00:42:21 +0800, Jisheng Zhang wrote: > T-HEAD TH1520 platform's USB has a wrapper module around > the DesignWare USB3 DRD controller. Add binding information doc for > it. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > .../bindings/usb/thead,th1520-usb.yaml | 73 +++++++++++++++++++ > 1 file changed, 73 insertions(+) > create mode 100644 Documentation/devicetree/bindings/usb/thead,th1520-usb.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Documentation/devicetree/bindings/usb/thead,th1520-usb.example.dts:25.13-43.11: Warning (unit_address_vs_reg): /example-0/usb: node has a reg or ranges property, but no unit name doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20230927164222.3505-2-jszhang@kernel.org The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver 2023-09-27 16:42 [PATCH 0/2] usb: dwc3: add driver for T-HEAD TH1520 SoC Jisheng Zhang 2023-09-27 16:42 ` [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller Jisheng Zhang @ 2023-09-27 16:42 ` Jisheng Zhang 2023-09-27 20:06 ` Samuel Holland 2023-09-28 5:21 ` Krzysztof Kozlowski 1 sibling, 2 replies; 10+ messages in thread From: Jisheng Zhang @ 2023-09-27 16:42 UTC (permalink / raw) To: Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv Adds TH1520 Glue layer to support USB controller on T-HEAD TH1520 SoC. There is a DesignWare USB3 DRD core in TH1520 SoCs, the dwc3 core is the child of this USB wrapper module device. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- MAINTAINERS | 1 + drivers/usb/dwc3/Kconfig | 9 +++ drivers/usb/dwc3/Makefile | 1 + drivers/usb/dwc3/dwc3-thead.c | 119 ++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+) create mode 100644 drivers/usb/dwc3/dwc3-thead.c diff --git a/MAINTAINERS b/MAINTAINERS index 90f13281d297..d55e40060c46 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18481,6 +18481,7 @@ M: Fu Wei <wefu@redhat.com> L: linux-riscv@lists.infradead.org S: Maintained F: arch/riscv/boot/dts/thead/ +F: drivers/usb/dwc3/dwc3-thead.c RNBD BLOCK DRIVERS M: Md. Haris Iqbal <haris.iqbal@ionos.com> diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 98efcbb76c88..1b02f4f55b47 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -178,4 +178,13 @@ config USB_DWC3_OCTEON Only the host mode is currently supported. Say 'Y' or 'M' here if you have one such device. +config USB_DWC3_THEAD + tristate "T-HEAD Platform" + depends on ARCH_THEAD || COMPILE_TEST + default USB_DWC3 + help + Support T-HEAD platform with DesignWare Core USB3 IP. + Only the host mode is currently supported. + Say 'Y' or 'M' here if you have one such device. + endif diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index fe1493d4bbe5..9523a51dd279 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -55,3 +55,4 @@ obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o obj-$(CONFIG_USB_DWC3_IMX8MP) += dwc3-imx8mp.o obj-$(CONFIG_USB_DWC3_XILINX) += dwc3-xilinx.o obj-$(CONFIG_USB_DWC3_OCTEON) += dwc3-octeon.o +obj-$(CONFIG_USB_DWC3_THEAD) += dwc3-thead.o diff --git a/drivers/usb/dwc3/dwc3-thead.c b/drivers/usb/dwc3/dwc3-thead.c new file mode 100644 index 000000000000..999b1e319c72 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-thead.c @@ -0,0 +1,119 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dwc3-thead.c - T-HEAD platform specific glue layer + * + * Inspired by dwc3-of-simple.c + * + * Copyright (C) 2021 Alibaba Group Holding Limited. + * Copyright (C) 2023 Jisheng Zhang <jszhang@kernel.org> + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + */ + +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include "core.h" + +#define USB_SSP_EN 0x34 +#define REF_SSP_EN BIT(0) +#define USB_SYS 0x3c +#define COMMONONN BIT(0) + +#define USB3_DRD_SWRST 0x14 +#define USB3_DRD_PRST BIT(0) +#define USB3_DRD_PHYRST BIT(1) +#define USB3_DRD_VCCRST BIT(2) +#define USB3_DRD_RSTMASK (USB3_DRD_PRST | USB3_DRD_PHYRST | USB3_DRD_VCCRST) + +struct dwc3_thead { + void __iomem *base; + struct regmap *misc_sysreg; + struct regulator *vbus; +}; + +static void dwc3_thead_optimize_power(struct dwc3_thead *thead) +{ + u32 val; + + /* config usb top within USB ctrl & PHY reset */ + regmap_update_bits(thead->misc_sysreg, USB3_DRD_SWRST, + USB3_DRD_RSTMASK, USB3_DRD_PRST); + + /* + * dwc reg also need to be configed to save power + * 1. set USB_SYS[COMMONONN] + * 2. set DWC3_GCTL[SOFITPSYNC](done by core.c) + * 3. set GUSB3PIPECTL[SUSPENDEN] (done by core.c) + */ + val = readl(thead->base + USB_SYS); + val |= COMMONONN; + writel(val, thead->base + USB_SYS); + val = readl(thead->base + USB_SSP_EN); + val |= REF_SSP_EN; + writel(val, thead->base + USB_SSP_EN); + + regmap_update_bits(thead->misc_sysreg, USB3_DRD_SWRST, + USB3_DRD_RSTMASK, USB3_DRD_RSTMASK); +} + +static int dwc3_thead_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct dwc3_thead *thead; + int ret; + + thead = devm_kzalloc(&pdev->dev, sizeof(*thead), GFP_KERNEL); + if (!thead) + return -ENOMEM; + + platform_set_drvdata(pdev, thead); + + ret = devm_regulator_get_enable_optional(dev, "vbus"); + if (ret < 0 && ret != -ENODEV) + return ret; + + thead->misc_sysreg = syscon_regmap_lookup_by_phandle(np, "thead,misc-sysreg"); + if (IS_ERR(thead->misc_sysreg)) + return PTR_ERR(thead->misc_sysreg); + + thead->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(thead->base)) + return PTR_ERR(thead->base); + + dwc3_thead_optimize_power(thead); + + return of_platform_populate(np, NULL, NULL, dev); +} + +static void dwc3_thead_remove(struct platform_device *pdev) +{ + of_platform_depopulate(&pdev->dev); +} + +static const struct of_device_id dwc3_thead_of_match[] = { + { .compatible = "thead,th1520-usb" }, + { }, +}; +MODULE_DEVICE_TABLE(of, dwc3_thead_of_match); + +static struct platform_driver dwc3_thead_driver = { + .probe = dwc3_thead_probe, + .remove_new = dwc3_thead_remove, + .driver = { + .name = "dwc3-thead", + .of_match_table = dwc3_thead_of_match, + }, +}; +module_platform_driver(dwc3_thead_driver); + +MODULE_ALIAS("platform:dwc3-thead"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare DWC3 T-HEAD Glue Driver"); +MODULE_AUTHOR("Jisheng Zhang <jszhang@kernel.org>"); -- 2.40.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver 2023-09-27 16:42 ` [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver Jisheng Zhang @ 2023-09-27 20:06 ` Samuel Holland 2023-09-28 5:21 ` Krzysztof Kozlowski 1 sibling, 0 replies; 10+ messages in thread From: Samuel Holland @ 2023-09-27 20:06 UTC (permalink / raw) To: Jisheng Zhang Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv, Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen On 2023-09-27 11:42 AM, Jisheng Zhang wrote: > Adds TH1520 Glue layer to support USB controller on T-HEAD TH1520 SoC. > There is a DesignWare USB3 DRD core in TH1520 SoCs, the dwc3 core is > the child of this USB wrapper module device. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > MAINTAINERS | 1 + > drivers/usb/dwc3/Kconfig | 9 +++ > drivers/usb/dwc3/Makefile | 1 + > drivers/usb/dwc3/dwc3-thead.c | 119 ++++++++++++++++++++++++++++++++++ > 4 files changed, 130 insertions(+) > create mode 100644 drivers/usb/dwc3/dwc3-thead.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 90f13281d297..d55e40060c46 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -18481,6 +18481,7 @@ M: Fu Wei <wefu@redhat.com> > L: linux-riscv@lists.infradead.org > S: Maintained > F: arch/riscv/boot/dts/thead/ > +F: drivers/usb/dwc3/dwc3-thead.c > > RNBD BLOCK DRIVERS > M: Md. Haris Iqbal <haris.iqbal@ionos.com> > diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig > index 98efcbb76c88..1b02f4f55b47 100644 > --- a/drivers/usb/dwc3/Kconfig > +++ b/drivers/usb/dwc3/Kconfig > @@ -178,4 +178,13 @@ config USB_DWC3_OCTEON > Only the host mode is currently supported. > Say 'Y' or 'M' here if you have one such device. > > +config USB_DWC3_THEAD > + tristate "T-HEAD Platform" > + depends on ARCH_THEAD || COMPILE_TEST > + default USB_DWC3 > + help > + Support T-HEAD platform with DesignWare Core USB3 IP. > + Only the host mode is currently supported. > + Say 'Y' or 'M' here if you have one such device. > + > endif > diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile > index fe1493d4bbe5..9523a51dd279 100644 > --- a/drivers/usb/dwc3/Makefile > +++ b/drivers/usb/dwc3/Makefile > @@ -55,3 +55,4 @@ obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o > obj-$(CONFIG_USB_DWC3_IMX8MP) += dwc3-imx8mp.o > obj-$(CONFIG_USB_DWC3_XILINX) += dwc3-xilinx.o > obj-$(CONFIG_USB_DWC3_OCTEON) += dwc3-octeon.o > +obj-$(CONFIG_USB_DWC3_THEAD) += dwc3-thead.o > diff --git a/drivers/usb/dwc3/dwc3-thead.c b/drivers/usb/dwc3/dwc3-thead.c > new file mode 100644 > index 000000000000..999b1e319c72 > --- /dev/null > +++ b/drivers/usb/dwc3/dwc3-thead.c > @@ -0,0 +1,119 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * dwc3-thead.c - T-HEAD platform specific glue layer > + * > + * Inspired by dwc3-of-simple.c > + * > + * Copyright (C) 2021 Alibaba Group Holding Limited. > + * Copyright (C) 2023 Jisheng Zhang <jszhang@kernel.org> > + * Copyright (c) 2018, The Linux Foundation. All rights reserved. > + */ > + > +#include <linux/io.h> > +#include <linux/kernel.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#include "core.h" > + > +#define USB_SSP_EN 0x34 > +#define REF_SSP_EN BIT(0) > +#define USB_SYS 0x3c > +#define COMMONONN BIT(0) > + > +#define USB3_DRD_SWRST 0x14 > +#define USB3_DRD_PRST BIT(0) > +#define USB3_DRD_PHYRST BIT(1) > +#define USB3_DRD_VCCRST BIT(2) > +#define USB3_DRD_RSTMASK (USB3_DRD_PRST | USB3_DRD_PHYRST | USB3_DRD_VCCRST) > + > +struct dwc3_thead { > + void __iomem *base; > + struct regmap *misc_sysreg; > + struct regulator *vbus; > +}; > + > +static void dwc3_thead_optimize_power(struct dwc3_thead *thead) > +{ > + u32 val; > + > + /* config usb top within USB ctrl & PHY reset */ > + regmap_update_bits(thead->misc_sysreg, USB3_DRD_SWRST, > + USB3_DRD_RSTMASK, USB3_DRD_PRST); > + > + /* > + * dwc reg also need to be configed to save power > + * 1. set USB_SYS[COMMONONN] > + * 2. set DWC3_GCTL[SOFITPSYNC](done by core.c) > + * 3. set GUSB3PIPECTL[SUSPENDEN] (done by core.c) > + */ > + val = readl(thead->base + USB_SYS); > + val |= COMMONONN; > + writel(val, thead->base + USB_SYS); > + val = readl(thead->base + USB_SSP_EN); > + val |= REF_SSP_EN; > + writel(val, thead->base + USB_SSP_EN); > + > + regmap_update_bits(thead->misc_sysreg, USB3_DRD_SWRST, > + USB3_DRD_RSTMASK, USB3_DRD_RSTMASK); > +} > + > +static int dwc3_thead_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct dwc3_thead *thead; > + int ret; > + > + thead = devm_kzalloc(&pdev->dev, sizeof(*thead), GFP_KERNEL); > + if (!thead) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, thead); No need to set driver data, since you never access it. > + > + ret = devm_regulator_get_enable_optional(dev, "vbus"); > + if (ret < 0 && ret != -ENODEV) > + return ret; If you want to ignore -ENODEV, use the non-_optional variant. > + > + thead->misc_sysreg = syscon_regmap_lookup_by_phandle(np, "thead,misc-sysreg"); > + if (IS_ERR(thead->misc_sysreg)) > + return PTR_ERR(thead->misc_sysreg); > + > + thead->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(thead->base)) > + return PTR_ERR(thead->base); > + > + dwc3_thead_optimize_power(thead); > + > + return of_platform_populate(np, NULL, NULL, dev); Using devm_of_platform_populate() will avoid the .remove_new hook. Regards, Samuel > +} > + > +static void dwc3_thead_remove(struct platform_device *pdev) > +{ > + of_platform_depopulate(&pdev->dev); > +} > + > +static const struct of_device_id dwc3_thead_of_match[] = { > + { .compatible = "thead,th1520-usb" }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, dwc3_thead_of_match); > + > +static struct platform_driver dwc3_thead_driver = { > + .probe = dwc3_thead_probe, > + .remove_new = dwc3_thead_remove, > + .driver = { > + .name = "dwc3-thead", > + .of_match_table = dwc3_thead_of_match, > + }, > +}; > +module_platform_driver(dwc3_thead_driver); > + > +MODULE_ALIAS("platform:dwc3-thead"); > +MODULE_LICENSE("GPL v2"); > +MODULE_DESCRIPTION("DesignWare DWC3 T-HEAD Glue Driver"); > +MODULE_AUTHOR("Jisheng Zhang <jszhang@kernel.org>"); ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver 2023-09-27 16:42 ` [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver Jisheng Zhang 2023-09-27 20:06 ` Samuel Holland @ 2023-09-28 5:21 ` Krzysztof Kozlowski 1 sibling, 0 replies; 10+ messages in thread From: Krzysztof Kozlowski @ 2023-09-28 5:21 UTC (permalink / raw) To: Jisheng Zhang, Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Thinh Nguyen Cc: linux-usb, devicetree, linux-kernel, Guo Ren, Fu Wei, linux-riscv On 27/09/2023 18:42, Jisheng Zhang wrote: > Adds TH1520 Glue layer to support USB controller on T-HEAD TH1520 SoC. > There is a DesignWare USB3 DRD core in TH1520 SoCs, the dwc3 core is > the child of this USB wrapper module device. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > MAINTAINERS | 1 + > drivers/usb/dwc3/Kconfig | 9 +++ > drivers/usb/dwc3/Makefile | 1 + > drivers/usb/dwc3/dwc3-thead.c | 119 ++++++++++++++++++++++++++++++++++ > 4 files changed, 130 insertions(+) > create mode 100644 drivers/usb/dwc3/dwc3-thead.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 90f13281d297..d55e40060c46 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -18481,6 +18481,7 @@ M: Fu Wei <wefu@redhat.com> > L: linux-riscv@lists.infradead.org > S: Maintained > F: arch/riscv/boot/dts/thead/ > +F: drivers/usb/dwc3/dwc3-thead.c > > RNBD BLOCK DRIVERS > M: Md. Haris Iqbal <haris.iqbal@ionos.com> > diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig > index 98efcbb76c88..1b02f4f55b47 100644 > --- a/drivers/usb/dwc3/Kconfig > +++ b/drivers/usb/dwc3/Kconfig > @@ -178,4 +178,13 @@ config USB_DWC3_OCTEON > Only the host mode is currently supported. > Say 'Y' or 'M' here if you have one such device. > > +config USB_DWC3_THEAD > + tristate "T-HEAD Platform" > + depends on ARCH_THEAD || COMPILE_TEST > + default USB_DWC3 > + help > + Support T-HEAD platform with DesignWare Core USB3 IP. > + Only the host mode is currently supported. > + Say 'Y' or 'M' here if you have one such device. > + > endif > diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile > index fe1493d4bbe5..9523a51dd279 100644 > --- a/drivers/usb/dwc3/Makefile > +++ b/drivers/usb/dwc3/Makefile > @@ -55,3 +55,4 @@ obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o > obj-$(CONFIG_USB_DWC3_IMX8MP) += dwc3-imx8mp.o > obj-$(CONFIG_USB_DWC3_XILINX) += dwc3-xilinx.o > obj-$(CONFIG_USB_DWC3_OCTEON) += dwc3-octeon.o > +obj-$(CONFIG_USB_DWC3_THEAD) += dwc3-thead.o > diff --git a/drivers/usb/dwc3/dwc3-thead.c b/drivers/usb/dwc3/dwc3-thead.c > new file mode 100644 > index 000000000000..999b1e319c72 > --- /dev/null > +++ b/drivers/usb/dwc3/dwc3-thead.c > @@ -0,0 +1,119 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * dwc3-thead.c - T-HEAD platform specific glue layer > + * > + * Inspired by dwc3-of-simple.c > + * > + * Copyright (C) 2021 Alibaba Group Holding Limited. > + * Copyright (C) 2023 Jisheng Zhang <jszhang@kernel.org> > + * Copyright (c) 2018, The Linux Foundation. All rights reserved. > + */ > + > +#include <linux/io.h> > +#include <linux/kernel.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#include "core.h" > + > +#define USB_SSP_EN 0x34 > +#define REF_SSP_EN BIT(0) > +#define USB_SYS 0x3c > +#define COMMONONN BIT(0) > + > +#define USB3_DRD_SWRST 0x14 > +#define USB3_DRD_PRST BIT(0) > +#define USB3_DRD_PHYRST BIT(1) > +#define USB3_DRD_VCCRST BIT(2) > +#define USB3_DRD_RSTMASK (USB3_DRD_PRST | USB3_DRD_PHYRST | USB3_DRD_VCCRST) > + > +struct dwc3_thead { > + void __iomem *base; > + struct regmap *misc_sysreg; > + struct regulator *vbus; > +}; > + > +static void dwc3_thead_optimize_power(struct dwc3_thead *thead) > +{ > + u32 val; > + > + /* config usb top within USB ctrl & PHY reset */ > + regmap_update_bits(thead->misc_sysreg, USB3_DRD_SWRST, > + USB3_DRD_RSTMASK, USB3_DRD_PRST); > + > + /* > + * dwc reg also need to be configed to save power > + * 1. set USB_SYS[COMMONONN] > + * 2. set DWC3_GCTL[SOFITPSYNC](done by core.c) > + * 3. set GUSB3PIPECTL[SUSPENDEN] (done by core.c) > + */ > + val = readl(thead->base + USB_SYS); > + val |= COMMONONN; > + writel(val, thead->base + USB_SYS); > + val = readl(thead->base + USB_SSP_EN); > + val |= REF_SSP_EN; > + writel(val, thead->base + USB_SSP_EN); > + > + regmap_update_bits(thead->misc_sysreg, USB3_DRD_SWRST, > + USB3_DRD_RSTMASK, USB3_DRD_RSTMASK); > +} > + > +static int dwc3_thead_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct dwc3_thead *thead; > + int ret; > + > + thead = devm_kzalloc(&pdev->dev, sizeof(*thead), GFP_KERNEL); > + if (!thead) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, thead); > + > + ret = devm_regulator_get_enable_optional(dev, "vbus"); > + if (ret < 0 && ret != -ENODEV) > + return ret; > + > + thead->misc_sysreg = syscon_regmap_lookup_by_phandle(np, "thead,misc-sysreg"); NAK. Test your DTS first. You do not have such property. > + if (IS_ERR(thead->misc_sysreg)) > + return PTR_ERR(thead->misc_sysreg); > + > + thead->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(thead->base)) > + return PTR_ERR(thead->base); > + > + dwc3_thead_optimize_power(thead); > + > + return of_platform_populate(np, NULL, NULL, dev); > +} > + > +static void dwc3_thead_remove(struct platform_device *pdev) > +{ > + of_platform_depopulate(&pdev->dev); > +} > + > +static const struct of_device_id dwc3_thead_of_match[] = { > + { .compatible = "thead,th1520-usb" }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, dwc3_thead_of_match); > + > +static struct platform_driver dwc3_thead_driver = { > + .probe = dwc3_thead_probe, > + .remove_new = dwc3_thead_remove, > + .driver = { > + .name = "dwc3-thead", > + .of_match_table = dwc3_thead_of_match, > + }, > +}; > +module_platform_driver(dwc3_thead_driver); > + > +MODULE_ALIAS("platform:dwc3-thead"); No, you do not need this. If you need, your device ID table is wrong. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-10-04 16:44 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-09-27 16:42 [PATCH 0/2] usb: dwc3: add driver for T-HEAD TH1520 SoC Jisheng Zhang 2023-09-27 16:42 ` [PATCH 1/2] dt-bindings: usb: Add T-HEAD TH1520 USB controller Jisheng Zhang 2023-09-27 20:00 ` Samuel Holland 2023-10-04 16:32 ` Jisheng Zhang 2023-09-28 5:21 ` Krzysztof Kozlowski 2023-09-30 15:52 ` Krzysztof Kozlowski 2023-09-28 14:47 ` Rob Herring 2023-09-27 16:42 ` [PATCH 2/2] usb: dwc3: add T-HEAD TH1520 usb driver Jisheng Zhang 2023-09-27 20:06 ` Samuel Holland 2023-09-28 5:21 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).