* [PATCH v3 01/12] dt-bindings: phy: tegra20-usb-phy: Convert to schema
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-12 15:36 ` Rob Herring
2021-07-04 22:54 ` [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode Dmitry Osipenko
` (10 subsequent siblings)
11 siblings, 1 reply; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
Convert NVIDIA Tegra20 USB PHY binding to schema.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
.../bindings/phy/nvidia,tegra20-usb-phy.txt | 74 ----
.../bindings/phy/nvidia,tegra20-usb-phy.yaml | 357 ++++++++++++++++++
2 files changed, 357 insertions(+), 74 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
diff --git a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
deleted file mode 100644
index 1aa6f2674af5..000000000000
--- a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Tegra SOC USB PHY
-
-The device node for Tegra SOC USB PHY:
-
-Required properties :
- - compatible : For Tegra20, must contain "nvidia,tegra20-usb-phy".
- For Tegra30, must contain "nvidia,tegra30-usb-phy". Otherwise, must contain
- "nvidia,<chip>-usb-phy" plus at least one of the above, where <chip> is
- tegra114, tegra124, tegra132, or tegra210.
- - reg : Defines the following set of registers, in the order listed:
- - The PHY's own register set.
- Always present.
- - The register set of the PHY containing the UTMI pad control registers.
- Present if-and-only-if phy_type == utmi.
- - phy_type : Should be one of "utmi", "ulpi" or "hsic".
- - clocks : Defines the clocks listed in the clock-names property.
- - clock-names : The following clock names must be present:
- - reg: The clock needed to access the PHY's own registers. This is the
- associated EHCI controller's clock. Always present.
- - pll_u: PLL_U. Always present.
- - timer: The timeout clock (clk_m). Present if phy_type == utmi.
- - utmi-pads: The clock needed to access the UTMI pad control registers.
- Present if phy_type == utmi.
- - ulpi-link: The clock Tegra provides to the ULPI PHY (usually pad DAP_MCLK2
- with pad group aka "nvidia,pins" cdev2 and pin mux option config aka
- "nvidia,function" pllp_out4).
- Present if phy_type == ulpi, and ULPI link mode is in use.
- - resets : Must contain an entry for each entry in reset-names.
- See ../reset/reset.txt for details.
- - reset-names : Must include the following entries:
- - usb: The PHY's own reset signal.
- - utmi-pads: The reset of the PHY containing the chip-wide UTMI pad control
- registers. Required even if phy_type == ulpi.
-
-Required properties for phy_type == ulpi:
- - nvidia,phy-reset-gpio : The GPIO used to reset the PHY.
-
-Required PHY timing params for utmi phy, for all chips:
- - nvidia,hssync-start-delay : Number of 480 Mhz clock cycles to wait before
- start of sync launches RxActive
- - nvidia,elastic-limit : Variable FIFO Depth of elastic input store
- - nvidia,idle-wait-delay : Number of 480 Mhz clock cycles of idle to wait
- before declare IDLE.
- - nvidia,term-range-adj : Range adjusment on terminations
- - Either one of the following for HS driver output control:
- - nvidia,xcvr-setup : integer, uses the provided value.
- - nvidia,xcvr-setup-use-fuses : boolean, indicates that the value is read
- from the on-chip fuses
- If both are provided, nvidia,xcvr-setup-use-fuses takes precedence.
- - nvidia,xcvr-lsfslew : LS falling slew rate control.
- - nvidia,xcvr-lsrslew : LS rising slew rate control.
-
-Required PHY timing params for utmi phy, only on Tegra30 and above:
- - nvidia,xcvr-hsslew : HS slew rate control.
- - nvidia,hssquelch-level : HS squelch detector level.
- - nvidia,hsdiscon-level : HS disconnect detector level.
-
-Optional properties:
- - nvidia,has-legacy-mode : boolean indicates whether this controller can
- operate in legacy mode (as APX 2500 / 2600). In legacy mode some
- registers are accessed through the APB_MISC base address instead of
- the USB controller.
- - nvidia,is-wired : boolean. Indicates whether we can do certain kind of power
- optimizations for the devices that are always connected. e.g. modem.
- - dr_mode : dual role mode. Indicates the working mode for the PHY. Can be
- "host", "peripheral", or "otg". Defaults to "host" if not defined.
- host means this is a host controller
- peripheral means it is device controller
- otg means it can operate as either ("on the go")
- - nvidia,has-utmi-pad-registers : boolean indicates whether this controller
- contains the UTMI pad control registers common to all USB controllers.
-
-VBUS control (required for dr_mode == otg, optional for dr_mode == host):
- - vbus-supply: regulator for VBUS
diff --git a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
new file mode 100644
index 000000000000..593187234e6a
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
@@ -0,0 +1,357 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/phy/nvidia,tegra20-usb-phy.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NVIDIA Tegra USB PHY
+
+maintainers:
+ - Dmitry Osipenko <digetx@gmail.com>
+ - Jon Hunter <jonathanh@nvidia.com>
+ - Thierry Reding <thierry.reding@gmail.com>
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - nvidia,tegra124-usb-phy
+ - nvidia,tegra114-usb-phy
+ - enum:
+ - nvidia,tegra30-usb-phy
+ - items:
+ - enum:
+ - nvidia,tegra30-usb-phy
+ - nvidia,tegra20-usb-phy
+
+ reg:
+ minItems: 1
+ maxItems: 2
+ description: |
+ PHY0 and PHY2 share power and ground, PHY0 contains shared registers.
+ PHY0 and PHY2 must specify two register sets, where the first set is
+ PHY own registers and the second set is the PHY0 registers.
+
+ clocks:
+ anyOf:
+ - items:
+ - description: Registers clock
+ - description: Main PHY clock
+
+ - items:
+ - description: Registers clock
+ - description: Main PHY clock
+ - description: ULPI PHY clock
+
+ - items:
+ - description: Registers clock
+ - description: Main PHY clock
+ - description: UTMI pads control registers clock
+
+ - items:
+ - description: Registers clock
+ - description: Main PHY clock
+ - description: UTMI timeout clock
+ - description: UTMI pads control registers clock
+
+ clock-names:
+ oneOf:
+ - items:
+ - const: reg
+ - const: pll_u
+
+ - items:
+ - const: reg
+ - const: pll_u
+ - const: ulpi-link
+
+ - items:
+ - const: reg
+ - const: pll_u
+ - const: utmi-pads
+
+ - items:
+ - const: reg
+ - const: pll_u
+ - const: timer
+ - const: utmi-pads
+
+ resets:
+ oneOf:
+ - maxItems: 1
+ description: PHY reset
+
+ - items:
+ - description: PHY reset
+ - description: UTMI pads reset
+
+ reset-names:
+ oneOf:
+ - const: usb
+
+ - items:
+ - const: usb
+ - const: utmi-pads
+
+ "#phy-cells":
+ const: 0
+
+ phy_type:
+ $ref: /schemas/types.yaml#/definitions/string
+ enum: [utmi, ulpi, hsic]
+
+ dr_mode:
+ $ref: /schemas/types.yaml#/definitions/string
+ enum: [host, peripheral, otg]
+ default: host
+
+ vbus-supply:
+ description: Regulator controlling USB VBUS.
+
+ nvidia,has-legacy-mode:
+ description: |
+ Indicates whether this controller can operate in legacy mode
+ (as APX 2500 / 2600). In legacy mode some registers are accessed
+ through the APB_MISC base address instead of the USB controller.
+ type: boolean
+
+ nvidia,is-wired:
+ description: |
+ Indicates whether we can do certain kind of power optimizations for
+ the devices that are always connected. e.g. modem.
+ type: boolean
+
+ nvidia,has-utmi-pad-registers:
+ description: |
+ Indicates whether this controller contains the UTMI pad control
+ registers common to all USB controllers.
+ type: boolean
+
+ nvidia,hssync-start-delay:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 31
+ description: |
+ Number of 480 MHz clock cycles to wait before start of sync launches
+ RxActive.
+
+ nvidia,elastic-limit:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 31
+ description: Variable FIFO Depth of elastic input store.
+
+ nvidia,idle-wait-delay:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 31
+ description: |
+ Number of 480 MHz clock cycles of idle to wait before declare IDLE.
+
+ nvidia,term-range-adj:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 15
+ description: Range adjustment on terminations.
+
+ nvidia,xcvr-setup:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 127
+ description: Input of XCVR cell, HS driver output control.
+
+ nvidia,xcvr-setup-use-fuses:
+ description: Indicates that the value is read from the on-chip fuses.
+ type: boolean
+
+ nvidia,xcvr-lsfslew:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 3
+ description: LS falling slew rate control.
+
+ nvidia,xcvr-lsrslew:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 3
+ description: LS rising slew rate control.
+
+ nvidia,xcvr-hsslew:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 511
+ description: HS slew rate control.
+
+ nvidia,hssquelch-level:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 3
+ description: HS squelch detector level.
+
+ nvidia,hsdiscon-level:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 7
+ description: HS disconnect detector level.
+
+ nvidia,phy-reset-gpio:
+ maxItems: 1
+ description: GPIO used to reset the PHY.
+
+required:
+ - compatible
+ - reg
+ - clocks
+ - clock-names
+ - resets
+ - reset-names
+ - "#phy-cells"
+ - phy_type
+
+additionalProperties: false
+
+allOf:
+ - if:
+ properties:
+ phy_type:
+ const: utmi
+
+ then:
+ properties:
+ reg:
+ minItems: 2
+ maxItems: 2
+
+ resets:
+ maxItems: 2
+
+ reset-names:
+ maxItems: 2
+
+ required:
+ - nvidia,hssync-start-delay
+ - nvidia,elastic-limit
+ - nvidia,idle-wait-delay
+ - nvidia,term-range-adj
+ - nvidia,xcvr-lsfslew
+ - nvidia,xcvr-lsrslew
+
+ anyOf:
+ - required: ["nvidia,xcvr-setup"]
+ - required: ["nvidia,xcvr-setup-use-fuses"]
+
+ if:
+ properties:
+ compatible:
+ contains:
+ const: nvidia,tegra30-usb-phy
+
+ then:
+ properties:
+ clocks:
+ maxItems: 3
+
+ clock-names:
+ items:
+ - const: reg
+ - const: pll_u
+ - const: utmi-pads
+
+ required:
+ - nvidia,xcvr-hsslew
+ - nvidia,hssquelch-level
+ - nvidia,hsdiscon-level
+
+ else:
+ properties:
+ clocks:
+ maxItems: 4
+
+ clock-names:
+ items:
+ - const: reg
+ - const: pll_u
+ - const: timer
+ - const: utmi-pads
+
+ - if:
+ properties:
+ phy_type:
+ const: ulpi
+
+ then:
+ properties:
+ reg:
+ minItems: 1
+ maxItems: 1
+
+ clocks:
+ minItems: 2
+ maxItems: 3
+
+ clock-names:
+ minItems: 2
+ maxItems: 3
+
+ oneOf:
+ - items:
+ - const: reg
+ - const: pll_u
+
+ - items:
+ - const: reg
+ - const: pll_u
+ - const: ulpi-link
+
+ resets:
+ minItems: 1
+ maxItems: 2
+
+ reset-names:
+ minItems: 1
+ maxItems: 2
+
+examples:
+ - |
+ #include <dt-bindings/clock/tegra124-car.h>
+
+ usb-phy@7d008000 {
+ compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
+ reg = <0x7d008000 0x4000>,
+ <0x7d000000 0x4000>;
+ phy_type = "utmi";
+ clocks = <&tegra_car TEGRA124_CLK_USB3>,
+ <&tegra_car TEGRA124_CLK_PLL_U>,
+ <&tegra_car TEGRA124_CLK_USBD>;
+ clock-names = "reg", "pll_u", "utmi-pads";
+ resets = <&tegra_car 59>, <&tegra_car 22>;
+ reset-names = "usb", "utmi-pads";
+ #phy-cells = <0>;
+ nvidia,hssync-start-delay = <0>;
+ nvidia,idle-wait-delay = <17>;
+ nvidia,elastic-limit = <16>;
+ nvidia,term-range-adj = <6>;
+ nvidia,xcvr-setup = <9>;
+ nvidia,xcvr-lsfslew = <0>;
+ nvidia,xcvr-lsrslew = <3>;
+ nvidia,hssquelch-level = <2>;
+ nvidia,hsdiscon-level = <5>;
+ nvidia,xcvr-hsslew = <12>;
+ };
+
+ - |
+ #include <dt-bindings/clock/tegra20-car.h>
+
+ usb-phy@c5004000 {
+ compatible = "nvidia,tegra20-usb-phy";
+ reg = <0xc5004000 0x4000>;
+ phy_type = "ulpi";
+ clocks = <&tegra_car TEGRA20_CLK_USB2>,
+ <&tegra_car TEGRA20_CLK_PLL_U>,
+ <&tegra_car TEGRA20_CLK_CDEV2>;
+ clock-names = "reg", "pll_u", "ulpi-link";
+ resets = <&tegra_car 58>, <&tegra_car 22>;
+ reset-names = "usb", "utmi-pads";
+ #phy-cells = <0>;
+ };
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v3 01/12] dt-bindings: phy: tegra20-usb-phy: Convert to schema
2021-07-04 22:54 ` [PATCH v3 01/12] dt-bindings: phy: tegra20-usb-phy: Convert to schema Dmitry Osipenko
@ 2021-07-12 15:36 ` Rob Herring
0 siblings, 0 replies; 24+ messages in thread
From: Rob Herring @ 2021-07-12 15:36 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Sebastian Reichel, Mark Brown, Felipe Balbi, linux-usb,
Thierry Reding, Greg Kroah-Hartman, Jonathan Hunter, Peter Chen,
linux-tegra, linux-pm, linux-kernel, David Heidelberg,
Rob Herring, devicetree
On Mon, 05 Jul 2021 01:54:22 +0300, Dmitry Osipenko wrote:
> Convert NVIDIA Tegra20 USB PHY binding to schema.
>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
> .../bindings/phy/nvidia,tegra20-usb-phy.txt | 74 ----
> .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 357 ++++++++++++++++++
> 2 files changed, 357 insertions(+), 74 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
> create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 01/12] dt-bindings: phy: tegra20-usb-phy: Convert to schema Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-12 15:41 ` Rob Herring
2021-07-04 22:54 ` [PATCH v3 03/12] soc/tegra: pmc: Expose USB regmap to all SoCs Dmitry Osipenko
` (9 subsequent siblings)
11 siblings, 1 reply; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
In order to support OTG mode we need these new properties:
- interrupt
- nvidia,pmc
- nvidia,phy-instance
The nvidia,phy-instance isn't strictly needed for the OTG mode since we
know that only first controller supports it in practice, but it will be
needed in general for supporting more complex hardware features that
require knowledge of the PHY offset within common registers of the Power
Management controller (PMC).
Add the new properties to the bindings.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
.../bindings/phy/nvidia,tegra20-usb-phy.yaml | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
index 593187234e6a..a108f1552042 100644
--- a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
@@ -77,6 +77,9 @@ properties:
- const: timer
- const: utmi-pads
+ interrupts:
+ maxItems: 1
+
resets:
oneOf:
- maxItems: 1
@@ -199,6 +202,17 @@ properties:
maxItems: 1
description: GPIO used to reset the PHY.
+ nvidia,pmc:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to Power Management controller.
+
+ nvidia,phy-instance:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 0
+ maximum: 2
+ description: Unique hardware ID.
+
required:
- compatible
- reg
@@ -320,6 +334,7 @@ examples:
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000>,
<0x7d000000 0x4000>;
+ interrupts = <0 97 4>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB3>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -338,6 +353,8 @@ examples:
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance= <2>;
};
- |
@@ -346,6 +363,7 @@ examples:
usb-phy@c5004000 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5004000 0x4000>;
+ interrupts = <0 21 4>;
phy_type = "ulpi";
clocks = <&tegra_car TEGRA20_CLK_USB2>,
<&tegra_car TEGRA20_CLK_PLL_U>,
@@ -354,4 +372,6 @@ examples:
resets = <&tegra_car 58>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance= <1>;
};
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode
2021-07-04 22:54 ` [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode Dmitry Osipenko
@ 2021-07-12 15:41 ` Rob Herring
2021-07-12 23:33 ` Dmitry Osipenko
0 siblings, 1 reply; 24+ messages in thread
From: Rob Herring @ 2021-07-12 15:41 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
On Mon, Jul 05, 2021 at 01:54:23AM +0300, Dmitry Osipenko wrote:
> In order to support OTG mode we need these new properties:
>
> - interrupt
> - nvidia,pmc
> - nvidia,phy-instance
>
> The nvidia,phy-instance isn't strictly needed for the OTG mode since we
> know that only first controller supports it in practice, but it will be
> needed in general for supporting more complex hardware features that
> require knowledge of the PHY offset within common registers of the Power
> Management controller (PMC).
>
> Add the new properties to the bindings.
>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
> .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 20 +++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
> index 593187234e6a..a108f1552042 100644
> --- a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
> @@ -77,6 +77,9 @@ properties:
> - const: timer
> - const: utmi-pads
>
> + interrupts:
> + maxItems: 1
> +
> resets:
> oneOf:
> - maxItems: 1
> @@ -199,6 +202,17 @@ properties:
> maxItems: 1
> description: GPIO used to reset the PHY.
>
> + nvidia,pmc:
> + $ref: /schemas/types.yaml#/definitions/phandle
> + description:
> + Phandle to Power Management controller.
> +
Add a cell to this for the PHY reg offset and then get rid of the index:
> + nvidia,phy-instance:
> + $ref: /schemas/types.yaml#/definitions/uint32
> + minimum: 0
> + maximum: 2
> + description: Unique hardware ID.
> +
> required:
> - compatible
> - reg
> @@ -320,6 +334,7 @@ examples:
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x7d008000 0x4000>,
> <0x7d000000 0x4000>;
> + interrupts = <0 97 4>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB3>,
> <&tegra_car TEGRA124_CLK_PLL_U>,
> @@ -338,6 +353,8 @@ examples:
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> + nvidia,pmc = <&tegra_pmc>;
> + nvidia,phy-instance= <2>;
> };
>
> - |
> @@ -346,6 +363,7 @@ examples:
> usb-phy@c5004000 {
> compatible = "nvidia,tegra20-usb-phy";
> reg = <0xc5004000 0x4000>;
> + interrupts = <0 21 4>;
> phy_type = "ulpi";
> clocks = <&tegra_car TEGRA20_CLK_USB2>,
> <&tegra_car TEGRA20_CLK_PLL_U>,
> @@ -354,4 +372,6 @@ examples:
> resets = <&tegra_car 58>, <&tegra_car 22>;
> reset-names = "usb", "utmi-pads";
> #phy-cells = <0>;
> + nvidia,pmc = <&tegra_pmc>;
> + nvidia,phy-instance= <1>;
> };
> --
> 2.32.0
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode
2021-07-12 15:41 ` Rob Herring
@ 2021-07-12 23:33 ` Dmitry Osipenko
2021-07-14 23:10 ` Rob Herring
0 siblings, 1 reply; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-12 23:33 UTC (permalink / raw)
To: Rob Herring
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
12.07.2021 18:41, Rob Herring пишет:
>> + nvidia,pmc:
>> + $ref: /schemas/types.yaml#/definitions/phandle
>> + description:
>> + Phandle to Power Management controller.
>> +
> Add a cell to this for the PHY reg offset and then get rid of the index:
>
>> + nvidia,phy-instance:
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + minimum: 0
>> + maximum: 2
>> + description: Unique hardware ID.
The instance ID belongs to the USB h/w and not to PMC. It may look like
I added the ID just to get offsets within PMC, but it's not like that.
The Tegra documentation explicitly assigns unique IDs to the USB
controllers and PHYs. Hence this ID should be the property of the PHY
hardware, IMO.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode
2021-07-12 23:33 ` Dmitry Osipenko
@ 2021-07-14 23:10 ` Rob Herring
2021-07-15 15:36 ` Dmitry Osipenko
0 siblings, 1 reply; 24+ messages in thread
From: Rob Herring @ 2021-07-14 23:10 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
On Tue, Jul 13, 2021 at 02:33:11AM +0300, Dmitry Osipenko wrote:
> 12.07.2021 18:41, Rob Herring пишет:
> >> + nvidia,pmc:
> >> + $ref: /schemas/types.yaml#/definitions/phandle
> >> + description:
> >> + Phandle to Power Management controller.
> >> +
> > Add a cell to this for the PHY reg offset and then get rid of the index:
> >
> >> + nvidia,phy-instance:
> >> + $ref: /schemas/types.yaml#/definitions/uint32
> >> + minimum: 0
> >> + maximum: 2
> >> + description: Unique hardware ID.
>
> The instance ID belongs to the USB h/w and not to PMC. It may look like
> I added the ID just to get offsets within PMC, but it's not like that.
> The Tegra documentation explicitly assigns unique IDs to the USB
> controllers and PHYs. Hence this ID should be the property of the PHY
> hardware, IMO.
It looks like the use is calculating register offsets in a PMC register.
That's quite common and including that with the phandle is the preferred
way to describe it.
Lots of docs have UART1, UART2, UART3, etc. module numbering. We don't
copy that into DT.
Rob
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode
2021-07-14 23:10 ` Rob Herring
@ 2021-07-15 15:36 ` Dmitry Osipenko
0 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-15 15:36 UTC (permalink / raw)
To: Rob Herring
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
15.07.2021 02:10, Rob Herring пишет:
> On Tue, Jul 13, 2021 at 02:33:11AM +0300, Dmitry Osipenko wrote:
>> 12.07.2021 18:41, Rob Herring пишет:
>>>> + nvidia,pmc:
>>>> + $ref: /schemas/types.yaml#/definitions/phandle
>>>> + description:
>>>> + Phandle to Power Management controller.
>>>> +
>>> Add a cell to this for the PHY reg offset and then get rid of the index:
>>>
>>>> + nvidia,phy-instance:
>>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>>> + minimum: 0
>>>> + maximum: 2
>>>> + description: Unique hardware ID.
>>
>> The instance ID belongs to the USB h/w and not to PMC. It may look like
>> I added the ID just to get offsets within PMC, but it's not like that.
>> The Tegra documentation explicitly assigns unique IDs to the USB
>> controllers and PHYs. Hence this ID should be the property of the PHY
>> hardware, IMO.
>
> It looks like the use is calculating register offsets in a PMC register.
> That's quite common and including that with the phandle is the preferred
> way to describe it.
>
> Lots of docs have UART1, UART2, UART3, etc. module numbering. We don't
> copy that into DT.
Alright. Judging by downstream code, we will need to use that ID only
for PMC offsets.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 03/12] soc/tegra: pmc: Expose USB regmap to all SoCs
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 01/12] dt-bindings: phy: tegra20-usb-phy: Convert to schema Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 02/12] dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG mode Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 04/12] usb: phy: tegra: Support OTG mode programming Dmitry Osipenko
` (8 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
All Tegra SoCs prior to Tegra186 have USB power controls within the Power
Management controller. These controls need to be configured by USB driver.
Expose the regmap to these SoCs.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/soc/tegra/pmc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 1f6872f7b211..73ba4982ba6d 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -3202,7 +3202,7 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = {
.pmc_clks_data = NULL,
.num_pmc_clks = 0,
.has_blink_output = true,
- .has_usb_sleepwalk = false,
+ .has_usb_sleepwalk = true,
};
static const char * const tegra30_powergates[] = {
@@ -3263,7 +3263,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = {
.pmc_clks_data = tegra_pmc_clks_data,
.num_pmc_clks = ARRAY_SIZE(tegra_pmc_clks_data),
.has_blink_output = true,
- .has_usb_sleepwalk = false,
+ .has_usb_sleepwalk = true,
};
static const char * const tegra114_powergates[] = {
@@ -3320,7 +3320,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = {
.pmc_clks_data = tegra_pmc_clks_data,
.num_pmc_clks = ARRAY_SIZE(tegra_pmc_clks_data),
.has_blink_output = true,
- .has_usb_sleepwalk = false,
+ .has_usb_sleepwalk = true,
};
static const char * const tegra124_powergates[] = {
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 04/12] usb: phy: tegra: Support OTG mode programming
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (2 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 03/12] soc/tegra: pmc: Expose USB regmap to all SoCs Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 05/12] usb: otg-fsm: Fix hrtimer list corruption Dmitry Osipenko
` (7 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
Support programming USB PHY into OTG mode.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/usb/phy/phy-tegra-usb.c | 202 +++++++++++++++++++++++++++++-
include/linux/usb/tegra_usb_phy.h | 5 +
2 files changed, 202 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index c0f432d509aa..7d7fa5e54950 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -63,6 +63,10 @@
#define A_VBUS_VLD_WAKEUP_EN BIT(30)
#define USB_PHY_VBUS_WAKEUP_ID 0x408
+#define ID_INT_EN BIT(0)
+#define ID_CHG_DET BIT(1)
+#define VBUS_WAKEUP_INT_EN BIT(8)
+#define VBUS_WAKEUP_CHG_DET BIT(9)
#define VBUS_WAKEUP_STS BIT(10)
#define VBUS_WAKEUP_WAKEUP_EN BIT(30)
@@ -158,6 +162,10 @@
#define USB_USBMODE_HOST (3 << 0)
#define USB_USBMODE_DEVICE (2 << 0)
+#define PMC_USB_AO 0xf0
+#define VBUS_WAKEUP_PD_P0 BIT(2)
+#define ID_PD_P0 BIT(3)
+
static DEFINE_SPINLOCK(utmip_pad_lock);
static unsigned int utmip_pad_count;
@@ -533,13 +541,14 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
val &= ~USB_WAKE_ON_RESUME_EN;
writel_relaxed(val, base + USB_SUSP_CTRL);
- if (phy->mode == USB_DR_MODE_PERIPHERAL) {
+ if (phy->mode != USB_DR_MODE_HOST) {
val = readl_relaxed(base + USB_SUSP_CTRL);
val &= ~(USB_WAKE_ON_CNNT_EN_DEV | USB_WAKE_ON_DISCON_EN_DEV);
writel_relaxed(val, base + USB_SUSP_CTRL);
val = readl_relaxed(base + USB_PHY_VBUS_WAKEUP_ID);
val &= ~VBUS_WAKEUP_WAKEUP_EN;
+ val &= ~(ID_CHG_DET | VBUS_WAKEUP_CHG_DET);
writel_relaxed(val, base + USB_PHY_VBUS_WAKEUP_ID);
val = readl_relaxed(base + USB_PHY_VBUS_SENSORS);
@@ -687,9 +696,10 @@ static int utmi_phy_power_off(struct tegra_usb_phy *phy)
* Ask VBUS sensor to generate wake event once cable is
* connected.
*/
- if (phy->mode == USB_DR_MODE_PERIPHERAL) {
+ if (phy->mode != USB_DR_MODE_HOST) {
val = readl_relaxed(base + USB_PHY_VBUS_WAKEUP_ID);
val |= VBUS_WAKEUP_WAKEUP_EN;
+ val &= ~(ID_CHG_DET | VBUS_WAKEUP_CHG_DET);
writel_relaxed(val, base + USB_PHY_VBUS_WAKEUP_ID);
val = readl_relaxed(base + USB_PHY_VBUS_SENSORS);
@@ -904,26 +914,150 @@ static void tegra_usb_phy_shutdown(struct usb_phy *u_phy)
phy->freq = NULL;
}
+static irqreturn_t tegra_usb_phy_isr(int irq, void *data)
+{
+ u32 val, int_mask = ID_CHG_DET | VBUS_WAKEUP_CHG_DET;
+ struct tegra_usb_phy *phy = data;
+ void __iomem *base = phy->regs;
+
+ /*
+ * The PHY interrupt also wakes the USB controller driver since
+ * interrupt is shared. We don't do anything in the PHY driver,
+ * so just clear the interrupt.
+ */
+ val = readl_relaxed(base + USB_PHY_VBUS_WAKEUP_ID);
+ writel_relaxed(val, base + USB_PHY_VBUS_WAKEUP_ID);
+
+ return val & int_mask ? IRQ_HANDLED : IRQ_NONE;
+}
+
static int tegra_usb_phy_set_wakeup(struct usb_phy *u_phy, bool enable)
{
struct tegra_usb_phy *phy = to_tegra_usb_phy(u_phy);
+ void __iomem *base = phy->regs;
+ int ret = 0;
+ u32 val;
+
+ if (phy->wakeup_enabled && phy->mode != USB_DR_MODE_HOST &&
+ phy->irq > 0) {
+ disable_irq(phy->irq);
+
+ val = readl_relaxed(base + USB_PHY_VBUS_WAKEUP_ID);
+ val &= ~(ID_INT_EN | VBUS_WAKEUP_INT_EN);
+ writel_relaxed(val, base + USB_PHY_VBUS_WAKEUP_ID);
+
+ enable_irq(phy->irq);
+
+ free_irq(phy->irq, phy);
+
+ phy->wakeup_enabled = false;
+ }
+
+ if (enable && phy->mode != USB_DR_MODE_HOST && phy->irq > 0) {
+ ret = request_irq(phy->irq, tegra_usb_phy_isr, IRQF_SHARED,
+ dev_name(phy->u_phy.dev), phy);
+ if (!ret) {
+ disable_irq(phy->irq);
+
+ /*
+ * USB clock will be resumed once wake event will be
+ * generated. The ID-change event requires to have
+ * interrupts enabled, otherwise it won't be generated.
+ */
+ val = readl_relaxed(base + USB_PHY_VBUS_WAKEUP_ID);
+ val |= ID_INT_EN | VBUS_WAKEUP_INT_EN;
+ writel_relaxed(val, base + USB_PHY_VBUS_WAKEUP_ID);
+
+ enable_irq(phy->irq);
+ } else {
+ dev_err(phy->u_phy.dev,
+ "Failed to request interrupt: %d", ret);
+ enable = false;
+ }
+ }
phy->wakeup_enabled = enable;
- return 0;
+ return ret;
}
static int tegra_usb_phy_set_suspend(struct usb_phy *u_phy, int suspend)
{
struct tegra_usb_phy *phy = to_tegra_usb_phy(u_phy);
+ int ret;
if (WARN_ON(!phy->freq))
return -EINVAL;
+ /*
+ * PHY is sharing IRQ with the CI driver, hence here we either
+ * disable interrupt for both PHY and CI or for CI only. The
+ * interrupt needs to be disabled while hardware is reprogrammed
+ * because interrupt touches the programmed registers, and thus,
+ * there could be a race condition.
+ */
+ if (phy->irq > 0)
+ disable_irq(phy->irq);
+
if (suspend)
- return tegra_usb_phy_power_off(phy);
+ ret = tegra_usb_phy_power_off(phy);
else
- return tegra_usb_phy_power_on(phy);
+ ret = tegra_usb_phy_power_on(phy);
+
+ if (phy->irq > 0)
+ enable_irq(phy->irq);
+
+ return ret;
+}
+
+static int tegra_usb_phy_configure_pmc(struct tegra_usb_phy *phy)
+{
+ int err, val = 0;
+
+ /* older device-trees don't have PMC regmap */
+ if (!phy->pmc_regmap)
+ return 0;
+
+ /* should be initialized if regmap presents */
+ if (WARN_ON(phy->instance < 0))
+ return 0;
+
+ /*
+ * Tegra20 has a different layout of PMC USB register bits and AO is
+ * enabled by default after system reset on Tegra20, so assume nothing
+ * to do on Tegra20.
+ */
+ if (!phy->soc_config->requires_pmc_ao_power_up)
+ return 0;
+
+ /* enable VBUS wake-up detector */
+ if (phy->mode != USB_DR_MODE_HOST)
+ val |= VBUS_WAKEUP_PD_P0 << phy->instance * 4;
+
+ /* enable ID-pin ACC detector for OTG mode switching */
+ if (phy->mode == USB_DR_MODE_OTG)
+ val |= ID_PD_P0 << phy->instance * 4;
+
+ /* disable detectors to reset them */
+ err = regmap_set_bits(phy->pmc_regmap, PMC_USB_AO, val);
+ if (err) {
+ dev_err(phy->u_phy.dev, "Failed to disable PMC AO: %d\n", err);
+ return err;
+ }
+
+ usleep_range(10, 100);
+
+ /* enable detectors */
+ err = regmap_clear_bits(phy->pmc_regmap, PMC_USB_AO, val);
+ if (err) {
+ dev_err(phy->u_phy.dev, "Failed to enable PMC AO: %d\n", err);
+ return err;
+ }
+
+ /* detectors starts to work after 10ms */
+ usleep_range(10000, 15000);
+
+ return 0;
}
static int tegra_usb_phy_init(struct usb_phy *u_phy)
@@ -967,6 +1101,10 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
goto disable_vbus;
}
+ err = tegra_usb_phy_configure_pmc(phy);
+ if (err)
+ goto close_phy;
+
err = tegra_usb_phy_power_on(phy);
if (err)
goto close_phy;
@@ -1135,11 +1273,50 @@ static int utmi_phy_probe(struct tegra_usb_phy *tegra_phy,
return 0;
}
+static void tegra_usb_phy_put_pmc_device(void *dev)
+{
+ put_device(dev);
+}
+
+static struct regmap *tegra_usb_phy_get_pmc_regmap(struct device *dev)
+{
+ struct platform_device *pmc_pdev;
+ struct device_node *np;
+ struct regmap *regmap;
+ int err;
+
+ np = of_parse_phandle(dev->of_node, "nvidia,pmc", 0);
+ if (!np) {
+ dev_warn_once(dev, "nvidia,pmc is missing, please update your device-tree\n");
+ return NULL;
+ }
+
+ pmc_pdev = of_find_device_by_node(np);
+ of_node_put(np);
+ if (!pmc_pdev)
+ return ERR_PTR(-ENODEV);
+
+ err = devm_add_action_or_reset(dev, tegra_usb_phy_put_pmc_device,
+ &pmc_pdev->dev);
+ if (err)
+ return ERR_PTR(err);
+
+ if (!platform_get_drvdata(pmc_pdev))
+ return ERR_PTR(-EPROBE_DEFER);
+
+ regmap = dev_get_regmap(&pmc_pdev->dev, "usb_sleepwalk");
+ if (!regmap)
+ return ERR_PTR(-EINVAL);
+
+ return regmap;
+}
+
static const struct tegra_phy_soc_config tegra20_soc_config = {
.utmi_pll_config_in_car_module = false,
.has_hostpc = false,
.requires_usbmode_setup = false,
.requires_extra_tuning_parameters = false,
+ .requires_pmc_ao_power_up = false,
};
static const struct tegra_phy_soc_config tegra30_soc_config = {
@@ -1147,6 +1324,7 @@ static const struct tegra_phy_soc_config tegra30_soc_config = {
.has_hostpc = true,
.requires_usbmode_setup = true,
.requires_extra_tuning_parameters = true,
+ .requires_pmc_ao_power_up = true,
};
static const struct of_device_id tegra_usb_phy_id_table[] = {
@@ -1172,6 +1350,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
return -ENOMEM;
tegra_phy->soc_config = of_device_get_match_data(&pdev->dev);
+ tegra_phy->irq = platform_get_irq_optional(pdev, 0);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
@@ -1215,6 +1394,19 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
return err;
}
+ tegra_phy->pmc_regmap = tegra_usb_phy_get_pmc_regmap(&pdev->dev);
+ err = PTR_ERR_OR_ZERO(tegra_phy->pmc_regmap);
+ if (err) {
+ dev_err_probe(&pdev->dev, err, "Failed to get PMC regmap\n");
+ return err;
+ }
+
+ /* older device-trees don't specify instance ID */
+ err = of_property_read_u32(np, "nvidia,phy-instance",
+ &tegra_phy->instance);
+ if (err)
+ tegra_phy->instance = -1;
+
phy_type = of_usb_get_phy_mode(np);
switch (phy_type) {
case USBPHY_INTERFACE_MODE_UTMI:
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index fd1c9f6a4e37..d3e65eb9e16f 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -18,6 +18,7 @@
#include <linux/clk.h>
#include <linux/gpio.h>
+#include <linux/regmap.h>
#include <linux/reset.h>
#include <linux/usb/otg.h>
@@ -30,6 +31,7 @@
* enter host mode
* requires_extra_tuning_parameters: true if xcvr_hsslew, hssquelch_level
* and hsdiscon_level should be set for adequate signal quality
+ * requires_pmc_ao_power_up: true if USB AO is powered down by default
*/
struct tegra_phy_soc_config {
@@ -37,6 +39,7 @@ struct tegra_phy_soc_config {
bool has_hostpc;
bool requires_usbmode_setup;
bool requires_extra_tuning_parameters;
+ bool requires_pmc_ao_power_up;
};
struct tegra_utmip_config {
@@ -62,6 +65,7 @@ enum tegra_usb_phy_port_speed {
struct tegra_xtal_freq;
struct tegra_usb_phy {
+ int irq;
int instance;
const struct tegra_xtal_freq *freq;
void __iomem *regs;
@@ -70,6 +74,7 @@ struct tegra_usb_phy {
struct clk *pll_u;
struct clk *pad_clk;
struct regulator *vbus;
+ struct regmap *pmc_regmap;
enum usb_dr_mode mode;
void *config;
const struct tegra_phy_soc_config *soc_config;
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 05/12] usb: otg-fsm: Fix hrtimer list corruption
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (3 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 04/12] usb: phy: tegra: Support OTG mode programming Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-06 0:57 ` Peter Chen
2021-07-04 22:54 ` [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator Dmitry Osipenko
` (6 subsequent siblings)
11 siblings, 1 reply; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
The HNP work can be re-scheduled while it's still in-fly. This results in
re-initialization of the busy work, resetting the hrtimer's list node of
the work and crashing kernel with null dereference within kernel/timer
once work's timer is expired. It's very easy to trigger this problem by
re-plugging USB cable quickly. Initialize HNP work only once to fix this
trouble.
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/usb/common/usb-otg-fsm.c | 6 +++++-
include/linux/usb/otg-fsm.h | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
index 3740cf95560e..0697fde51d00 100644
--- a/drivers/usb/common/usb-otg-fsm.c
+++ b/drivers/usb/common/usb-otg-fsm.c
@@ -193,7 +193,11 @@ static void otg_start_hnp_polling(struct otg_fsm *fsm)
if (!fsm->host_req_flag)
return;
- INIT_DELAYED_WORK(&fsm->hnp_polling_work, otg_hnp_polling_work);
+ if (!fsm->hnp_work_inited) {
+ INIT_DELAYED_WORK(&fsm->hnp_polling_work, otg_hnp_polling_work);
+ fsm->hnp_work_inited = true;
+ }
+
schedule_delayed_work(&fsm->hnp_polling_work,
msecs_to_jiffies(T_HOST_REQ_POLL));
}
diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
index 3aee78dda16d..784659d4dc99 100644
--- a/include/linux/usb/otg-fsm.h
+++ b/include/linux/usb/otg-fsm.h
@@ -196,6 +196,7 @@ struct otg_fsm {
struct mutex lock;
u8 *host_req_flag;
struct delayed_work hnp_polling_work;
+ bool hnp_work_inited;
bool state_changed;
};
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v3 05/12] usb: otg-fsm: Fix hrtimer list corruption
2021-07-04 22:54 ` [PATCH v3 05/12] usb: otg-fsm: Fix hrtimer list corruption Dmitry Osipenko
@ 2021-07-06 0:57 ` Peter Chen
2021-07-06 1:15 ` Dmitry Osipenko
0 siblings, 1 reply; 24+ messages in thread
From: Peter Chen @ 2021-07-06 0:57 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg, devicetree, linux-pm, linux-usb, linux-kernel,
linux-tegra
On 21-07-05 01:54:26, Dmitry Osipenko wrote:
> The HNP work can be re-scheduled while it's still in-fly. This results in
> re-initialization of the busy work, resetting the hrtimer's list node of
> the work and crashing kernel with null dereference within kernel/timer
> once work's timer is expired. It's very easy to trigger this problem by
> re-plugging USB cable quickly. Initialize HNP work only once to fix this
> trouble.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-by: Peter Chen <peter.chen@kernel.org>
It is better to append kernel dump if you have v4 patchset.
Peter
> ---
> drivers/usb/common/usb-otg-fsm.c | 6 +++++-
> include/linux/usb/otg-fsm.h | 1 +
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
> index 3740cf95560e..0697fde51d00 100644
> --- a/drivers/usb/common/usb-otg-fsm.c
> +++ b/drivers/usb/common/usb-otg-fsm.c
> @@ -193,7 +193,11 @@ static void otg_start_hnp_polling(struct otg_fsm *fsm)
> if (!fsm->host_req_flag)
> return;
>
> - INIT_DELAYED_WORK(&fsm->hnp_polling_work, otg_hnp_polling_work);
> + if (!fsm->hnp_work_inited) {
> + INIT_DELAYED_WORK(&fsm->hnp_polling_work, otg_hnp_polling_work);
> + fsm->hnp_work_inited = true;
> + }
> +
> schedule_delayed_work(&fsm->hnp_polling_work,
> msecs_to_jiffies(T_HOST_REQ_POLL));
> }
> diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
> index 3aee78dda16d..784659d4dc99 100644
> --- a/include/linux/usb/otg-fsm.h
> +++ b/include/linux/usb/otg-fsm.h
> @@ -196,6 +196,7 @@ struct otg_fsm {
> struct mutex lock;
> u8 *host_req_flag;
> struct delayed_work hnp_polling_work;
> + bool hnp_work_inited;
> bool state_changed;
> };
>
> --
> 2.32.0
>
--
Thanks,
Peter Chen
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v3 05/12] usb: otg-fsm: Fix hrtimer list corruption
2021-07-06 0:57 ` Peter Chen
@ 2021-07-06 1:15 ` Dmitry Osipenko
0 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-06 1:15 UTC (permalink / raw)
To: Peter Chen
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg, devicetree, linux-pm, linux-usb, linux-kernel,
linux-tegra
06.07.2021 03:57, Peter Chen пишет:
> On 21-07-05 01:54:26, Dmitry Osipenko wrote:
>> The HNP work can be re-scheduled while it's still in-fly. This results in
>> re-initialization of the busy work, resetting the hrtimer's list node of
>> the work and crashing kernel with null dereference within kernel/timer
>> once work's timer is expired. It's very easy to trigger this problem by
>> re-plugging USB cable quickly. Initialize HNP work only once to fix this
>> trouble.
>>
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
>
> Acked-by: Peter Chen <peter.chen@kernel.org>
>
> It is better to append kernel dump if you have v4 patchset.
The stacktrace isn't very useful because it crashes within a hrtimer
code from a work thread, i.e. it doesn't point at usb at all. It
actually took me some effort to find where the bug was.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (4 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 05/12] usb: otg-fsm: Fix hrtimer list corruption Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-12 15:39 ` Rob Herring
2021-07-04 22:54 ` [PATCH v3 07/12] power: supply: smb347-charger: Make smb347_set_writable() IRQ-safe Dmitry Osipenko
` (5 subsequent siblings)
11 siblings, 1 reply; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
SMB347 can supply power to USB VBUS, which is required by OTG-cable
devices that want to switch USB port into the host mode. Add USB VBUS
regulator properties.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
.../power/supply/summit,smb347-charger.yaml | 28 +++++++++++++++++++
.../dt-bindings/power/summit,smb347-charger.h | 4 +++
2 files changed, 32 insertions(+)
diff --git a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
index 983fc215c1e5..cd3d834f734d 100644
--- a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
+++ b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
@@ -73,6 +73,24 @@ properties:
- 1 # SMB3XX_SOFT_TEMP_COMPENSATE_CURRENT Current compensation
- 2 # SMB3XX_SOFT_TEMP_COMPENSATE_VOLTAGE Voltage compensation
+ summit,inok-polarity:
+ description: |
+ Polarity of INOK signal indicating presence of external power supply.
+ $ref: /schemas/types.yaml#/definitions/uint32
+ enum:
+ - 0 # SMB3XX_SYSOK_INOK_ACTIVE_LOW
+ - 1 # SMB3XX_SYSOK_INOK_ACTIVE_HIGH
+
+ usb-vbus:
+ $ref: "../../regulator/regulator.yaml#"
+ type: object
+
+ properties:
+ summit,needs-inok-toggle:
+ type: boolean
+ description: INOK signal is fixed and polarity needs to be toggled
+ in order to enable/disable output mode.
+
allOf:
- if:
properties:
@@ -134,6 +152,7 @@ examples:
reg = <0x7f>;
summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_HIGH>;
+ summit,inok-polarity = <SMB3XX_SYSOK_INOK_ACTIVE_LOW>;
summit,chip-temperature-threshold-celsius = <110>;
summit,mains-current-limit-microamp = <2000000>;
summit,usb-current-limit-microamp = <500000>;
@@ -141,6 +160,15 @@ examples:
summit,enable-mains-charging;
monitored-battery = <&battery>;
+
+ usb-vbus {
+ regulator-name = "usb_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-min-microamp = <750000>;
+ regulator-max-microamp = <750000>;
+ summit,needs-inok-toggle;
+ };
};
};
diff --git a/include/dt-bindings/power/summit,smb347-charger.h b/include/dt-bindings/power/summit,smb347-charger.h
index d918bf321a71..3205699b5e41 100644
--- a/include/dt-bindings/power/summit,smb347-charger.h
+++ b/include/dt-bindings/power/summit,smb347-charger.h
@@ -16,4 +16,8 @@
#define SMB3XX_CHG_ENABLE_PIN_ACTIVE_LOW 1
#define SMB3XX_CHG_ENABLE_PIN_ACTIVE_HIGH 2
+/* Polarity of INOK signal */
+#define SMB3XX_SYSOK_INOK_ACTIVE_LOW 0
+#define SMB3XX_SYSOK_INOK_ACTIVE_HIGH 1
+
#endif
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator
2021-07-04 22:54 ` [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator Dmitry Osipenko
@ 2021-07-12 15:39 ` Rob Herring
2021-07-13 0:22 ` Dmitry Osipenko
0 siblings, 1 reply; 24+ messages in thread
From: Rob Herring @ 2021-07-12 15:39 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
On Mon, Jul 05, 2021 at 01:54:27AM +0300, Dmitry Osipenko wrote:
> SMB347 can supply power to USB VBUS, which is required by OTG-cable
> devices that want to switch USB port into the host mode. Add USB VBUS
> regulator properties.
>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
> .../power/supply/summit,smb347-charger.yaml | 28 +++++++++++++++++++
> .../dt-bindings/power/summit,smb347-charger.h | 4 +++
> 2 files changed, 32 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
> index 983fc215c1e5..cd3d834f734d 100644
> --- a/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
> @@ -73,6 +73,24 @@ properties:
> - 1 # SMB3XX_SOFT_TEMP_COMPENSATE_CURRENT Current compensation
> - 2 # SMB3XX_SOFT_TEMP_COMPENSATE_VOLTAGE Voltage compensation
>
> + summit,inok-polarity:
> + description: |
> + Polarity of INOK signal indicating presence of external power supply.
> + $ref: /schemas/types.yaml#/definitions/uint32
> + enum:
> + - 0 # SMB3XX_SYSOK_INOK_ACTIVE_LOW
> + - 1 # SMB3XX_SYSOK_INOK_ACTIVE_HIGH
> +
> + usb-vbus:
> + $ref: "../../regulator/regulator.yaml#"
> + type: object
unevaluatedProperties: false
With that,
Reviewed-by: Rob Herring <robh@kernel.org>
> +
> + properties:
> + summit,needs-inok-toggle:
> + type: boolean
> + description: INOK signal is fixed and polarity needs to be toggled
> + in order to enable/disable output mode.
> +
> allOf:
> - if:
> properties:
> @@ -134,6 +152,7 @@ examples:
> reg = <0x7f>;
>
> summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_HIGH>;
> + summit,inok-polarity = <SMB3XX_SYSOK_INOK_ACTIVE_LOW>;
> summit,chip-temperature-threshold-celsius = <110>;
> summit,mains-current-limit-microamp = <2000000>;
> summit,usb-current-limit-microamp = <500000>;
> @@ -141,6 +160,15 @@ examples:
> summit,enable-mains-charging;
>
> monitored-battery = <&battery>;
> +
> + usb-vbus {
> + regulator-name = "usb_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + regulator-min-microamp = <750000>;
> + regulator-max-microamp = <750000>;
> + summit,needs-inok-toggle;
> + };
> };
> };
>
> diff --git a/include/dt-bindings/power/summit,smb347-charger.h b/include/dt-bindings/power/summit,smb347-charger.h
> index d918bf321a71..3205699b5e41 100644
> --- a/include/dt-bindings/power/summit,smb347-charger.h
> +++ b/include/dt-bindings/power/summit,smb347-charger.h
> @@ -16,4 +16,8 @@
> #define SMB3XX_CHG_ENABLE_PIN_ACTIVE_LOW 1
> #define SMB3XX_CHG_ENABLE_PIN_ACTIVE_HIGH 2
>
> +/* Polarity of INOK signal */
> +#define SMB3XX_SYSOK_INOK_ACTIVE_LOW 0
> +#define SMB3XX_SYSOK_INOK_ACTIVE_HIGH 1
> +
> #endif
> --
> 2.32.0
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator
2021-07-12 15:39 ` Rob Herring
@ 2021-07-13 0:22 ` Dmitry Osipenko
2021-07-14 23:01 ` Rob Herring
0 siblings, 1 reply; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-13 0:22 UTC (permalink / raw)
To: Rob Herring
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
12.07.2021 18:39, Rob Herring пишет:
>> + summit,inok-polarity:
>> + description: |
>> + Polarity of INOK signal indicating presence of external power supply.
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + enum:
>> + - 0 # SMB3XX_SYSOK_INOK_ACTIVE_LOW
>> + - 1 # SMB3XX_SYSOK_INOK_ACTIVE_HIGH
>> +
>> + usb-vbus:
>> + $ref: "../../regulator/regulator.yaml#"
>> + type: object
> unevaluatedProperties: false
>
> With that,
>
> Reviewed-by: Rob Herring <robh@kernel.org>
>
I tried to add the unevaluatedProperties + a random unrelated property
to the example usb-vbus node and dt_binding_check is happy with that. So
the unevaluatedProperties has no effect, is it supposed to be so?
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator
2021-07-13 0:22 ` Dmitry Osipenko
@ 2021-07-14 23:01 ` Rob Herring
2021-07-15 15:29 ` Dmitry Osipenko
0 siblings, 1 reply; 24+ messages in thread
From: Rob Herring @ 2021-07-14 23:01 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
On Tue, Jul 13, 2021 at 03:22:40AM +0300, Dmitry Osipenko wrote:
> 12.07.2021 18:39, Rob Herring пишет:
> >> + summit,inok-polarity:
> >> + description: |
> >> + Polarity of INOK signal indicating presence of external power supply.
> >> + $ref: /schemas/types.yaml#/definitions/uint32
> >> + enum:
> >> + - 0 # SMB3XX_SYSOK_INOK_ACTIVE_LOW
> >> + - 1 # SMB3XX_SYSOK_INOK_ACTIVE_HIGH
> >> +
> >> + usb-vbus:
> >> + $ref: "../../regulator/regulator.yaml#"
> >> + type: object
> > unevaluatedProperties: false
> >
> > With that,
> >
> > Reviewed-by: Rob Herring <robh@kernel.org>
> >
>
> I tried to add the unevaluatedProperties + a random unrelated property
> to the example usb-vbus node and dt_binding_check is happy with that. So
> the unevaluatedProperties has no effect, is it supposed to be so?
Yes, until support lands upstream[1].
Rob
[1] https://github.com/Julian/jsonschema/pull/817
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator
2021-07-14 23:01 ` Rob Herring
@ 2021-07-15 15:29 ` Dmitry Osipenko
0 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-15 15:29 UTC (permalink / raw)
To: Rob Herring
Cc: Thierry Reding, Jonathan Hunter, Mark Brown, Sebastian Reichel,
Peter Chen, Greg Kroah-Hartman, Felipe Balbi, David Heidelberg,
devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
15.07.2021 02:01, Rob Herring пишет:
> On Tue, Jul 13, 2021 at 03:22:40AM +0300, Dmitry Osipenko wrote:
>> 12.07.2021 18:39, Rob Herring пишет:
>>>> + summit,inok-polarity:
>>>> + description: |
>>>> + Polarity of INOK signal indicating presence of external power supply.
>>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>>> + enum:
>>>> + - 0 # SMB3XX_SYSOK_INOK_ACTIVE_LOW
>>>> + - 1 # SMB3XX_SYSOK_INOK_ACTIVE_HIGH
>>>> +
>>>> + usb-vbus:
>>>> + $ref: "../../regulator/regulator.yaml#"
>>>> + type: object
>>> unevaluatedProperties: false
>>>
>>> With that,
>>>
>>> Reviewed-by: Rob Herring <robh@kernel.org>
>>>
>>
>> I tried to add the unevaluatedProperties + a random unrelated property
>> to the example usb-vbus node and dt_binding_check is happy with that. So
>> the unevaluatedProperties has no effect, is it supposed to be so?
>
> Yes, until support lands upstream[1].
>
> Rob
>
> [1] https://github.com/Julian/jsonschema/pull/817
>
Thank you for the clarification.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 07/12] power: supply: smb347-charger: Make smb347_set_writable() IRQ-safe
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (5 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 06/12] dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 08/12] power: supply: smb347-charger: Remove caching of charger state Dmitry Osipenko
` (4 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
The smb347_set_writable() is used by interrupt handler and outside of it.
The interrupt should be disabled when the function is used outside of
interrupt handler in order to prevent racing with the interrupt context.
Add new parameter to smb347_set_writable() that allows to disable IRQ.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/power/supply/smb347-charger.c | 30 +++++++++++++++++++--------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
index df240420f2de..db1378b41f80 100644
--- a/drivers/power/supply/smb347-charger.c
+++ b/drivers/power/supply/smb347-charger.c
@@ -671,10 +671,22 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
*
* Returns %0 on success and negative errno in case of failure.
*/
-static int smb347_set_writable(struct smb347_charger *smb, bool writable)
+static int smb347_set_writable(struct smb347_charger *smb, bool writable,
+ bool irq_toggle)
{
- return regmap_update_bits(smb->regmap, CMD_A, CMD_A_ALLOW_WRITE,
- writable ? CMD_A_ALLOW_WRITE : 0);
+ struct i2c_client *client = to_i2c_client(smb->dev);
+ int ret;
+
+ if (writable && irq_toggle && !smb->irq_unsupported)
+ disable_irq(client->irq);
+
+ ret = regmap_update_bits(smb->regmap, CMD_A, CMD_A_ALLOW_WRITE,
+ writable ? CMD_A_ALLOW_WRITE : 0);
+
+ if ((!writable || ret) && irq_toggle && !smb->irq_unsupported)
+ enable_irq(client->irq);
+
+ return ret;
}
static int smb347_hw_init(struct smb347_charger *smb)
@@ -682,7 +694,7 @@ static int smb347_hw_init(struct smb347_charger *smb)
unsigned int val;
int ret;
- ret = smb347_set_writable(smb, true);
+ ret = smb347_set_writable(smb, true, false);
if (ret < 0)
return ret;
@@ -758,7 +770,7 @@ static int smb347_hw_init(struct smb347_charger *smb)
ret = smb347_start_stop_charging(smb);
fail:
- smb347_set_writable(smb, false);
+ smb347_set_writable(smb, false, false);
return ret;
}
@@ -866,7 +878,7 @@ static int smb347_irq_set(struct smb347_charger *smb, bool enable)
if (smb->irq_unsupported)
return 0;
- ret = smb347_set_writable(smb, true);
+ ret = smb347_set_writable(smb, true, true);
if (ret < 0)
return ret;
@@ -891,7 +903,7 @@ static int smb347_irq_set(struct smb347_charger *smb, bool enable)
ret = regmap_update_bits(smb->regmap, CFG_PIN, CFG_PIN_EN_CHARGER_ERROR,
enable ? CFG_PIN_EN_CHARGER_ERROR : 0);
fail:
- smb347_set_writable(smb, false);
+ smb347_set_writable(smb, false, true);
return ret;
}
@@ -919,7 +931,7 @@ static int smb347_irq_init(struct smb347_charger *smb,
if (!client->irq)
return 0;
- ret = smb347_set_writable(smb, true);
+ ret = smb347_set_writable(smb, true, false);
if (ret < 0)
return ret;
@@ -931,7 +943,7 @@ static int smb347_irq_init(struct smb347_charger *smb,
CFG_STAT_ACTIVE_HIGH | CFG_STAT_DISABLED,
CFG_STAT_DISABLED);
- smb347_set_writable(smb, false);
+ smb347_set_writable(smb, false, false);
if (ret < 0) {
dev_warn(smb->dev, "failed to initialize IRQ: %d\n", ret);
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 08/12] power: supply: smb347-charger: Remove caching of charger state
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (6 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 07/12] power: supply: smb347-charger: Make smb347_set_writable() IRQ-safe Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 09/12] power: supply: smb347-charger: Implement USB VBUS regulator Dmitry Osipenko
` (3 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
Regmap already provides us with the caching, so remove caching of charger
state to make code cleaner.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/power/supply/smb347-charger.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
index db1378b41f80..f81c60c679a0 100644
--- a/drivers/power/supply/smb347-charger.c
+++ b/drivers/power/supply/smb347-charger.c
@@ -135,7 +135,6 @@
* @id: SMB charger ID
* @mains_online: is AC/DC input connected
* @usb_online: is USB input connected
- * @charging_enabled: is charging enabled
* @irq_unsupported: is interrupt unsupported by SMB hardware
* @max_charge_current: maximum current (in uA) the battery can be charged
* @max_charge_voltage: maximum voltage (in uV) the battery can be charged
@@ -192,7 +191,6 @@ struct smb347_charger {
unsigned int id;
bool mains_online;
bool usb_online;
- bool charging_enabled;
bool irq_unsupported;
unsigned int max_charge_current;
@@ -358,21 +356,13 @@ static int smb347_charging_status(struct smb347_charger *smb)
static int smb347_charging_set(struct smb347_charger *smb, bool enable)
{
- int ret = 0;
-
if (smb->enable_control != SMB3XX_CHG_ENABLE_SW) {
dev_dbg(smb->dev, "charging enable/disable in SW disabled\n");
return 0;
}
- if (smb->charging_enabled != enable) {
- ret = regmap_update_bits(smb->regmap, CMD_A, CMD_A_CHG_ENABLED,
- enable ? CMD_A_CHG_ENABLED : 0);
- if (!ret)
- smb->charging_enabled = enable;
- }
-
- return ret;
+ return regmap_update_bits(smb->regmap, CMD_A, CMD_A_CHG_ENABLED,
+ enable ? CMD_A_CHG_ENABLED : 0);
}
static inline int smb347_charging_enable(struct smb347_charger *smb)
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 09/12] power: supply: smb347-charger: Implement USB VBUS regulator
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (7 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 08/12] power: supply: smb347-charger: Remove caching of charger state Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 10/12] arm64: tegra132: Add new properties to USB PHY device-tree node Dmitry Osipenko
` (2 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
SMB347 can supply power to USB VBUS, implement the USB VBUS regulator.
USB VBUS needs to be powered for switching OTG-cable USB port into host
mode.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/power/supply/Kconfig | 1 +
drivers/power/supply/smb347-charger.c | 219 ++++++++++++++++++++++++++
2 files changed, 220 insertions(+)
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 832190743e00..5a4f82ba9375 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -688,6 +688,7 @@ config CHARGER_BQ256XX
config CHARGER_SMB347
tristate "Summit Microelectronics SMB3XX Battery Charger"
depends on I2C
+ depends on REGULATOR
select REGMAP_I2C
help
Say Y to include support for Summit Microelectronics SMB345,
diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
index f81c60c679a0..330f1cd40e5e 100644
--- a/drivers/power/supply/smb347-charger.c
+++ b/drivers/power/supply/smb347-charger.c
@@ -18,6 +18,7 @@
#include <linux/power_supply.h>
#include <linux/property.h>
#include <linux/regmap.h>
+#include <linux/regulator/driver.h>
#include <dt-bindings/power/summit,smb347-charger.h>
@@ -62,12 +63,15 @@
#define CFG_THERM_SOFT_COLD_COMPENSATION_SHIFT 2
#define CFG_THERM_MONITOR_DISABLED BIT(4)
#define CFG_SYSOK 0x08
+#define CFG_SYSOK_INOK_ACTIVE_HIGH BIT(0)
#define CFG_SYSOK_SUSPEND_HARD_LIMIT_DISABLED BIT(2)
#define CFG_OTHER 0x09
#define CFG_OTHER_RID_MASK 0xc0
#define CFG_OTHER_RID_ENABLED_AUTO_OTG 0xc0
#define CFG_OTG 0x0a
#define CFG_OTG_TEMP_THRESHOLD_MASK 0x30
+#define CFG_OTG_CURRENT_LIMIT_250mA BIT(2)
+#define CFG_OTG_CURRENT_LIMIT_750mA BIT(3)
#define CFG_OTG_TEMP_THRESHOLD_SHIFT 4
#define CFG_OTG_CC_COMPENSATION_MASK 0xc0
#define CFG_OTG_CC_COMPENSATION_SHIFT 6
@@ -91,6 +95,7 @@
#define CMD_A 0x30
#define CMD_A_CHG_ENABLED BIT(1)
#define CMD_A_SUSPEND_ENABLED BIT(2)
+#define CMD_A_OTG_ENABLED BIT(4)
#define CMD_A_ALLOW_WRITE BIT(7)
#define CMD_B 0x31
#define CMD_C 0x33
@@ -132,10 +137,12 @@
* @regmap: pointer to driver regmap
* @mains: power_supply instance for AC/DC power
* @usb: power_supply instance for USB power
+ * @usb_rdev: USB VBUS regulator device
* @id: SMB charger ID
* @mains_online: is AC/DC input connected
* @usb_online: is USB input connected
* @irq_unsupported: is interrupt unsupported by SMB hardware
+ * @usb_vbus_enabled: is USB VBUS powered by SMB charger
* @max_charge_current: maximum current (in uA) the battery can be charged
* @max_charge_voltage: maximum voltage (in uV) the battery can be charged
* @pre_charge_current: current (in uA) to use in pre-charging phase
@@ -166,6 +173,8 @@
* @use_usb_otg: USB OTG output can be used (not implemented yet)
* @enable_control: how charging enable/disable is controlled
* (driver/pin controls)
+ * @inok_polarity: polarity of INOK signal which denotes presence of external
+ * power supply
*
* @use_main, @use_usb, and @use_usb_otg are means to enable/disable
* hardware support for these. This is useful when we want to have for
@@ -188,10 +197,12 @@ struct smb347_charger {
struct regmap *regmap;
struct power_supply *mains;
struct power_supply *usb;
+ struct regulator_dev *usb_rdev;
unsigned int id;
bool mains_online;
bool usb_online;
bool irq_unsupported;
+ bool usb_vbus_enabled;
unsigned int max_charge_current;
unsigned int max_charge_voltage;
@@ -212,6 +223,7 @@ struct smb347_charger {
bool use_usb;
bool use_usb_otg;
unsigned int enable_control;
+ unsigned int inok_polarity;
};
enum smb_charger_chipid {
@@ -361,6 +373,11 @@ static int smb347_charging_set(struct smb347_charger *smb, bool enable)
return 0;
}
+ if (enable && smb->usb_vbus_enabled) {
+ dev_dbg(smb->dev, "charging not enabled because USB is in host mode\n");
+ return 0;
+ }
+
return regmap_update_bits(smb->regmap, CMD_A, CMD_A_CHG_ENABLED,
enable ? CMD_A_CHG_ENABLED : 0);
}
@@ -1243,6 +1260,13 @@ static void smb347_dt_parse_dev_info(struct smb347_charger *smb)
/* Select charging control */
device_property_read_u32(dev, "summit,enable-charge-control",
&smb->enable_control);
+
+ /*
+ * Polarity of INOK signal indicating presence of external power
+ * supply connected to the charger.
+ */
+ device_property_read_u32(dev, "summit,inok-polarity",
+ &smb->inok_polarity);
}
static int smb347_get_battery_info(struct smb347_charger *smb)
@@ -1294,6 +1318,160 @@ static int smb347_get_battery_info(struct smb347_charger *smb)
return 0;
}
+static int smb347_usb_vbus_get_current_limit(struct regulator_dev *rdev)
+{
+ struct smb347_charger *smb = rdev_get_drvdata(rdev);
+ unsigned int val;
+ int ret;
+
+ ret = regmap_read(smb->regmap, CFG_OTG, &val);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * It's unknown what happens if this bit is unset due to lack of
+ * access to the datasheet, assume it's limit-enable.
+ */
+ if (!(val & CFG_OTG_CURRENT_LIMIT_250mA))
+ return 0;
+
+ return val & CFG_OTG_CURRENT_LIMIT_750mA ? 750000 : 250000;
+}
+
+static int smb347_usb_vbus_set_new_current_limit(struct smb347_charger *smb,
+ int max_uA)
+{
+ const unsigned int mask = CFG_OTG_CURRENT_LIMIT_750mA |
+ CFG_OTG_CURRENT_LIMIT_250mA;
+ unsigned int val = CFG_OTG_CURRENT_LIMIT_250mA;
+ int ret;
+
+ if (max_uA >= 750000)
+ val |= CFG_OTG_CURRENT_LIMIT_750mA;
+
+ ret = regmap_update_bits(smb->regmap, CFG_OTG, mask, val);
+ if (ret < 0)
+ dev_err(smb->dev, "failed to change USB current limit\n");
+
+ return ret;
+}
+
+static int smb347_usb_vbus_set_current_limit(struct regulator_dev *rdev,
+ int min_uA, int max_uA)
+{
+ struct smb347_charger *smb = rdev_get_drvdata(rdev);
+ int ret;
+
+ ret = smb347_set_writable(smb, true, true);
+ if (ret < 0)
+ return ret;
+
+ ret = smb347_usb_vbus_set_new_current_limit(smb, max_uA);
+ smb347_set_writable(smb, false, true);
+
+ return ret;
+}
+
+static int smb347_usb_vbus_regulator_enable(struct regulator_dev *rdev)
+{
+ struct smb347_charger *smb = rdev_get_drvdata(rdev);
+ int ret, max_uA;
+
+ ret = smb347_set_writable(smb, true, true);
+ if (ret < 0)
+ return ret;
+
+ smb347_charging_disable(smb);
+
+ if (device_property_read_bool(&rdev->dev, "summit,needs-inok-toggle")) {
+ unsigned int sysok = 0;
+
+ if (smb->inok_polarity == SMB3XX_SYSOK_INOK_ACTIVE_LOW)
+ sysok = CFG_SYSOK_INOK_ACTIVE_HIGH;
+
+ /*
+ * VBUS won't be powered if INOK is active, so we need to
+ * manually disable INOK on some platforms.
+ */
+ ret = regmap_update_bits(smb->regmap, CFG_SYSOK,
+ CFG_SYSOK_INOK_ACTIVE_HIGH, sysok);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to disable INOK\n");
+ goto done;
+ }
+ }
+
+ ret = smb347_usb_vbus_get_current_limit(rdev);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to get USB VBUS current limit\n");
+ goto done;
+ }
+
+ max_uA = ret;
+
+ ret = smb347_usb_vbus_set_new_current_limit(smb, 250000);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to preset USB VBUS current limit\n");
+ goto done;
+ }
+
+ ret = regmap_set_bits(smb->regmap, CMD_A, CMD_A_OTG_ENABLED);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to enable USB VBUS\n");
+ goto done;
+ }
+
+ smb->usb_vbus_enabled = true;
+
+ ret = smb347_usb_vbus_set_new_current_limit(smb, max_uA);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to restore USB VBUS current limit\n");
+ goto done;
+ }
+done:
+ smb347_set_writable(smb, false, true);
+
+ return ret;
+}
+
+static int smb347_usb_vbus_regulator_disable(struct regulator_dev *rdev)
+{
+ struct smb347_charger *smb = rdev_get_drvdata(rdev);
+ int ret;
+
+ ret = smb347_set_writable(smb, true, true);
+ if (ret < 0)
+ return ret;
+
+ ret = regmap_clear_bits(smb->regmap, CMD_A, CMD_A_OTG_ENABLED);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to disable USB VBUS\n");
+ goto done;
+ }
+
+ smb->usb_vbus_enabled = false;
+
+ if (device_property_read_bool(&rdev->dev, "summit,needs-inok-toggle")) {
+ unsigned int sysok = 0;
+
+ if (smb->inok_polarity == SMB3XX_SYSOK_INOK_ACTIVE_HIGH)
+ sysok = CFG_SYSOK_INOK_ACTIVE_HIGH;
+
+ ret = regmap_update_bits(smb->regmap, CFG_SYSOK,
+ CFG_SYSOK_INOK_ACTIVE_HIGH, sysok);
+ if (ret < 0) {
+ dev_err(smb->dev, "failed to enable INOK\n");
+ goto done;
+ }
+ }
+
+ smb347_start_stop_charging(smb);
+done:
+ smb347_set_writable(smb, false, true);
+
+ return ret;
+}
+
static const struct regmap_config smb347_regmap = {
.reg_bits = 8,
.val_bits = 8,
@@ -1302,6 +1480,14 @@ static const struct regmap_config smb347_regmap = {
.readable_reg = smb347_readable_reg,
};
+static const struct regulator_ops smb347_usb_vbus_regulator_ops = {
+ .is_enabled = regulator_is_enabled_regmap,
+ .enable = smb347_usb_vbus_regulator_enable,
+ .disable = smb347_usb_vbus_regulator_disable,
+ .get_current_limit = smb347_usb_vbus_get_current_limit,
+ .set_current_limit = smb347_usb_vbus_set_current_limit,
+};
+
static const struct power_supply_desc smb347_mains_desc = {
.name = "smb347-mains",
.type = POWER_SUPPLY_TYPE_MAINS,
@@ -1318,10 +1504,24 @@ static const struct power_supply_desc smb347_usb_desc = {
.num_properties = ARRAY_SIZE(smb347_properties),
};
+static const struct regulator_desc smb347_usb_vbus_regulator_desc = {
+ .name = "smb347-usb-vbus",
+ .of_match = of_match_ptr("usb-vbus"),
+ .ops = &smb347_usb_vbus_regulator_ops,
+ .type = REGULATOR_VOLTAGE,
+ .owner = THIS_MODULE,
+ .enable_reg = CMD_A,
+ .enable_mask = CMD_A_OTG_ENABLED,
+ .enable_val = CMD_A_OTG_ENABLED,
+ .fixed_uV = 5000000,
+ .n_voltages = 1,
+};
+
static int smb347_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct power_supply_config mains_usb_cfg = {};
+ struct regulator_config usb_rdev_cfg = {};
struct device *dev = &client->dev;
struct smb347_charger *smb;
int ret;
@@ -1369,6 +1569,18 @@ static int smb347_probe(struct i2c_client *client,
if (ret)
return ret;
+ usb_rdev_cfg.dev = dev;
+ usb_rdev_cfg.driver_data = smb;
+ usb_rdev_cfg.regmap = smb->regmap;
+
+ smb->usb_rdev = devm_regulator_register(dev,
+ &smb347_usb_vbus_regulator_desc,
+ &usb_rdev_cfg);
+ if (IS_ERR(smb->usb_rdev)) {
+ smb347_irq_disable(smb);
+ return PTR_ERR(smb->usb_rdev);
+ }
+
return 0;
}
@@ -1376,11 +1588,17 @@ static int smb347_remove(struct i2c_client *client)
{
struct smb347_charger *smb = i2c_get_clientdata(client);
+ smb347_usb_vbus_regulator_disable(smb->usb_rdev);
smb347_irq_disable(smb);
return 0;
}
+static void smb347_shutdown(struct i2c_client *client)
+{
+ smb347_remove(client);
+}
+
static const struct i2c_device_id smb347_id[] = {
{ "smb345", SMB345 },
{ "smb347", SMB347 },
@@ -1404,6 +1622,7 @@ static struct i2c_driver smb347_driver = {
},
.probe = smb347_probe,
.remove = smb347_remove,
+ .shutdown = smb347_shutdown,
.id_table = smb347_id,
};
module_i2c_driver(smb347_driver);
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 10/12] arm64: tegra132: Add new properties to USB PHY device-tree node
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (8 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 09/12] power: supply: smb347-charger: Implement USB VBUS regulator Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 11/12] ARM: tegra: Add new properties to USB PHY device-tree nodes Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 12/12] ARM: tegra: nexus7: Enable USB OTG mode Dmitry Osipenko
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
Add new properties to USB PHYs needed for enabling USB OTG mode.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
arch/arm64/boot/dts/nvidia/tegra132.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/nvidia/tegra132.dtsi b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
index 9928a87f593a..fa3bab8138f5 100644
--- a/arch/arm64/boot/dts/nvidia/tegra132.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
@@ -1123,6 +1123,7 @@ phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d000000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USBD>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1142,6 +1143,8 @@ phy1: usb-phy@7d000000 {
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
nvidia,has-utmi-pad-registers;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <0>;
status = "disabled";
};
@@ -1162,6 +1165,7 @@ phy2: usb-phy@7d004000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d004000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
+ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB2>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1180,6 +1184,8 @@ phy2: usb-phy@7d004000 {
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <1>;
status = "disabled";
};
@@ -1200,6 +1206,7 @@ phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d008000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB3>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1218,6 +1225,8 @@ phy3: usb-phy@7d008000 {
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <2>;
status = "disabled";
};
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 11/12] ARM: tegra: Add new properties to USB PHY device-tree nodes
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (9 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 10/12] arm64: tegra132: Add new properties to USB PHY device-tree node Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
2021-07-04 22:54 ` [PATCH v3 12/12] ARM: tegra: nexus7: Enable USB OTG mode Dmitry Osipenko
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
Add new properties to USB PHYs needed for enabling USB OTG mode.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
arch/arm/boot/dts/tegra114.dtsi | 6 ++++++
arch/arm/boot/dts/tegra124.dtsi | 9 +++++++++
arch/arm/boot/dts/tegra20.dtsi | 9 +++++++++
arch/arm/boot/dts/tegra30.dtsi | 9 +++++++++
4 files changed, 33 insertions(+)
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index fb99b3e971c3..c04817851bce 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -706,6 +706,7 @@ phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d000000 0x4000>,
<0x7d000000 0x4000>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USBD>,
<&tegra_car TEGRA114_CLK_PLL_U>,
@@ -725,6 +726,8 @@ phy1: usb-phy@7d000000 {
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
nvidia,has-utmi-pad-registers;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <0>;
status = "disabled";
};
@@ -744,6 +747,7 @@ phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000>,
<0x7d000000 0x4000>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USB3>,
<&tegra_car TEGRA114_CLK_PLL_U>,
@@ -762,6 +766,8 @@ phy3: usb-phy@7d008000 {
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <2>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 8b38f123f554..0daa1e97c1f6 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1094,6 +1094,7 @@ phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d000000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USBD>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1113,6 +1114,8 @@ phy1: usb-phy@7d000000 {
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
nvidia,has-utmi-pad-registers;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <0>;
status = "disabled";
};
@@ -1132,6 +1135,7 @@ phy2: usb-phy@7d004000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d004000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
+ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB2>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1150,6 +1154,8 @@ phy2: usb-phy@7d004000 {
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <1>;
status = "disabled";
};
@@ -1169,6 +1175,7 @@ phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d008000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB3>,
<&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1187,6 +1194,8 @@ phy3: usb-phy@7d008000 {
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <2>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 70d81a6cbc61..d4c068415bfd 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -875,6 +875,7 @@ phy1: usb-phy@c5000000 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5000000 0x4000>,
<0xc5000000 0x4000>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA20_CLK_USBD>,
<&tegra_car TEGRA20_CLK_PLL_U>,
@@ -893,6 +894,8 @@ phy1: usb-phy@c5000000 {
nvidia,xcvr-lsfslew = <1>;
nvidia,xcvr-lsrslew = <1>;
nvidia,has-utmi-pad-registers;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance= <0>;
status = "disabled";
};
@@ -913,6 +916,7 @@ usb@c5004000 {
phy2: usb-phy@c5004000 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5004000 0x4000>;
+ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "ulpi";
clocks = <&tegra_car TEGRA20_CLK_USB2>,
<&tegra_car TEGRA20_CLK_PLL_U>,
@@ -921,6 +925,8 @@ phy2: usb-phy@c5004000 {
resets = <&tegra_car 58>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance= <1>;
status = "disabled";
};
@@ -942,6 +948,7 @@ phy3: usb-phy@c5008000 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5008000 0x4000>,
<0xc5000000 0x4000>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA20_CLK_USB3>,
<&tegra_car TEGRA20_CLK_PLL_U>,
@@ -958,6 +965,8 @@ phy3: usb-phy@c5008000 {
nvidia,xcvr-setup = <9>;
nvidia,xcvr-lsfslew = <2>;
nvidia,xcvr-lsrslew = <2>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance= <2>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 377bbc50ad2a..f6d63799f05d 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -1143,6 +1143,7 @@ phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra30-usb-phy";
reg = <0x7d000000 0x4000>,
<0x7d000000 0x4000>;
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA30_CLK_USBD>,
<&tegra_car TEGRA30_CLK_PLL_U>,
@@ -1163,6 +1164,8 @@ phy1: usb-phy@7d000000 {
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,has-utmi-pad-registers;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <0>;
status = "disabled";
};
@@ -1184,6 +1187,7 @@ phy2: usb-phy@7d004000 {
compatible = "nvidia,tegra30-usb-phy";
reg = <0x7d004000 0x4000>,
<0x7d000000 0x4000>;
+ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA30_CLK_USB2>,
<&tegra_car TEGRA30_CLK_PLL_U>,
@@ -1203,6 +1207,8 @@ phy2: usb-phy@7d004000 {
nvidia,xcvr-hsslew = <32>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <1>;
status = "disabled";
};
@@ -1224,6 +1230,7 @@ phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000>,
<0x7d000000 0x4000>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA30_CLK_USB3>,
<&tegra_car TEGRA30_CLK_PLL_U>,
@@ -1243,6 +1250,8 @@ phy3: usb-phy@7d008000 {
nvidia,xcvr-hsslew = <32>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
+ nvidia,pmc = <&tegra_pmc>;
+ nvidia,phy-instance = <2>;
status = "disabled";
};
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v3 12/12] ARM: tegra: nexus7: Enable USB OTG mode
2021-07-04 22:54 [PATCH v3 00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 Dmitry Osipenko
` (10 preceding siblings ...)
2021-07-04 22:54 ` [PATCH v3 11/12] ARM: tegra: Add new properties to USB PHY device-tree nodes Dmitry Osipenko
@ 2021-07-04 22:54 ` Dmitry Osipenko
11 siblings, 0 replies; 24+ messages in thread
From: Dmitry Osipenko @ 2021-07-04 22:54 UTC (permalink / raw)
To: Thierry Reding, Jonathan Hunter, Mark Brown, Rob Herring,
Sebastian Reichel, Peter Chen, Greg Kroah-Hartman, Felipe Balbi,
David Heidelberg
Cc: devicetree, linux-pm, linux-usb, linux-kernel, linux-tegra
Nexus 7 has OTG-cable microUSB port, enable OTG mode. USB peripheral
devices now can be connected to Nexus 7 using OTG adapter, switching
USB port into host mode.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
.../tegra30-asus-nexus7-grouper-common.dtsi | 25 +++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index 8bc552b09672..c341e8971b2f 100644
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -941,9 +941,29 @@ power_supply: charger@6a {
interrupts = <TEGRA_GPIO(V, 1) IRQ_TYPE_EDGE_BOTH>;
summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_LOW>;
+ summit,inok-polarity = <SMB3XX_SYSOK_INOK_ACTIVE_LOW>;
summit,enable-usb-charging;
monitored-battery = <&battery_cell>;
+
+ usb_vbus: usb-vbus {
+ regulator-name = "usb_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-min-microamp = <750000>;
+ regulator-max-microamp = <750000>;
+
+ /*
+ * SMB347 INOK input pin is connected to PMIC's
+ * ACOK output, which is fixed to ACTIVE_LOW as
+ * long as battery voltage is in a good range.
+ *
+ * Active INOK disables SMB347 output, so polarity
+ * needs to be toggled when we want to get the
+ * output.
+ */
+ summit,needs-inok-toggle;
+ };
};
};
@@ -1017,12 +1037,13 @@ sdmmc4: mmc@78000600 {
usb@7d000000 {
compatible = "nvidia,tegra30-udc";
status = "okay";
- dr_mode = "peripheral";
+ dr_mode = "otg";
+ vbus-supply = <&usb_vbus>;
};
usb-phy@7d000000 {
status = "okay";
- dr_mode = "peripheral";
+ dr_mode = "otg";
nvidia,hssync-start-delay = <0>;
nvidia,xcvr-lsfslew = <2>;
nvidia,xcvr-lsrslew = <2>;
--
2.32.0
^ permalink raw reply related [flat|nested] 24+ messages in thread