Skip to content

L
linux
Commit e611c0fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'usb-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB/PHY driver updates from Greg KH:
 "Here are the large set of USB and PHY driver updates for 5.8-rc1.

  Nothing huge, just lots of little things:

   - USB gadget fixes and additions all over the place

   - new PHY drivers

   - PHY driver fixes and updates

   - XHCI driver updates

   - musb driver updates

   - more USB-serial driver ids added

   - various USB quirks added

   - thunderbolt minor updates and fixes

   - typec updates and additions

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (245 commits)
  usb: dwc3: meson-g12a: fix USB2 PHY initialization on G12A and A1 SoCs
  usb: dwc3: meson-g12a: fix error path when fetching the reset line fails
  Revert "dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings"
  Revert "dt-bindings: usb: qcom,dwc3: Add compatible for SC7180"
  Revert "dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver"
  USB: serial: ch341: fix lockup of devices with limited prescaler
  USB: serial: ch341: add basis for quirk detection
  CDC-ACM: heed quirk also in error handling
  USB: serial: option: add Telit LE910C1-EUX compositions
  usb: musb: Fix runtime PM imbalance on error
  usb: musb: jz4740: Prevent lockup when CONFIG_SMP is set
  usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle
  usb: musb: use true for 'use_dma'
  usb: musb: start session in resume for host port
  usb: musb: return -ESHUTDOWN in urb when three-strikes error happened
  USB: serial: qcserial: add DW5816e QDL support
  thunderbolt: Add trivial .shutdown
  usb: dwc3: keystone: Turn on USB3 PHY before controller
  dt-bindings: usb: ti,keystone-dwc3.yaml: Add USB3.0 PHY property
  dt-bindings: usb: convert keystone-usb.txt to YAML
  ...
parents 3b69e8b4 347052e3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 7744 additions and 2674 deletions
Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/amlogic,meson8b-usb2-phy.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY
maintainers:
- Martin Blumenstingl <martin.blumenstingl@googlemail.com>
properties:
compatible:
oneOf:
- items:
- enum:
- amlogic,meson8-usb2-phy
- amlogic,meson8b-usb2-phy
- amlogic,meson8m2-usb2-phy
- const: amlogic,meson-mx-usb2-phy
- const: amlogic,meson-gxbb-usb2-phy
reg:
maxItems: 1
clocks:
minItems: 2
clock-names:
items:
- const: usb_general
- const: usb
resets:
minItems: 1
"#phy-cells":
const: 0
phy-supply:
description:
Phandle to a regulator that provides power to the PHY. This
regulator will be managed during the PHY power on/off sequence.
required:
- compatible
- reg
- clocks
- clock-names
- "#phy-cells"
additionalProperties: false
examples:
- |
usb-phy@c0000000 {
compatible = "amlogic,meson-gxbb-usb2-phy";
reg = <0xc0000000 0x20>;
resets = <&reset_usb_phy>;
clocks = <&clk_usb_general>, <&reset_usb>;
clock-names = "usb_general", "usb";
phy-supply = <&usb_vbus>;
#phy-cells = <0>;
};
Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
# Copyright (c) 2020 NXP
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/cdns,salvo-phy.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Cadence SALVO PHY
maintainers:
- Peter Chen <peter.chen@nxp.com>
properties:
compatible:
enum:
- nxp,salvo-phy
reg:
maxItems: 1
clocks:
maxItems: 1
clock-names:
items:
- const: salvo_phy_clk
power-domains:
maxItems: 1
"#phy-cells":
const: 0
required:
- compatible
- reg
- "#phy-cells"
additionalProperties: false
examples:
- |
#include <dt-bindings/firmware/imx/rsrc.h>
usb3phy: usb3-phy@5b160000 {
compatible = "nxp,salvo-phy";
reg = <0x5b160000 0x40000>;
clocks = <&usb3_lpcg 4>;
clock-names = "salvo_phy_clk";
power-domains = <&pd IMX_SC_R_USB_2_PHY>;
#phy-cells = <0>;
};
Documentation/devicetree/bindings/phy/intel,combo-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/phy/intel,combo-phy.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Intel ComboPhy Subsystem
maintainers:
- Dilip Kota <eswara.kota@linux.intel.com>
description: |
Intel Combophy subsystem supports PHYs for PCIe, EMAC and SATA
controllers. A single Combophy provides two PHY instances.
properties:
$nodename:
pattern: "combophy(@.*|-[0-9a-f])*$"
compatible:
items:
- const: intel,combophy-lgm
- const: intel,combo-phy
clocks:
maxItems: 1
reg:
items:
- description: ComboPhy core registers
- description: PCIe app core control registers
reg-names:
items:
- const: core
- const: app
resets:
maxItems: 4
reset-names:
items:
- const: phy
- const: core
- const: iphy0
- const: iphy1
intel,syscfg:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: Chip configuration registers handle and ComboPhy instance id
intel,hsio:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: HSIO registers handle and ComboPhy instance id on NOC
intel,aggregation:
type: boolean
description: |
Specify the flag to configure ComboPHY in dual lane mode.
intel,phy-mode:
$ref: /schemas/types.yaml#/definitions/uint32
description: |
Mode of the two phys in ComboPhy.
See dt-bindings/phy/phy.h for values.
"#phy-cells":
const: 1
required:
- compatible
- clocks
- reg
- reg-names
- intel,syscfg
- intel,hsio
- intel,phy-mode
- "#phy-cells"
additionalProperties: false
examples:
- |
#include <dt-bindings/phy/phy.h>
combophy@d0a00000 {
compatible = "intel,combophy-lgm", "intel,combo-phy";
clocks = <&cgu0 1>;
#phy-cells = <1>;
reg = <0xd0a00000 0x40000>,
<0xd0a40000 0x1000>;
reg-names = "core", "app";
resets = <&rcu0 0x50 6>,
<&rcu0 0x50 17>,
<&rcu0 0x50 23>,
<&rcu0 0x50 24>;
reset-names = "phy", "core", "iphy0", "iphy1";
intel,syscfg = <&sysconf 0>;
intel,hsio = <&hsiol 0>;
intel,phy-mode = <PHY_TYPE_PCIE>;
intel,aggregation;
};
Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt deleted 100644 → 0
View file @ 3b69e8b4
* Amlogic Meson GXL and GXM USB3 PHY and OTG detection binding
Required properties:
- compatible: Should be "amlogic,meson-gxl-usb3-phy"
- #phys-cells: must be 0 (see phy-bindings.txt in this directory)
- reg: The base address and length of the registers
- interrupts: the interrupt specifier for the OTG detection
- clocks: phandles to the clocks for
- the USB3 PHY
- and peripheral mode/OTG detection
- clock-names: must contain "phy" and "peripheral"
- resets: phandle to the reset lines for:
- the USB3 PHY and
- peripheral mode/OTG detection
- reset-names: must contain "phy" and "peripheral"
Optional properties:
- phy-supply: see phy-bindings.txt in this directory
Example:
usb3_phy0: phy@78080 {
compatible = "amlogic,meson-gxl-usb3-phy";
#phy-cells = <0>;
reg = <0x0 0x78080 0x0 0x20>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkc CLKID_USB_OTG>, <&clkc_AO CLKID_AO_CEC_32K>;
clock-names = "phy", "peripheral";
resets = <&reset RESET_USB_OTG>, <&reset RESET_USB_OTG>;
reset-names = "phy", "peripheral";
};
Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt deleted 100644 → 0
View file @ 3b69e8b4
* Amlogic Meson8, Meson8b and GXBB USB2 PHY
Required properties:
- compatible: Depending on the platform this should be one of:
"amlogic,meson8-usb2-phy"
"amlogic,meson8b-usb2-phy"
"amlogic,meson-gxbb-usb2-phy"
- reg: The base address and length of the registers
- #phys-cells: should be 0 (see phy-bindings.txt in this directory)
- clocks: phandle and clock identifier for the phy clocks
- clock-names: "usb_general" and "usb"
Optional properties:
- resets: reference to the reset controller
- phy-supply: see phy-bindings.txt in this directory
Example:
usb0_phy: usb-phy@c0000000 {
compatible = "amlogic,meson-gxbb-usb2-phy";
#phy-cells = <0>;
reg = <0x0 0xc0000000 0x0 0x20>;
resets = <&reset RESET_USB_OTG>;
clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;
clock-names = "usb_general", "usb";
phy-supply = <&usb_vbus>;
};
Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/qcom,qmp-phy.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Qualcomm QMP PHY controller
maintainers:
- Manu Gautam <mgautam@codeaurora.org>
description:
QMP phy controller supports physical layer functionality for a number of
controllers on Qualcomm chipsets, such as, PCIe, UFS, and USB.
properties:
compatible:
enum:
- qcom,ipq8074-qmp-pcie-phy
- qcom,msm8996-qmp-pcie-phy
- qcom,msm8996-qmp-ufs-phy
- qcom,msm8996-qmp-usb3-phy
- qcom,msm8998-qmp-pcie-phy
- qcom,msm8998-qmp-ufs-phy
- qcom,msm8998-qmp-usb3-phy
- qcom,sdm845-qhp-pcie-phy
- qcom,sdm845-qmp-pcie-phy
- qcom,sdm845-qmp-ufs-phy
- qcom,sdm845-qmp-usb3-uni-phy
- qcom,sm8150-qmp-ufs-phy
- qcom,sm8250-qmp-ufs-phy
reg:
items:
- description: Address and length of PHY's common serdes block.
"#clock-cells":
enum: [ 1, 2 ]
"#address-cells":
enum: [ 1, 2 ]
"#size-cells":
enum: [ 1, 2 ]
clocks:
minItems: 1
maxItems: 4
clock-names:
minItems: 1
maxItems: 4
resets:
minItems: 1
maxItems: 3
reset-names:
minItems: 1
maxItems: 3
vdda-phy-supply:
description:
Phandle to a regulator supply to PHY core block.
vdda-pll-supply:
description:
Phandle to 1.8V regulator supply to PHY refclk pll block.
vddp-ref-clk-supply:
description:
Phandle to a regulator supply to any specific refclk
pll block.
#Required nodes:
patternProperties:
"^phy@[0-9a-f]+$":
type: object
description:
Each device node of QMP phy is required to have as many child nodes as
the number of lanes the PHY has.
required:
- compatible
- reg
- "#clock-cells"
- "#address-cells"
- "#size-cells"
- clocks
- clock-names
- resets
- reset-names
- vdda-phy-supply
- vdda-pll-supply
additionalProperties: false
allOf:
- if:
properties:
compatible:
contains:
enum:
- qcom,sdm845-qmp-usb3-uni-phy
then:
properties:
clocks:
items:
- description: Phy aux clock.
- description: Phy config clock.
- description: 19.2 MHz ref clk.
- description: Phy common block aux clock.
clock-names:
items:
- const: aux
- const: cfg_ahb
- const: ref
- const: com_aux
resets:
items:
- description: reset of phy block.
- description: phy common block reset.
reset-names:
items:
- const: phy
- const: common
- if:
properties:
compatible:
contains:
enum:
- qcom,msm8996-qmp-pcie-phy
then:
properties:
clocks:
items:
- description: Phy aux clock.
- description: Phy config clock.
- description: 19.2 MHz ref clk.
clock-names:
items:
- const: aux
- const: cfg_ahb
- const: ref
resets:
items:
- description: reset of phy block.
- description: phy common block reset.
- description: phy's ahb cfg block reset.
reset-names:
items:
- const: phy
- const: common
- const: cfg
- if:
properties:
compatible:
contains:
enum:
- qcom,msm8996-qmp-usb3-phy
- qcom,msm8998-qmp-pcie-phy
- qcom,msm8998-qmp-usb3-phy
then:
properties:
clocks:
items:
- description: Phy aux clock.
- description: Phy config clock.
- description: 19.2 MHz ref clk.
clock-names:
items:
- const: aux
- const: cfg_ahb
- const: ref
resets:
items:
- description: reset of phy block.
- description: phy common block reset.
reset-names:
items:
- const: phy
- const: common
- if:
properties:
compatible:
contains:
enum:
- qcom,msm8996-qmp-ufs-phy
then:
properties:
clocks:
items:
- description: 19.2 MHz ref clk.
clock-names:
items:
- const: ref
resets:
items:
- description: PHY reset in the UFS controller.
reset-names:
items:
- const: ufsphy
- if:
properties:
compatible:
contains:
enum:
- qcom,msm8998-qmp-ufs-phy
- qcom,sdm845-qmp-ufs-phy
- qcom,sm8150-qmp-ufs-phy
- qcom,sm8250-qmp-ufs-phy
then:
properties:
clocks:
items:
- description: 19.2 MHz ref clk.
- description: Phy reference aux clock.
clock-names:
items:
- const: ref
- const: ref_aux
resets:
items:
- description: PHY reset in the UFS controller.
reset-names:
items:
- const: ufsphy
- if:
properties:
compatible:
contains:
enum:
- qcom,ipq8074-qmp-pcie-phy
then:
properties:
clocks:
items:
- description: pipe clk.
clock-names:
items:
- const: pipe_clk
resets:
items:
- description: reset of phy block.
- description: phy common block reset.
reset-names:
items:
- const: phy
- const: common
- if:
properties:
compatible:
contains:
enum:
- qcom,sdm845-qhp-pcie-phy
- qcom,sdm845-qmp-pcie-phy
then:
properties:
clocks:
items:
- description: Phy aux clock.
- description: Phy config clock.
- description: 19.2 MHz ref clk.
- description: Phy refgen clk.
clock-names:
items:
- const: aux
- const: cfg_ahb
- const: ref
- const: refgen
resets:
items:
- description: reset of phy block.
reset-names:
items:
- const: phy
examples:
- |
#include <dt-bindings/clock/qcom,gcc-sdm845.h>
usb_2_qmpphy: phy-wrapper@88eb000 {
compatible = "qcom,sdm845-qmp-usb3-uni-phy";
reg = <0 0x088eb000 0 0x18c>;
#clock-cells = <1>;
#address-cells = <2>;
#size-cells = <2>;
clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK >,
<&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
<&gcc GCC_USB3_SEC_CLKREF_CLK>,
<&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>;
clock-names = "aux", "cfg_ahb", "ref", "com_aux";
resets = <&gcc GCC_USB3PHY_PHY_SEC_BCR>,
<&gcc GCC_USB3_PHY_SEC_BCR>;
reset-names = "phy", "common";
vdda-phy-supply = <&vdda_usb2_ss_1p2>;
vdda-pll-supply = <&vdda_usb2_ss_core>;
usb_2_ssphy: phy@88eb200 {
reg = <0 0x088eb200 0 0x128>,
<0 0x088eb400 0 0x1fc>,
<0 0x088eb800 0 0x218>,
<0 0x088eb600 0 0x70>;
#clock-cells = <0>;
#phy-cells = <0>;
clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>;
clock-names = "pipe0";
clock-output-names = "usb3_uni_phy_pipe_clk_src";
};
};
Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/qcom,qmp-usb3-dp-phy.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Qualcomm QMP USB3 DP PHY controller
maintainers:
- Manu Gautam <mgautam@codeaurora.org>
properties:
compatible:
enum:
- qcom,sc7180-qmp-usb3-phy
- qcom,sdm845-qmp-usb3-phy
reg:
items:
- description: Address and length of PHY's common serdes block.
- description: Address and length of the DP_COM control block.
reg-names:
items:
- const: reg-base
- const: dp_com
"#clock-cells":
enum: [ 1, 2 ]
"#address-cells":
enum: [ 1, 2 ]
"#size-cells":
enum: [ 1, 2 ]
clocks:
items:
- description: Phy aux clock.
- description: Phy config clock.
- description: 19.2 MHz ref clk.
- description: Phy common block aux clock.
clock-names:
items:
- const: aux
- const: cfg_ahb
- const: ref
- const: com_aux
resets:
items:
- description: reset of phy block.
- description: phy common block reset.
reset-names:
items:
- const: phy
- const: common
vdda-phy-supply:
description:
Phandle to a regulator supply to PHY core block.
vdda-pll-supply:
description:
Phandle to 1.8V regulator supply to PHY refclk pll block.
vddp-ref-clk-supply:
description:
Phandle to a regulator supply to any specific refclk
pll block.
#Required nodes:
patternProperties:
"^phy@[0-9a-f]+$":
type: object
description:
Each device node of QMP phy is required to have as many child nodes as
the number of lanes the PHY has.
required:
- compatible
- reg
- reg-names
- "#clock-cells"
- "#address-cells"
- "#size-cells"
- clocks
- clock-names
- resets
- reset-names
- vdda-phy-supply
- vdda-pll-supply
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/qcom,gcc-sdm845.h>
usb_1_qmpphy: phy-wrapper@88e9000 {
compatible = "qcom,sdm845-qmp-usb3-phy";
reg = <0 0x088e9000 0 0x18c>,
<0 0x088e8000 0 0x10>;
reg-names = "reg-base", "dp_com";
#clock-cells = <1>;
#address-cells = <2>;
#size-cells = <2>;
clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
<&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
<&gcc GCC_USB3_PRIM_CLKREF_CLK>,
<&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
clock-names = "aux", "cfg_ahb", "ref", "com_aux";
resets = <&gcc GCC_USB3_PHY_PRIM_BCR>,
<&gcc GCC_USB3_DP_PHY_PRIM_BCR>;
reset-names = "phy", "common";
vdda-phy-supply = <&vdda_usb2_ss_1p2>;
vdda-pll-supply = <&vdda_usb2_ss_core>;
usb_1_ssphy: phy@88e9200 {
reg = <0 0x088e9200 0 0x128>,
<0 0x088e9400 0 0x200>,
<0 0x088e9c00 0 0x218>,
<0 0x088e9600 0 0x128>,
<0 0x088e9800 0 0x200>,
<0 0x088e9a00 0 0x100>;
#clock-cells = <0>;
#phy-cells = <0>;
clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
clock-names = "pipe0";
clock-output-names = "usb3_phy_pipe_clk_src";
};
};
Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/qcom,usb-snps-femto-v2.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Qualcomm Synopsys Femto High-Speed USB PHY V2
maintainers:
- Wesley Cheng <wcheng@codeaurora.org>
description: |
Qualcomm High-Speed USB PHY
properties:
compatible:
enum:
- qcom,usb-snps-hs-7nm-phy
- qcom,sm8150-usb-hs-phy
- qcom,usb-snps-femto-v2-phy
reg:
maxItems: 1
"#phy-cells":
const: 0
clocks:
items:
- description: rpmhcc ref clock
clock-names:
items:
- const: ref
resets:
items:
- description: PHY core reset
vdda-pll-supply:
description: phandle to the regulator VDD supply node.
vdda18-supply:
description: phandle to the regulator 1.8V supply node.
vdda33-supply:
description: phandle to the regulator 3.3V supply node.
required:
- compatible
- reg
- "#phy-cells"
- clocks
- clock-names
- resets
- vdda-pll-supply
- vdda18-supply
- vdda33-supply
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/clock/qcom,gcc-sm8150.h>
phy@88e2000 {
compatible = "qcom,sm8150-usb-hs-phy";
reg = <0 0x088e2000 0 0x400>;
#phy-cells = <0>;
clocks = <&rpmhcc RPMH_CXO_CLK>;
clock-names = "ref";
resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
vdda-pll-supply = <&vdd_usb_hs_core>;
vdda33-supply = <&vdda_usb_hs_3p1>;
vdda18-supply = <&vdda_usb_hs_1p8>;
};
...
Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt deleted 100644 → 0
View file @ 3b69e8b4
Qualcomm QMP PHY controller
===========================
QMP phy controller supports physical layer functionality for a number of
controllers on Qualcomm chipsets, such as, PCIe, UFS, and USB.
Required properties:
- compatible: compatible list, contains:
"qcom,ipq8074-qmp-pcie-phy" for PCIe phy on IPQ8074
"qcom,msm8996-qmp-pcie-phy" for 14nm PCIe phy on msm8996,
"qcom,msm8996-qmp-ufs-phy" for 14nm UFS phy on msm8996,
"qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,
"qcom,msm8998-qmp-usb3-phy" for USB3 QMP V3 phy on msm8998,
"qcom,msm8998-qmp-ufs-phy" for UFS QMP phy on msm8998,
"qcom,msm8998-qmp-pcie-phy" for PCIe QMP phy on msm8998,
"qcom,sdm845-qhp-pcie-phy" for QHP PCIe phy on sdm845,
"qcom,sdm845-qmp-pcie-phy" for QMP PCIe phy on sdm845,
"qcom,sdm845-qmp-usb3-phy" for USB3 QMP V3 phy on sdm845,
"qcom,sdm845-qmp-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845,
"qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845,
"qcom,sm8150-qmp-ufs-phy" for UFS QMP phy on sm8150.
- reg:
- index 0: address and length of register set for PHY's common
serdes block.
- index 1: address and length of the DP_COM control block (for
"qcom,sdm845-qmp-usb3-phy" only).
- reg-names:
- For "qcom,sdm845-qmp-usb3-phy":
- Should be: "reg-base", "dp_com"
- For all others:
- The reg-names property shouldn't be defined.
- #address-cells: must be 1
- #size-cells: must be 1
- ranges: must be present
- clocks: a list of phandles and clock-specifier pairs,
one for each entry in clock-names.
- clock-names: "cfg_ahb" for phy config clock,
"aux" for phy aux clock,
"ref" for 19.2 MHz ref clk,
"com_aux" for phy common block aux clock,
"ref_aux" for phy reference aux clock,
For "qcom,ipq8074-qmp-pcie-phy": no clocks are listed.
For "qcom,msm8996-qmp-pcie-phy" must contain:
"aux", "cfg_ahb", "ref".
For "qcom,msm8996-qmp-ufs-phy" must contain:
"ref".
For "qcom,msm8996-qmp-usb3-phy" must contain:
"aux", "cfg_ahb", "ref".
For "qcom,msm8998-qmp-usb3-phy" must contain:
"aux", "cfg_ahb", "ref".
For "qcom,msm8998-qmp-ufs-phy" must contain:
"ref", "ref_aux".
For "qcom,msm8998-qmp-pcie-phy" must contain:
"aux", "cfg_ahb", "ref".
For "qcom,sdm845-qhp-pcie-phy" must contain:
"aux", "cfg_ahb", "ref", "refgen".
For "qcom,sdm845-qmp-pcie-phy" must contain:
"aux", "cfg_ahb", "ref", "refgen".
For "qcom,sdm845-qmp-usb3-phy" must contain:
"aux", "cfg_ahb", "ref", "com_aux".
For "qcom,sdm845-qmp-usb3-uni-phy" must contain:
"aux", "cfg_ahb", "ref", "com_aux".
For "qcom,sdm845-qmp-ufs-phy" must contain:
"ref", "ref_aux".
For "qcom,sm8150-qmp-ufs-phy" must contain:
"ref", "ref_aux".
- resets: a list of phandles and reset controller specifier pairs,
one for each entry in reset-names.
- reset-names: "phy" for reset of phy block,
"common" for phy common block reset,
"cfg" for phy's ahb cfg block reset,
"ufsphy" for the PHY reset in the UFS controller.
For "qcom,ipq8074-qmp-pcie-phy" must contain:
"phy", "common".
For "qcom,msm8996-qmp-pcie-phy" must contain:
"phy", "common", "cfg".
For "qcom,msm8996-qmp-ufs-phy": must contain:
"ufsphy".
For "qcom,msm8996-qmp-usb3-phy" must contain
"phy", "common".
For "qcom,msm8998-qmp-usb3-phy" must contain
"phy", "common".
For "qcom,msm8998-qmp-ufs-phy": must contain:
"ufsphy".
For "qcom,msm8998-qmp-pcie-phy" must contain:
"phy", "common".
For "qcom,sdm845-qhp-pcie-phy" must contain:
"phy".
For "qcom,sdm845-qmp-pcie-phy" must contain:
"phy".
For "qcom,sdm845-qmp-usb3-phy" must contain:
"phy", "common".
For "qcom,sdm845-qmp-usb3-uni-phy" must contain:
"phy", "common".
For "qcom,sdm845-qmp-ufs-phy": must contain:
"ufsphy".
For "qcom,sm8150-qmp-ufs-phy": must contain:
"ufsphy".
- vdda-phy-supply: Phandle to a regulator supply to PHY core block.
- vdda-pll-supply: Phandle to 1.8V regulator supply to PHY refclk pll block.
Optional properties:
- vddp-ref-clk-supply: Phandle to a regulator supply to any specific refclk
pll block.
Required nodes:
- Each device node of QMP phy is required to have as many child nodes as
the number of lanes the PHY has.
Required properties for child nodes of PCIe PHYs (one child per lane):
- reg: list of offset and length pairs of register sets for PHY blocks -
tx, rx, pcs, and pcs_misc (optional).
- #phy-cells: must be 0
Required properties for a single "lanes" child node of non-PCIe PHYs:
- reg: list of offset and length pairs of register sets for PHY blocks
For 1-lane devices:
tx, rx, pcs, and (optionally) pcs_misc
For 2-lane devices:
tx0, rx0, pcs, tx1, rx1, and (optionally) pcs_misc
- #phy-cells: must be 0
Required properties for child node of PCIe and USB3 qmp phys:
- clocks: a list of phandles and clock-specifier pairs,
one for each entry in clock-names.
- clock-names: Must contain following:
"pipe<lane-number>" for pipe clock specific to each lane.
- clock-output-names: Name of the PHY clock that will be the parent for
the above pipe clock.
For "qcom,ipq8074-qmp-pcie-phy":
- "pcie20_phy0_pipe_clk" Pipe Clock parent
(or)
"pcie20_phy1_pipe_clk"
- #clock-cells: must be 0
- Phy pll outputs pipe clocks for pipe based PHYs. These clocks are then
gate-controlled by the gcc.
Required properties for child node of PHYs with lane reset, AKA:
"qcom,msm8996-qmp-pcie-phy"
- resets: a list of phandles and reset controller specifier pairs,
one for each entry in reset-names.
- reset-names: Must contain following:
"lane<lane-number>" for reset specific to each lane.
Example:
phy@34000 {
compatible = "qcom,msm8996-qmp-pcie-phy";
reg = <0x34000 0x488>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>,
<&gcc GCC_PCIE_PHY_CFG_AHB_CLK>,
<&gcc GCC_PCIE_CLKREF_CLK>;
clock-names = "aux", "cfg_ahb", "ref";
vdda-phy-supply = <&pm8994_l28>;
vdda-pll-supply = <&pm8994_l12>;
resets = <&gcc GCC_PCIE_PHY_BCR>,
<&gcc GCC_PCIE_PHY_COM_BCR>,
<&gcc GCC_PCIE_PHY_COM_NOCSR_BCR>;
reset-names = "phy", "common", "cfg";
pciephy_0: lane@35000 {
reg = <0x35000 0x130>,
<0x35200 0x200>,
<0x35400 0x1dc>;
#clock-cells = <0>;
#phy-cells = <0>;
clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
clock-names = "pipe0";
clock-output-names = "pcie_0_pipe_clk_src";
resets = <&gcc GCC_PCIE_0_PHY_BCR>;
reset-names = "lane0";
};
pciephy_1: lane@36000 {
...
...
};
phy@88eb000 {
compatible = "qcom,sdm845-qmp-usb3-uni-phy";
reg = <0x88eb000 0x18c>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>,
<&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
<&gcc GCC_USB3_SEC_CLKREF_CLK>,
<&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>;
clock-names = "aux", "cfg_ahb", "ref", "com_aux";
resets = <&gcc GCC_USB3PHY_PHY_SEC_BCR>,
<&gcc GCC_USB3_PHY_SEC_BCR>;
reset-names = "phy", "common";
lane@88eb200 {
reg = <0x88eb200 0x128>,
<0x88eb400 0x1fc>,
<0x88eb800 0x218>,
<0x88eb600 0x70>;
#clock-cells = <0>;
#phy-cells = <0>;
clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>;
clock-names = "pipe0";
clock-output-names = "usb3_uni_phy_pipe_clk_src";
};
};
phy@1d87000 {
compatible = "qcom,sdm845-qmp-ufs-phy";
reg = <0x1d87000 0x18c>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
clock-names = "ref",
"ref_aux";
clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>,
<&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
lanes@1d87400 {
reg = <0x1d87400 0x108>,
<0x1d87600 0x1e0>,
<0x1d87c00 0x1dc>,
<0x1d87800 0x108>,
<0x1d87a00 0x1e0>;
#phy-cells = <0>;
};
};
Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/qcom-usb-ipq4019-phy.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Qualcom IPQ40xx Dakota HS/SS USB PHY
maintainers:
- Robert Marko <robert.marko@sartura.hr>
properties:
compatible:
enum:
- qcom,usb-ss-ipq4019-phy
- qcom,usb-hs-ipq4019-phy
reg:
maxItems: 1
resets:
maxItems: 2
reset-names:
items:
- const: por_rst
- const: srif_rst
"#phy-cells":
const: 0
required:
- compatible
- reg
- resets
- reset-names
- "#phy-cells"
examples:
- |
#include <dt-bindings/clock/qcom,gcc-ipq4019.h>
hsphy@a8000 {
#phy-cells = <0>;
compatible = "qcom,usb-hs-ipq4019-phy";
reg = <0xa8000 0x40>;
resets = <&gcc USB2_HSPHY_POR_ARES>,
<&gcc USB2_HSPHY_S_ARES>;
reset-names = "por_rst", "srif_rst";
};
Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt deleted 100644 → 0
View file @ 3b69e8b4
* Renesas R-Car generation 3 USB 2.0 PHY
This file provides information on what the device node for the R-Car generation
3, RZ/G1C, RZ/G2 and RZ/A2 USB 2.0 PHY contain.
Required properties:
- compatible: "renesas,usb2-phy-r7s9210" if the device is a part of an R7S9210
SoC.
"renesas,usb2-phy-r8a77470" if the device is a part of an R8A77470
SoC.
"renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1
SoC.
"renesas,usb2-phy-r8a774b1" if the device is a part of an R8A774B1
SoC.
"renesas,usb2-phy-r8a774c0" if the device is a part of an R8A774C0
SoC.
"renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
SoC.
"renesas,usb2-phy-r8a7796" if the device is a part of an R8A7796
SoC.
"renesas,usb2-phy-r8a77965" if the device is a part of an
R8A77965 SoC.
"renesas,usb2-phy-r8a77990" if the device is a part of an
R8A77990 SoC.
"renesas,usb2-phy-r8a77995" if the device is a part of an
R8A77995 SoC.
"renesas,rcar-gen3-usb2-phy" for a generic R-Car Gen3, RZ/G2 or
RZ/A2 compatible device.
When compatible with the generic version, nodes must list the
SoC-specific version corresponding to the platform first
followed by the generic version.
- reg: offset and length of the partial USB 2.0 Host register block.
- clocks: clock phandle and specifier pair(s).
- #phy-cells: see phy-bindings.txt in the same directory, must be <1> (and
using <0> is deprecated).
The phandle's argument in the PHY specifier is the INT_STATUS bit of controller:
- 1 = USBH_INTA (OHCI)
- 2 = USBH_INTB (EHCI)
- 3 = UCOM_INT (OTG and BC)
Optional properties:
To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are
combined, the device tree node should set interrupt properties to use the
channel as USB OTG:
- interrupts: interrupt specifier for the PHY.
- vbus-supply: Phandle to a regulator that provides power to the VBUS. This
regulator will be managed during the PHY power on/off sequence.
- renesas,no-otg-pins: boolean, specify when a board does not provide proper
otg pins.
- dr_mode: string, indicates the working mode for the PHY. Can be "host",
"peripheral", or "otg". Should be set if otg controller is not used.
Example (R-Car H3):
usb-phy@ee080200 {
compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
reg = <0 0xee080200 0 0x700>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 703>;
};
usb-phy@ee0a0200 {
compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
reg = <0 0xee0a0200 0 0x700>;
clocks = <&cpg CPG_MOD 702>;
};
Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt deleted 100644 → 0
View file @ 3b69e8b4
* Renesas R-Car generation 3 USB 3.0 PHY
This file provides information on what the device node for the R-Car generation
3 and RZ/G2 USB 3.0 PHY contain.
If you want to enable spread spectrum clock (ssc), you should use USB_EXTAL
instead of USB3_CLK. However, if you don't want to these features, you don't
need this driver.
Required properties:
- compatible: "renesas,r8a774a1-usb3-phy" if the device is a part of an R8A774A1
SoC.
"renesas,r8a774b1-usb3-phy" if the device is a part of an R8A774B1
SoC.
"renesas,r8a7795-usb3-phy" if the device is a part of an R8A7795
SoC.
"renesas,r8a7796-usb3-phy" if the device is a part of an R8A7796
SoC.
"renesas,r8a77965-usb3-phy" if the device is a part of an
R8A77965 SoC.
"renesas,rcar-gen3-usb3-phy" for a generic R-Car Gen3 or RZ/G2
compatible device.
When compatible with the generic version, nodes must list the
SoC-specific version corresponding to the platform first
followed by the generic version.
- reg: offset and length of the USB 3.0 PHY register block.
- clocks: A list of phandles and clock-specifier pairs.
- clock-names: Name of the clocks.
- The funcional clock must be "usb3-if".
- The usb3's external clock must be "usb3s_clk".
- The usb2's external clock must be "usb_extal". If you want to use the ssc,
the clock-frequency must not be 0.
- #phy-cells: see phy-bindings.txt in the same directory, must be <0>.
Optional properties:
- renesas,ssc-range: Enable/disable spread spectrum clock (ssc) by using
the following values as u32:
- 0 (or the property doesn't exist): disable the ssc
- 4980: enable the ssc as -4980 ppm
- 4492: enable the ssc as -4492 ppm
- 4003: enable the ssc as -4003 ppm
Example (R-Car H3):
usb-phy@e65ee000 {
compatible = "renesas,r8a7795-usb3-phy",
"renesas,rcar-gen3-usb3-phy";
reg = <0 0xe65ee000 0 0x90>;
clocks = <&cpg CPG_MOD 328>, <&usb3s0_clk>, <&usb_extal>;
clock-names = "usb3-if", "usb3s_clk", "usb_extal";
};
Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/phy/renesas,usb2-phy.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Renesas R-Car generation 3 USB 2.0 PHY
maintainers:
- Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
properties:
compatible:
oneOf:
- items:
- const: renesas,usb2-phy-r8a77470 # RZ/G1C
- items:
- enum:
- renesas,usb2-phy-r7s9210 # RZ/A2
- renesas,usb2-phy-r8a774a1 # RZ/G2M
- renesas,usb2-phy-r8a774b1 # RZ/G2N
- renesas,usb2-phy-r8a774c0 # RZ/G2E
- renesas,usb2-phy-r8a7795 # R-Car H3
- renesas,usb2-phy-r8a7796 # R-Car M3-W
- renesas,usb2-phy-r8a77961 # R-Car M3-W+
- renesas,usb2-phy-r8a77965 # R-Car M3-N
- renesas,usb2-phy-r8a77990 # R-Car E3
- renesas,usb2-phy-r8a77995 # R-Car D3
- const: renesas,rcar-gen3-usb2-phy
reg:
maxItems: 1
clocks:
minItems: 1
maxItems: 2
clock-names:
minItems: 1
maxItems: 2
items:
- const: fck
- const: usb_x1
'#phy-cells':
enum: [0, 1] # and 0 is deprecated.
description: |
The phandle's argument in the PHY specifier is the INT_STATUS bit of
controller.
- 1 = USBH_INTA (OHCI)
- 2 = USBH_INTB (EHCI)
- 3 = UCOM_INT (OTG and BC)
interrupts:
maxItems: 1
power-domains:
maxItems: 1
resets:
minItems: 1
maxItems: 2
items:
- description: reset of USB 2.0 host side
- description: reset of USB 2.0 peripheral side
vbus-supply:
description: |
Phandle to a regulator that provides power to the VBUS. This regulator
will be managed during the PHY power on/off sequence.
renesas,no-otg-pins:
$ref: /schemas/types.yaml#/definitions/flag
description: |
specify when a board does not provide proper otg pins.
dr_mode: true
if:
properties:
compatible:
items:
enum:
- renesas,usb2-phy-r7s9210
then:
required:
- clock-names
required:
- compatible
- reg
- clocks
- '#phy-cells'
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/r8a7795-cpg-mssr.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/r8a7795-sysc.h>
usb-phy@ee080200 {
compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
reg = <0xee080200 0x700>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 703>;
#phy-cells = <1>;
};
usb-phy@ee0a0200 {
compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
reg = <0xee0a0200 0x700>;
clocks = <&cpg CPG_MOD 702>;
#phy-cells = <1>;
};
Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/phy/renesas,usb3-phy.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Renesas R-Car generation 3 USB 3.0 PHY
maintainers:
- Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
properties:
compatible:
items:
- enum:
- renesas,r8a774a1-usb3-phy # RZ/G2M
- renesas,r8a774b1-usb3-phy # RZ/G2N
- renesas,r8a7795-usb3-phy # R-Car H3
- renesas,r8a7796-usb3-phy # R-Car M3-W
- renesas,r8a77961-usb3-phy # R-Car M3-W+
- renesas,r8a77965-usb3-phy # R-Car M3-N
- const: renesas,rcar-gen3-usb3-phy
reg:
maxItems: 1
clocks:
minItems: 2
maxItems: 3
clock-names:
# If you want to use the ssc, the clock-frequency of usb_extal
# must not be 0.
minItems: 2
maxItems: 3
items:
- const: usb3-if # The funcional clock
- const: usb3s_clk # The usb3's external clock
- const: usb_extal # The usb2's external clock
'#phy-cells':
# see phy-bindings.txt in the same directory
const: 0
power-domains:
maxItems: 1
resets:
maxItems: 1
renesas,ssc-range:
description: |
Enable/disable spread spectrum clock (ssc). 0 or the property doesn't
exist means disabling the ssc. The actual value will be -<value> ppm.
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
- enum: [ 0, 4003, 4492, 4980 ]
required:
- compatible
- reg
- clocks
- clock-names
- '#phy-cells'
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/r8a7795-cpg-mssr.h>
#include <dt-bindings/power/r8a7795-sysc.h>
usb-phy@e65ee000 {
compatible = "renesas,r8a7795-usb3-phy", "renesas,rcar-gen3-usb3-phy";
reg = <0xe65ee000 0x90>;
clocks = <&cpg CPG_MOD 328>, <&usb3s0_clk>, <&usb_extal>;
clock-names = "usb3-if", "usb3s_clk", "usb_extal";
#phy-cells = <0>;
};
Documentation/devicetree/bindings/usb/amlogic,dwc3.txt deleted 100644 → 0
View file @ 3b69e8b4
Amlogic Meson GX DWC3 USB SoC controller
Required properties:
- compatible: depending on the SoC this should contain one of:
* amlogic,meson-axg-dwc3
* amlogic,meson-gxl-dwc3
- clocks: a handle for the "USB general" clock
- clock-names: must be "usb_general"
- resets: a handle for the shared "USB OTG" reset line
- reset-names: must be "usb_otg"
Required child node:
A child node must exist to represent the core DWC3 IP block. The name of
the node is not important. The content of the node is defined in dwc3.txt.
PHY documentation is provided in the following places:
- Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt
- Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt
Example device nodes:
usb0: usb@ff500000 {
compatible = "amlogic,meson-axg-dwc3";
#address-cells = <2>;
#size-cells = <2>;
ranges;
clocks = <&clkc CLKID_USB>;
clock-names = "usb_general";
resets = <&reset RESET_USB_OTG>;
reset-names = "usb_otg";
dwc3: dwc3@ff500000 {
compatible = "snps,dwc3";
reg = <0x0 0xff500000 0x0 0x100000>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host";
maximum-speed = "high-speed";
snps,dis_u2_susphy_quirk;
phys = <&usb3_phy>, <&usb2_phy0>;
phy-names = "usb2-phy", "usb3-phy";
};
};
Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
View file @ e611c0fe
...@@ -25,9 +25,13 @@ description: | ...@@ -25,9 +25,13 @@ description: |
The Amlogic A1 embeds a DWC3 USB IP Core configured for USB2 in The Amlogic A1 embeds a DWC3 USB IP Core configured for USB2 in
host-only mode. host-only mode.
The Amlogic GXL & GXM SoCs doesn't embed an USB3 PHY.
properties: properties:
compatible: compatible:
enum: enum:
- amlogic,meson-gxl-usb-ctrl
- amlogic,meson-gxm-usb-ctrl
- amlogic,meson-g12a-usb-ctrl - amlogic,meson-g12a-usb-ctrl
- amlogic,meson-a1-usb-ctrl - amlogic,meson-a1-usb-ctrl
...@@ -41,6 +45,11 @@ properties: ...@@ -41,6 +45,11 @@ properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 3
clock-names:
minItems: 1
maxItems: 3
resets: resets:
minItems: 1 minItems: 1
...@@ -52,10 +61,8 @@ properties: ...@@ -52,10 +61,8 @@ properties:
maxItems: 1 maxItems: 1
phy-names: phy-names:
items: minItems: 1
- const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used maxItems: 3
- const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used
- const: usb3-phy0 # USB3 PHY if USB3_0 is used
phys: phys:
minItems: 1 minItems: 1
...@@ -89,6 +96,61 @@ required: ...@@ -89,6 +96,61 @@ required:
- dr_mode - dr_mode
allOf: allOf:
- if:
properties:
compatible:
enum:
- amlogic,meson-g12a-usb-ctrl
then:
properties:
phy-names:
items:
- const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used
- const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used
- const: usb3-phy0 # USB3 PHY if USB3_0 is used
- if:
properties:
compatible:
enum:
- amlogic,meson-gxl-usb-ctrl
then:
properties:
clocks:
minItems: 2
clock-names:
items:
- const: usb_ctrl
- const: ddr
phy-names:
items:
- const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used
- const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used
required:
- clock-names
- if:
properties:
compatible:
enum:
- amlogic,meson-gxm-usb-ctrl
then:
properties:
clocks:
minItems: 2
clock-names:
items:
- const: usb_ctrl
- const: ddr
phy-names:
items:
- const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used
- const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used
- const: usb2-phy2 # USB2 PHY2 if USBOTG_C port is used
required:
- clock-names
- if: - if:
properties: properties:
compatible: compatible:
...@@ -97,6 +159,9 @@ allOf: ...@@ -97,6 +159,9 @@ allOf:
then: then:
properties: properties:
phy-names:
items:
- const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used
clocks: clocks:
minItems: 3 minItems: 3
clock-names: clock-names:
......
Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
View file @ e611c0fe
...@@ -50,6 +50,59 @@ properties: ...@@ -50,6 +50,59 @@ properties:
minimum: 1 minimum: 1
maximum: 21 maximum: 21
vhub-vendor-id:
description: vhub Vendor ID
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
- maximum: 65535
vhub-product-id:
description: vhub Product ID
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
- maximum: 65535
vhub-device-revision:
description: vhub Device Revision in binary-coded decimal
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
- maximum: 65535
vhub-strings:
type: object
properties:
'#address-cells':
const: 1
'#size-cells':
const: 0
patternProperties:
'^string@[0-9a-f]+$':
type: object
description: string descriptors of the specific language
properties:
reg:
maxItems: 1
description: 16-bit Language Identifier defined by USB-IF
manufacturer:
description: vhub manufacturer
allOf:
- $ref: /schemas/types.yaml#/definitions/string
product:
description: vhub product name
allOf:
- $ref: /schemas/types.yaml#/definitions/string
serial-number:
description: vhub device serial number
allOf:
- $ref: /schemas/types.yaml#/definitions/string
required: required:
- compatible - compatible
- reg - reg
...@@ -72,4 +125,19 @@ examples: ...@@ -72,4 +125,19 @@ examples:
aspeed,vhub-generic-endpoints = <15>; aspeed,vhub-generic-endpoints = <15>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb2ad_default>; pinctrl-0 = <&pinctrl_usb2ad_default>;
vhub-vendor-id = <0x1d6b>;
vhub-product-id = <0x0107>;
vhub-device-revision = <0x0100>;
vhub-strings {
#address-cells = <1>;
#size-cells = <0>;
string@0409 {
reg = <0x0409>;
manufacturer = "ASPEED";
product = "USB Virtual Hub";
serial-number = "0000";
};
};
}; };
Documentation/devicetree/bindings/usb/atmel-usb.txt
View file @ e611c0fe
...@@ -88,13 +88,15 @@ Required properties: ...@@ -88,13 +88,15 @@ Required properties:
- clock-names: Should contain two strings - clock-names: Should contain two strings
"pclk" for the peripheral clock "pclk" for the peripheral clock
"hclk" for the host clock "hclk" for the host clock
Deprecated property:
- ep childnode: To specify the number of endpoints and their properties. - ep childnode: To specify the number of endpoints and their properties.
Optional properties: Optional properties:
- atmel,vbus-gpio: If present, specifies a gpio that allows to detect whether - atmel,vbus-gpio: If present, specifies a gpio that allows to detect whether
vbus is present (USB is connected). vbus is present (USB is connected).
Required child node properties: Deprecated child node properties:
- name: Name of the endpoint. - name: Name of the endpoint.
- reg: Num of the endpoint. - reg: Num of the endpoint.
- atmel,fifo-size: Size of the fifo. - atmel,fifo-size: Size of the fifo.
...@@ -112,56 +114,4 @@ usb2: gadget@fff78000 { ...@@ -112,56 +114,4 @@ usb2: gadget@fff78000 {
clocks = <&utmi>, <&udphs_clk>; clocks = <&utmi>, <&udphs_clk>;
clock-names = "hclk", "pclk"; clock-names = "hclk", "pclk";
atmel,vbus-gpio = <&pioB 19 0>; atmel,vbus-gpio = <&pioB 19 0>;
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
}; };
Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/usb/brcm,bcm7445-ehci.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Broadcom STB USB EHCI Controller Device Tree Bindings
allOf:
- $ref: "usb-hcd.yaml"
maintainers:
- Al Cooper <alcooperx@gmail.com>
properties:
compatible:
const: brcm,bcm7445-ehci
reg:
maxItems: 1
interrupts:
maxItems: 1
clocks:
maxItems: 1
description: Clock specifier for the EHCI clock
clock-names:
const: sw_usb
phys:
maxItems: 1
phy-names:
const: usbphy
required:
- compatible
- reg
- interrupts
- phys
- clocks
additionalProperties: false
examples:
- |
usb@f0b00300 {
compatible = "brcm,bcm7445-ehci";
reg = <0xf0b00300 0xa8>;
interrupts = <0x0 0x5a 0x0>;
phys = <&usbphy_0 0x0>;
phy-names = "usbphy";
clocks = <&usb20>;
clock-names = "sw_usb";
};
...
Documentation/devicetree/bindings/usb/dwc3.txt
View file @ e611c0fe
...@@ -15,8 +15,6 @@ Required properties: ...@@ -15,8 +15,6 @@ Required properties:
Exception for clocks: Exception for clocks:
clocks are optional if the parent node (i.e. glue-layer) is compatible to clocks are optional if the parent node (i.e. glue-layer) is compatible to
one of the following: one of the following:
"amlogic,meson-axg-dwc3"
"amlogic,meson-gxl-dwc3"
"cavium,octeon-7130-usb-uctl" "cavium,octeon-7130-usb-uctl"
"qcom,dwc3" "qcom,dwc3"
"samsung,exynos5250-dwusb3" "samsung,exynos5250-dwusb3"
......
Documentation/devicetree/bindings/usb/keystone-usb.txt deleted 100644 → 0
View file @ 3b69e8b4
TI Keystone Soc USB Controller
DWC3 GLUE
Required properties:
- compatible: should be
"ti,keystone-dwc3" for Keystone 2 SoCs
"ti,am654-dwc3" for AM654 SoC
- #address-cells, #size-cells : should be '1' if the device has sub-nodes
with 'reg' property.
- reg : Address and length of the register set for the USB subsystem on
the SOC.
- interrupts : The irq number of this device that is used to interrupt the
MPU.
- ranges: allows valid 1:1 translation between child's address space and
parent's address space.
SoC-specific Required Properties:
The following are mandatory properties for Keystone 2 66AK2HK, 66AK2L and 66AK2E
SoCs only:
- clocks: Clock ID for USB functional clock.
- clock-names: Must be "usb".
The following are mandatory properties for 66AK2G and AM654:
- power-domains: Should contain a phandle to a PM domain provider node
and an args specifier containing the USB device id
value. This property is as per the binding,
Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
Sub-nodes:
The dwc3 core should be added as subnode to Keystone DWC3 glue.
- dwc3 :
The binding details of dwc3 can be found in:
Documentation/devicetree/bindings/usb/dwc3.txt
Example:
usb: usb@2680000 {
compatible = "ti,keystone-dwc3";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x2680000 0x10000>;
clocks = <&clkusb>;
clock-names = "usb";
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
ranges;
dwc3@2690000 {
compatible = "synopsys,dwc3";
reg = <0x2690000 0x70000>;
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
usb-phy = <&usb_phy>, <&usb_phy>;
};
};
Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml
View file @ e611c0fe
...@@ -21,6 +21,7 @@ properties: ...@@ -21,6 +21,7 @@ properties:
- enum: - enum:
- nvidia,tegra210-xudc # For Tegra210 - nvidia,tegra210-xudc # For Tegra210
- nvidia,tegra186-xudc # For Tegra186 - nvidia,tegra186-xudc # For Tegra186
- nvidia,tegra194-xudc # For Tegra194
reg: reg:
minItems: 2 minItems: 2
...@@ -144,6 +145,7 @@ allOf: ...@@ -144,6 +145,7 @@ allOf:
contains: contains:
enum: enum:
- nvidia,tegra186-xudc - nvidia,tegra186-xudc
- nvidia,tegra194-xudc
then: then:
properties: properties:
reg: reg:
......
Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/usb/ti,keystone-dwc3.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: TI Keystone Soc USB Controller
maintainers:
- Roger Quadros <rogerq@ti.com>
properties:
compatible:
oneOf:
- const: "ti,keystone-dwc3"
- const: "ti,am654-dwc3"
reg:
maxItems: 1
description: Address and length of the register set for the USB subsystem on
the SOC.
interrupts:
maxItems: 1
description: The irq number of this device that is used to interrupt the MPU.
clocks:
description: Clock ID for USB functional clock.
power-domains:
description: Should contain a phandle to a PM domain provider node
and an args specifier containing the USB device id
value. This property is as per the binding,
Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
phys:
description:
PHY specifier for the USB3.0 PHY. Some SoCs need the USB3.0 PHY
to be turned on before the controller.
Documentation/devicetree/bindings/phy/phy-bindings.txt
phy-names:
items:
- const: "usb3-phy"
dwc3:
description: This is the node representing the DWC3 controller instance
Documentation/devicetree/bindings/usb/dwc3.txt
required:
- compatible
- reg
- interrupts
- clocks
examples:
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
usb: usb@2680000 {
compatible = "ti,keystone-dwc3";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x2680000 0x10000>;
clocks = <&clkusb>;
clock-names = "usb";
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
ranges;
dwc3@2690000 {
compatible = "synopsys,dwc3";
reg = <0x2690000 0x70000>;
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
usb-phy = <&usb_phy>, <&usb_phy>;
};
};
Documentation/devicetree/bindings/usb/ti,tps6598x.yaml 0 → 100644
View file @ e611c0fe
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: "http://devicetree.org/schemas/usb/ti,tps6598x.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Texas Instruments 6598x Type-C Port Switch and Power Delivery controller DT bindings
maintainers:
- Bryan O'Donoghue <bryan.odonoghue@linaro.org>
description: |
Texas Instruments 6598x Type-C Port Switch and Power Delivery controller
properties:
compatible:
enum:
- ti,tps6598x
reg:
maxItems: 1
interrupts:
maxItems: 1
interrupt-names:
items:
- const: irq
required:
- compatible
- reg
- interrupts
- interrupt-names
examples:
- |
#include <dt-bindings/interrupt-controller/irq.h>
i2c0 {
#address-cells = <1>;
#size-cells = <0>;
tps6598x: tps6598x@38 {
compatible = "ti,tps6598x";
reg = <0x38>;
interrupt-parent = <&msmgpio>;
interrupts = <107 IRQ_TYPE_LEVEL_LOW>;
interrupt-names = "irq";
pinctrl-names = "default";
pinctrl-0 = <&typec_pins>;
typec_con: connector {
compatible = "usb-c-connector";
label = "USB-C";
port {
typec_ep: endpoint {
remote-endpoint = <&otg_ep>;
};
};
};
};
};
...
Documentation/devicetree/bindings/usb/usb-xhci.txt
View file @ e611c0fe
...@@ -25,6 +25,7 @@ Required properties: ...@@ -25,6 +25,7 @@ Required properties:
device device
- "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 or RZ/G2 compatible - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 or RZ/G2 compatible
device device
- "brcm,bcm7445-xhci" for Broadcom STB SoCs with XHCI
- "xhci-platform" (deprecated) - "xhci-platform" (deprecated)
When compatible with the generic version, nodes must list the When compatible with the generic version, nodes must list the
......
Documentation/firmware-guide/acpi/intel-pmc-mux.rst 0 → 100644
View file @ e611c0fe
.. SPDX-License-Identifier: GPL-2.0
=====================
Intel North Mux-Agent
=====================
Introduction
============
North Mux-Agent is a function of the Intel PMC firmware that is supported on
most Intel based platforms that have the PMC microcontroller. It's used for
configuring the various USB Multiplexer/DeMultiplexers on the system. The
platforms that allow the mux-agent to be configured from the operating system
have an ACPI device object (node) with HID "INTC105C" that represents it.
The North Mux-Agent (aka. Intel PMC Mux Control, or just mux-agent) driver
communicates with the PMC microcontroller by using the PMC IPC method
(drivers/platform/x86/intel_scu_ipc.c). The driver registers with the USB Type-C
Mux Class which allows the USB Type-C Controller and Interface drivers to
configure the cable plug orientation and mode (with Alternate Modes). The driver
also registers with the USB Role Class in order to support both USB Host and
Device modes. The driver is located here: drivers/usb/typec/mux/intel_pmc_mux.c.
Port nodes
==========
General
-------
For every USB Type-C connector under the mux-agent control on the system, there
is a separate child node under the PMC mux-agent device node. Those nodes do not
represent the actual connectors, but instead the "channels" in the mux-agent
that are associated with the connectors::
Scope (_SB.PCI0.PMC.MUX)
{
Device (CH0)
{
Name (_ADR, 0)
}
Device (CH1)
{
Name (_ADR, 1)
}
}
_PLD (Physical Location of Device)
----------------------------------
The optional _PLD object can be used with the port (the channel) nodes. If _PLD
is supplied, it should match the connector node _PLD::
Scope (_SB.PCI0.PMC.MUX)
{
Device (CH0)
{
Name (_ADR, 0)
Method (_PLD, 0, NotSerialized)
{
/* Consider this as pseudocode. */
Return (\_SB.USBC.CON0._PLD())
}
}
}
Mux-agent specific _DSD Device Properties
-----------------------------------------
Port Numbers
~~~~~~~~~~~~
In order to configure the muxes behind a USB Type-C connector, the PMC firmware
needs to know the USB2 port and the USB3 port that is associated with the
connector. The driver extracts the correct port numbers by reading specific _DSD
device properties named "usb2-port-number" and "usb3-port-number". These
properties have integer value that means the port index. The port index number
is 1's based, and value 0 is illegal. The driver uses the numbers extracted from
these device properties as-is when sending the mux-agent specific messages to
the PMC::
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package() {
Package () {"usb2-port-number", 6},
Package () {"usb3-port-number", 3},
},
})
Orientation
~~~~~~~~~~~
Depending on the platform, the data and SBU lines coming from the connector may
be "fixed" from the mux-agent's point of view, which means the mux-agent driver
should not configure them according to the cable plug orientation. This can
happen for example if a retimer on the platform handles the cable plug
orientation. The driver uses a specific device properties "sbu-orientation"
(SBU) and "hsl-orientation" (data) to know if those lines are "fixed", and to
which orientation. The value that these properties have is a string value, and
it can be one that is defined for the USB Type-C connector orientation: "normal"
or "reversed"::
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package() {
Package () {"sbu-orientation", "normal"},
Package () {"hsl-orientation", "normal"},
},
})
Example ASL
===========
The following ASL is an example that shows the mux-agent node, and two
connectors under its control::
Scope (_SB.PCI0.PMC)
{
Device (MUX)
{
Name (_HID, "INTC105C")
Device (CH0)
{
Name (_ADR, 0)
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package() {
Package () {"usb2-port-number", 6},
Package () {"usb3-port-number", 3},
Package () {"sbu-orientation", "normal"},
Package () {"hsl-orientation", "normal"},
},
})
}
Device (CH1)
{
Name (_ADR, 1)
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package() {
Package () {"usb2-port-number", 5},
Package () {"usb3-port-number", 2},
Package () {"sbu-orientation", "normal"},
Package () {"hsl-orientation", "normal"},
},
})
}
}
}
MAINTAINERS
View file @ e611c0fe
...@@ -3500,6 +3500,14 @@ S: Supported ...@@ -3500,6 +3500,14 @@ S: Supported
F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
F: drivers/i2c/busses/i2c-brcmstb.c F: drivers/i2c/busses/i2c-brcmstb.c
BROADCOM BRCMSTB USB EHCI DRIVER
M: Al Cooper <alcooperx@gmail.com>
L: linux-usb@vger.kernel.org
L: bcm-kernel-feedback-list@broadcom.com
S: Maintained
F: Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
F: drivers/usb/host/ehci-brcm.*
BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
M: Al Cooper <alcooperx@gmail.com> M: Al Cooper <alcooperx@gmail.com>
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
...@@ -17759,6 +17767,13 @@ F: Documentation/driver-api/usb/typec.rst ...@@ -17759,6 +17767,13 @@ F: Documentation/driver-api/usb/typec.rst
F: drivers/usb/typec/ F: drivers/usb/typec/
F: include/linux/usb/typec.h F: include/linux/usb/typec.h
USB TYPEC INTEL PMC MUX DRIVER
M: Heikki Krogerus <heikki.krogerus@linux.intel.com>
L: linux-usb@vger.kernel.org
S: Maintained
F: Documentation/firmware-guide/acpi/intel-pmc-mux.rst
F: drivers/usb/typec/mux/intel_pmc_mux.c
USB TYPEC PI3USB30532 MUX DRIVER USB TYPEC PI3USB30532 MUX DRIVER
M: Hans de Goede <hdegoede@redhat.com> M: Hans de Goede <hdegoede@redhat.com>
L: linux-usb@vger.kernel.org L: linux-usb@vger.kernel.org
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ e611c0fe
...@@ -933,8 +933,6 @@ spi1: spi@fffa8000 { ...@@ -933,8 +933,6 @@ spi1: spi@fffa8000 {
}; };
usb2: gadget@fff78000 { usb2: gadget@fff78000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9g45-udc"; compatible = "atmel,at91sam9g45-udc";
reg = <0x00600000 0x80000 reg = <0x00600000 0x80000
0xfff78000 0x400>; 0xfff78000 0x400>;
...@@ -942,58 +940,6 @@ usb2: gadget@fff78000 { ...@@ -942,58 +940,6 @@ usb2: gadget@fff78000 {
clocks = <&pmc PMC_TYPE_PERIPHERAL 27>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clocks = <&pmc PMC_TYPE_PERIPHERAL 27>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
clock-names = "pclk", "hclk"; clock-names = "pclk", "hclk";
status = "disabled"; status = "disabled";
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
}; };
clk32k: sckc@fffffd50 { clk32k: sckc@fffffd50 {
......
arch/arm/boot/dts/at91sam9rl.dtsi
View file @ e611c0fe
...@@ -299,8 +299,6 @@ trigger3 { ...@@ -299,8 +299,6 @@ trigger3 {
}; };
usb0: gadget@fffd4000 { usb0: gadget@fffd4000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9rl-udc"; compatible = "atmel,at91sam9rl-udc";
reg = <0x00600000 0x100000>, reg = <0x00600000 0x100000>,
<0xfffd4000 0x4000>; <0xfffd4000 0x4000>;
...@@ -308,58 +306,6 @@ usb0: gadget@fffd4000 { ...@@ -308,58 +306,6 @@ usb0: gadget@fffd4000 {
clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
clock-names = "pclk", "hclk"; clock-names = "pclk", "hclk";
status = "disabled"; status = "disabled";
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
}; };
dma0: dma-controller@ffffe600 { dma0: dma-controller@ffffe600 {
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ e611c0fe
...@@ -867,8 +867,6 @@ spi1: spi@f0004000 { ...@@ -867,8 +867,6 @@ spi1: spi@f0004000 {
}; };
usb2: gadget@f803c000 { usb2: gadget@f803c000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9g45-udc"; compatible = "atmel,at91sam9g45-udc";
reg = <0x00500000 0x80000 reg = <0x00500000 0x80000
0xf803c000 0x400>; 0xf803c000 0x400>;
...@@ -876,58 +874,6 @@ usb2: gadget@f803c000 { ...@@ -876,58 +874,6 @@ usb2: gadget@f803c000 {
clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 23>; clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 23>;
clock-names = "hclk", "pclk"; clock-names = "hclk", "pclk";
status = "disabled"; status = "disabled";
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
}; };
watchdog: watchdog@fffffe40 { watchdog: watchdog@fffffe40 {
......
arch/arm/boot/dts/sama5d2.dtsi
View file @ e611c0fe
...@@ -109,8 +109,6 @@ nfc_sram: sram@100000 { ...@@ -109,8 +109,6 @@ nfc_sram: sram@100000 {
}; };
usb0: gadget@300000 { usb0: gadget@300000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,sama5d3-udc"; compatible = "atmel,sama5d3-udc";
reg = <0x00300000 0x100000 reg = <0x00300000 0x100000
0xfc02c000 0x400>; 0xfc02c000 0x400>;
...@@ -118,124 +116,6 @@ usb0: gadget@300000 { ...@@ -118,124 +116,6 @@ usb0: gadget@300000 {
clocks = <&pmc PMC_TYPE_PERIPHERAL 42>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clocks = <&pmc PMC_TYPE_PERIPHERAL 42>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
clock-names = "pclk", "hclk"; clock-names = "pclk", "hclk";
status = "disabled"; status = "disabled";
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@7 {
reg = <7>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@8 {
reg = <8>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@9 {
reg = <9>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@10 {
reg = <10>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@11 {
reg = <11>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@12 {
reg = <12>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@13 {
reg = <13>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@14 {
reg = <14>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@15 {
reg = <15>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
}; };
usb1: ohci@400000 { usb1: ohci@400000 {
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ e611c0fe
...@@ -1076,8 +1076,6 @@ nfc_sram: sram@200000 { ...@@ -1076,8 +1076,6 @@ nfc_sram: sram@200000 {
}; };
usb0: gadget@500000 { usb0: gadget@500000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,sama5d3-udc"; compatible = "atmel,sama5d3-udc";
reg = <0x00500000 0x100000 reg = <0x00500000 0x100000
0xf8030000 0x4000>; 0xf8030000 0x4000>;
...@@ -1085,111 +1083,6 @@ usb0: gadget@500000 { ...@@ -1085,111 +1083,6 @@ usb0: gadget@500000 {
clocks = <&pmc PMC_TYPE_PERIPHERAL 33>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clocks = <&pmc PMC_TYPE_PERIPHERAL 33>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
clock-names = "pclk", "hclk"; clock-names = "pclk", "hclk";
status = "disabled"; status = "disabled";
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
};
ep@7 {
reg = <7>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
};
ep@8 {
reg = <8>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@9 {
reg = <9>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@10 {
reg = <10>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@11 {
reg = <11>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@12 {
reg = <12>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@13 {
reg = <13>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@14 {
reg = <14>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
ep@15 {
reg = <15>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
};
}; };
usb1: ohci@600000 { usb1: ohci@600000 {
......
arch/arm/boot/dts/sama5d4.dtsi
View file @ e611c0fe
...@@ -96,8 +96,6 @@ nfc_sram: sram@100000 { ...@@ -96,8 +96,6 @@ nfc_sram: sram@100000 {
}; };
usb0: gadget@400000 { usb0: gadget@400000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,sama5d3-udc"; compatible = "atmel,sama5d3-udc";
reg = <0x00400000 0x100000 reg = <0x00400000 0x100000
0xfc02c000 0x4000>; 0xfc02c000 0x4000>;
...@@ -105,124 +103,6 @@ usb0: gadget@400000 { ...@@ -105,124 +103,6 @@ usb0: gadget@400000 {
clocks = <&pmc PMC_TYPE_PERIPHERAL 47>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clocks = <&pmc PMC_TYPE_PERIPHERAL 47>, <&pmc PMC_TYPE_CORE PMC_UTMI>;
clock-names = "pclk", "hclk"; clock-names = "pclk", "hclk";
status = "disabled"; status = "disabled";
ep@0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep@1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep@3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@7 {
reg = <7>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep@8 {
reg = <8>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@9 {
reg = <9>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@10 {
reg = <10>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@11 {
reg = <11>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@12 {
reg = <12>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@13 {
reg = <13>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@14 {
reg = <14>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
ep@15 {
reg = <15>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
}; };
usb1: ohci@500000 { usb1: ohci@500000 {
......
arch/arm64/boot/dts/qcom/sc7180.dtsi
View file @ e611c0fe
...@@ -2244,6 +2244,10 @@ usb_1: usb@a6f8800 { ...@@ -2244,6 +2244,10 @@ usb_1: usb@a6f8800 {
resets = <&gcc GCC_USB30_PRIM_BCR>; resets = <&gcc GCC_USB30_PRIM_BCR>;
interconnects = <&aggre2_noc MASTER_USB3 &mc_virt SLAVE_EBI1>,
<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3>;
interconnect-names = "usb-ddr", "apps-usb";
usb_1_dwc3: dwc3@a600000 { usb_1_dwc3: dwc3@a600000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xe000>; reg = <0 0x0a600000 0 0xe000>;
......
arch/arm64/boot/dts/qcom/sdm845.dtsi
View file @ e611c0fe
...@@ -3136,6 +3136,10 @@ usb_1: usb@a6f8800 { ...@@ -3136,6 +3136,10 @@ usb_1: usb@a6f8800 {
resets = <&gcc GCC_USB30_PRIM_BCR>; resets = <&gcc GCC_USB30_PRIM_BCR>;
interconnects = <&aggre2_noc MASTER_USB3_0 &mem_noc SLAVE_EBI1>,
<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_0>;
interconnect-names = "usb-ddr", "apps-usb";
usb_1_dwc3: dwc3@a600000 { usb_1_dwc3: dwc3@a600000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xcd00>; reg = <0 0x0a600000 0 0xcd00>;
...@@ -3180,6 +3184,10 @@ usb_2: usb@a8f8800 { ...@@ -3180,6 +3184,10 @@ usb_2: usb@a8f8800 {
resets = <&gcc GCC_USB30_SEC_BCR>; resets = <&gcc GCC_USB30_SEC_BCR>;
interconnects = <&aggre2_noc MASTER_USB3_1 &mem_noc SLAVE_EBI1>,
<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_1>;
interconnect-names = "usb-ddr", "apps-usb";
usb_2_dwc3: dwc3@a800000 { usb_2_dwc3: dwc3@a800000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a800000 0 0xcd00>; reg = <0 0x0a800000 0 0xcd00>;
......
drivers/gpio/gpiolib-of.c
View file @ e611c0fe
...@@ -466,6 +466,24 @@ static struct gpio_desc *of_find_arizona_gpio(struct device *dev, ...@@ -466,6 +466,24 @@ static struct gpio_desc *of_find_arizona_gpio(struct device *dev,
return of_get_named_gpiod_flags(dev->of_node, con_id, 0, of_flags); return of_get_named_gpiod_flags(dev->of_node, con_id, 0, of_flags);
} }
static struct gpio_desc *of_find_usb_gpio(struct device *dev,
const char *con_id,
enum of_gpio_flags *of_flags)
{
/*
* Currently this USB quirk is only for the Fairchild FUSB302 host which is using
* an undocumented DT GPIO line named "fcs,int_n" without the compulsory "-gpios"
* suffix.
*/
if (!IS_ENABLED(CONFIG_TYPEC_FUSB302))
return ERR_PTR(-ENOENT);
if (!con_id || strcmp(con_id, "fcs,int_n"))
return ERR_PTR(-ENOENT);
return of_get_named_gpiod_flags(dev->of_node, con_id, 0, of_flags);
}
struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
unsigned int idx, unsigned long *flags) unsigned int idx, unsigned long *flags)
{ {
...@@ -510,6 +528,9 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, ...@@ -510,6 +528,9 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
if (PTR_ERR(desc) == -ENOENT) if (PTR_ERR(desc) == -ENOENT)
desc = of_find_arizona_gpio(dev, con_id, &of_flags); desc = of_find_arizona_gpio(dev, con_id, &of_flags);
if (PTR_ERR(desc) == -ENOENT)
desc = of_find_usb_gpio(dev, con_id, &of_flags);
if (IS_ERR(desc)) if (IS_ERR(desc))
return desc; return desc;
......
drivers/phy/amlogic/Kconfig
View file @ e611c0fe
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
# Phy drivers for Amlogic platforms # Phy drivers for Amlogic platforms
# #
config PHY_MESON8B_USB2 config PHY_MESON8B_USB2
tristate "Meson8, Meson8b and GXBB USB2 PHY driver" tristate "Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY driver"
default ARCH_MESON default ARCH_MESON
depends on OF && (ARCH_MESON || COMPILE_TEST) depends on OF && (ARCH_MESON || COMPILE_TEST)
depends on USB_SUPPORT depends on USB_SUPPORT
select USB_COMMON select USB_COMMON
select GENERIC_PHY select GENERIC_PHY
select REGMAP_MMIO
help help
Enable this to support the Meson USB2 PHYs found in Meson8, Enable this to support the Meson USB2 PHYs found in Meson8,
Meson8b and GXBB SoCs. Meson8b and GXBB SoCs.
...@@ -26,18 +27,6 @@ config PHY_MESON_GXL_USB2 ...@@ -26,18 +27,6 @@ config PHY_MESON_GXL_USB2
GXL and GXM SoCs. GXL and GXM SoCs.
If unsure, say N. If unsure, say N.
config PHY_MESON_GXL_USB3
tristate "Meson GXL and GXM USB3 PHY drivers"
default ARCH_MESON
depends on OF && (ARCH_MESON || COMPILE_TEST)
depends on USB_SUPPORT
select GENERIC_PHY
select REGMAP_MMIO
help
Enable this to support the Meson USB3 PHY and OTG detection
IP block found in Meson GXL and GXM SoCs.
If unsure, say N.
config PHY_MESON_G12A_USB2 config PHY_MESON_G12A_USB2
tristate "Meson G12A USB2 PHY driver" tristate "Meson G12A USB2 PHY driver"
default ARCH_MESON default ARCH_MESON
......
drivers/phy/amlogic/Makefile
View file @ e611c0fe
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
obj-$(CONFIG_PHY_MESON8B_USB2) += phy-meson8b-usb2.o obj-$(CONFIG_PHY_MESON8B_USB2) += phy-meson8b-usb2.o
obj-$(CONFIG_PHY_MESON_GXL_USB2) += phy-meson-gxl-usb2.o obj-$(CONFIG_PHY_MESON_GXL_USB2) += phy-meson-gxl-usb2.o
obj-$(CONFIG_PHY_MESON_G12A_USB2) += phy-meson-g12a-usb2.o obj-$(CONFIG_PHY_MESON_G12A_USB2) += phy-meson-g12a-usb2.o
obj-$(CONFIG_PHY_MESON_GXL_USB3) += phy-meson-gxl-usb3.o
obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o
obj-$(CONFIG_PHY_MESON_AXG_PCIE) += phy-meson-axg-pcie.o obj-$(CONFIG_PHY_MESON_AXG_PCIE) += phy-meson-axg-pcie.o
obj-$(CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG) += phy-meson-axg-mipi-pcie-analog.o obj-$(CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG) += phy-meson-axg-mipi-pcie-analog.o
drivers/phy/amlogic/phy-meson-gxl-usb3.c deleted 100644 → 0
View file @ 3b69e8b4
// SPDX-License-Identifier: GPL-2.0
/*
* Meson GXL USB3 PHY and OTG mode detection driver
*
* Copyright (C) 2018 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
*/
#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/phy/phy.h>
#include <linux/regmap.h>
#include <linux/reset.h>
#include <linux/platform_device.h>
#define USB_R0 0x00
#define USB_R0_P30_FSEL_MASK GENMASK(5, 0)
#define USB_R0_P30_PHY_RESET BIT(6)
#define USB_R0_P30_TEST_POWERDOWN_HSP BIT(7)
#define USB_R0_P30_TEST_POWERDOWN_SSP BIT(8)
#define USB_R0_P30_ACJT_LEVEL_MASK GENMASK(13, 9)
#define USB_R0_P30_TX_BOOST_LEVEL_MASK GENMASK(16, 14)
#define USB_R0_P30_LANE0_TX2RX_LOOPBACK BIT(17)
#define USB_R0_P30_LANE0_EXT_PCLK_REQ BIT(18)
#define USB_R0_P30_PCS_RX_LOS_MASK_VAL_MASK GENMASK(28, 19)
#define USB_R0_U2D_SS_SCALEDOWN_MODE_MASK GENMASK(30, 29)
#define USB_R0_U2D_ACT BIT(31)
#define USB_R1 0x04
#define USB_R1_U3H_BIGENDIAN_GS BIT(0)
#define USB_R1_U3H_PME_ENABLE BIT(1)
#define USB_R1_U3H_HUB_PORT_OVERCURRENT_MASK GENMASK(6, 2)
#define USB_R1_U3H_HUB_PORT_PERM_ATTACH_MASK GENMASK(11, 7)
#define USB_R1_U3H_HOST_U2_PORT_DISABLE_MASK GENMASK(15, 12)
#define USB_R1_U3H_HOST_U3_PORT_DISABLE BIT(16)
#define USB_R1_U3H_HOST_PORT_POWER_CONTROL_PRESENT BIT(17)
#define USB_R1_U3H_HOST_MSI_ENABLE BIT(18)
#define USB_R1_U3H_FLADJ_30MHZ_REG_MASK GENMASK(24, 19)
#define USB_R1_P30_PCS_TX_SWING_FULL_MASK GENMASK(31, 25)
#define USB_R2 0x08
#define USB_R2_P30_CR_DATA_IN_MASK GENMASK(15, 0)
#define USB_R2_P30_CR_READ BIT(16)
#define USB_R2_P30_CR_WRITE BIT(17)
#define USB_R2_P30_CR_CAP_ADDR BIT(18)
#define USB_R2_P30_CR_CAP_DATA BIT(19)
#define USB_R2_P30_PCS_TX_DEEMPH_3P5DB_MASK GENMASK(25, 20)
#define USB_R2_P30_PCS_TX_DEEMPH_6DB_MASK GENMASK(31, 26)
#define USB_R3 0x0c
#define USB_R3_P30_SSC_ENABLE BIT(0)
#define USB_R3_P30_SSC_RANGE_MASK GENMASK(3, 1)
#define USB_R3_P30_SSC_REF_CLK_SEL_MASK GENMASK(12, 4)
#define USB_R3_P30_REF_SSP_EN BIT(13)
#define USB_R3_P30_LOS_BIAS_MASK GENMASK(18, 16)
#define USB_R3_P30_LOS_LEVEL_MASK GENMASK(23, 19)
#define USB_R3_P30_MPLL_MULTIPLIER_MASK GENMASK(30, 24)
#define USB_R4 0x10
#define USB_R4_P21_PORT_RESET_0 BIT(0)
#define USB_R4_P21_SLEEP_M0 BIT(1)
#define USB_R4_MEM_PD_MASK GENMASK(3, 2)
#define USB_R4_P21_ONLY BIT(4)
#define USB_R5 0x14
#define USB_R5_ID_DIG_SYNC BIT(0)
#define USB_R5_ID_DIG_REG BIT(1)
#define USB_R5_ID_DIG_CFG_MASK GENMASK(3, 2)
#define USB_R5_ID_DIG_EN_0 BIT(4)
#define USB_R5_ID_DIG_EN_1 BIT(5)
#define USB_R5_ID_DIG_CURR BIT(6)
#define USB_R5_ID_DIG_IRQ BIT(7)
#define USB_R5_ID_DIG_TH_MASK GENMASK(15, 8)
#define USB_R5_ID_DIG_CNT_MASK GENMASK(23, 16)
/* read-only register */
#define USB_R6 0x18
#define USB_R6_P30_CR_DATA_OUT_MASK GENMASK(15, 0)
#define USB_R6_P30_CR_ACK BIT(16)
struct phy_meson_gxl_usb3_priv {
struct regmap *regmap;
enum phy_mode mode;
struct clk *clk_phy;
struct clk *clk_peripheral;
struct reset_control *reset;
};
static const struct regmap_config phy_meson_gxl_usb3_regmap_conf = {
.reg_bits = 8,
.val_bits = 32,
.reg_stride = 4,
.max_register = USB_R6,
};
static int phy_meson_gxl_usb3_power_on(struct phy *phy)
{
struct phy_meson_gxl_usb3_priv *priv = phy_get_drvdata(phy);
regmap_update_bits(priv->regmap, USB_R5, USB_R5_ID_DIG_EN_0,
USB_R5_ID_DIG_EN_0);
regmap_update_bits(priv->regmap, USB_R5, USB_R5_ID_DIG_EN_1,
USB_R5_ID_DIG_EN_1);
regmap_update_bits(priv->regmap, USB_R5, USB_R5_ID_DIG_TH_MASK,
FIELD_PREP(USB_R5_ID_DIG_TH_MASK, 0xff));
return 0;
}
static int phy_meson_gxl_usb3_power_off(struct phy *phy)
{
struct phy_meson_gxl_usb3_priv *priv = phy_get_drvdata(phy);
regmap_update_bits(priv->regmap, USB_R5, USB_R5_ID_DIG_EN_0, 0);
regmap_update_bits(priv->regmap, USB_R5, USB_R5_ID_DIG_EN_1, 0);
return 0;
}
static int phy_meson_gxl_usb3_set_mode(struct phy *phy,
enum phy_mode mode, int submode)
{
struct phy_meson_gxl_usb3_priv *priv = phy_get_drvdata(phy);
switch (mode) {
case PHY_MODE_USB_HOST:
regmap_update_bits(priv->regmap, USB_R0, USB_R0_U2D_ACT, 0);
regmap_update_bits(priv->regmap, USB_R4, USB_R4_P21_SLEEP_M0,
0);
break;
case PHY_MODE_USB_DEVICE:
regmap_update_bits(priv->regmap, USB_R0, USB_R0_U2D_ACT,
USB_R0_U2D_ACT);
regmap_update_bits(priv->regmap, USB_R4, USB_R4_P21_SLEEP_M0,
USB_R4_P21_SLEEP_M0);
break;
default:
dev_err(&phy->dev, "unsupported PHY mode %d\n", mode);
return -EINVAL;
}
priv->mode = mode;
return 0;
}
static int phy_meson_gxl_usb3_init(struct phy *phy)
{
struct phy_meson_gxl_usb3_priv *priv = phy_get_drvdata(phy);
int ret;
ret = reset_control_reset(priv->reset);
if (ret)
goto err;
ret = clk_prepare_enable(priv->clk_phy);
if (ret)
goto err;
ret = clk_prepare_enable(priv->clk_peripheral);
if (ret)
goto err_disable_clk_phy;
ret = phy_meson_gxl_usb3_set_mode(phy, priv->mode, 0);
if (ret)
goto err_disable_clk_peripheral;
regmap_update_bits(priv->regmap, USB_R1,
USB_R1_U3H_FLADJ_30MHZ_REG_MASK,
FIELD_PREP(USB_R1_U3H_FLADJ_30MHZ_REG_MASK, 0x20));
return 0;
err_disable_clk_peripheral:
clk_disable_unprepare(priv->clk_peripheral);
err_disable_clk_phy:
clk_disable_unprepare(priv->clk_phy);
err:
return ret;
}
static int phy_meson_gxl_usb3_exit(struct phy *phy)
{
struct phy_meson_gxl_usb3_priv *priv = phy_get_drvdata(phy);
clk_disable_unprepare(priv->clk_peripheral);
clk_disable_unprepare(priv->clk_phy);
return 0;
}
static const struct phy_ops phy_meson_gxl_usb3_ops = {
.power_on = phy_meson_gxl_usb3_power_on,
.power_off = phy_meson_gxl_usb3_power_off,
.set_mode = phy_meson_gxl_usb3_set_mode,
.init = phy_meson_gxl_usb3_init,
.exit = phy_meson_gxl_usb3_exit,
.owner = THIS_MODULE,
};
static int phy_meson_gxl_usb3_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct phy_meson_gxl_usb3_priv *priv;
struct resource *res;
struct phy *phy;
struct phy_provider *phy_provider;
void __iomem *base;
int ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(dev, res);
if (IS_ERR(base))
return PTR_ERR(base);
priv->regmap = devm_regmap_init_mmio(dev, base,
&phy_meson_gxl_usb3_regmap_conf);
if (IS_ERR(priv->regmap))
return PTR_ERR(priv->regmap);
priv->clk_phy = devm_clk_get(dev, "phy");
if (IS_ERR(priv->clk_phy))
return PTR_ERR(priv->clk_phy);
priv->clk_peripheral = devm_clk_get(dev, "peripheral");
if (IS_ERR(priv->clk_peripheral))
return PTR_ERR(priv->clk_peripheral);
priv->reset = devm_reset_control_array_get_shared(dev);
if (IS_ERR(priv->reset))
return PTR_ERR(priv->reset);
/*
* default to host mode as hardware defaults and/or boot-loader
* behavior can result in this PHY starting up in device mode. this
* default and the initialization in phy_meson_gxl_usb3_init ensure
* that we reproducibly start in a known mode on all devices.
*/
priv->mode = PHY_MODE_USB_HOST;
phy = devm_phy_create(dev, np, &phy_meson_gxl_usb3_ops);
if (IS_ERR(phy)) {
ret = PTR_ERR(phy);
if (ret != -EPROBE_DEFER)
dev_err(dev, "failed to create PHY\n");
return ret;
}
phy_set_drvdata(phy, priv);
phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
return PTR_ERR_OR_ZERO(phy_provider);
}
static const struct of_device_id phy_meson_gxl_usb3_of_match[] = {
{ .compatible = "amlogic,meson-gxl-usb3-phy", },
{ },
};
MODULE_DEVICE_TABLE(of, phy_meson_gxl_usb3_of_match);
static struct platform_driver phy_meson_gxl_usb3_driver = {
.probe = phy_meson_gxl_usb3_probe,
.driver = {
.name = "phy-meson-gxl-usb3",
.of_match_table = phy_meson_gxl_usb3_of_match,
},
};
module_platform_driver(phy_meson_gxl_usb3_driver);
MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>");
MODULE_DESCRIPTION("Meson GXL USB3 PHY and OTG detection driver");
MODULE_LICENSE("GPL v2");
drivers/phy/amlogic/phy-meson8b-usb2.c
View file @ e611c0fe
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -76,6 +78,17 @@ ...@@ -76,6 +78,17 @@
#define REG_ADP_BC_ACA_PIN_FLOAT BIT(26) #define REG_ADP_BC_ACA_PIN_FLOAT BIT(26)
#define REG_DBG_UART 0x10 #define REG_DBG_UART 0x10
#define REG_DBG_UART_BYPASS_SEL BIT(0)
#define REG_DBG_UART_BYPASS_DM_EN BIT(1)
#define REG_DBG_UART_BYPASS_DP_EN BIT(2)
#define REG_DBG_UART_BYPASS_DM_DATA BIT(3)
#define REG_DBG_UART_BYPASS_DP_DATA BIT(4)
#define REG_DBG_UART_FSV_MINUS BIT(5)
#define REG_DBG_UART_FSV_PLUS BIT(6)
#define REG_DBG_UART_FSV_BURN_IN_TEST BIT(7)
#define REG_DBG_UART_LOOPBACK_EN_B BIT(8)
#define REG_DBG_UART_SET_IDDQ BIT(9)
#define REG_DBG_UART_ATE_RESET BIT(10)
#define REG_TEST 0x14 #define REG_TEST 0x14
#define REG_TEST_DATA_IN_MASK GENMASK(3, 0) #define REG_TEST_DATA_IN_MASK GENMASK(3, 0)
...@@ -104,35 +117,30 @@ ...@@ -104,35 +117,30 @@
#define RESET_COMPLETE_TIME 500 #define RESET_COMPLETE_TIME 500
#define ACA_ENABLE_COMPLETE_TIME 50 #define ACA_ENABLE_COMPLETE_TIME 50
struct phy_meson8b_usb2_match_data {
bool host_enable_aca;
};
struct phy_meson8b_usb2_priv { struct phy_meson8b_usb2_priv {
void __iomem *regs; struct regmap *regmap;
enum usb_dr_mode dr_mode; enum usb_dr_mode dr_mode;
struct clk *clk_usb_general; struct clk *clk_usb_general;
struct clk *clk_usb; struct clk *clk_usb;
struct reset_control *reset; struct reset_control *reset;
const struct phy_meson8b_usb2_match_data *match;
}; };
static u32 phy_meson8b_usb2_read(struct phy_meson8b_usb2_priv *phy_priv, static const struct regmap_config phy_meson8b_usb2_regmap_conf = {
u32 reg) .reg_bits = 8,
{ .val_bits = 32,
return readl(phy_priv->regs + reg); .reg_stride = 4,
} .max_register = REG_TUNE,
};
static void phy_meson8b_usb2_mask_bits(struct phy_meson8b_usb2_priv *phy_priv,
u32 reg, u32 mask, u32 value)
{
u32 data;
data = phy_meson8b_usb2_read(phy_priv, reg);
data &= ~mask;
data |= (value & mask);
writel(data, phy_priv->regs + reg);
}
static int phy_meson8b_usb2_power_on(struct phy *phy) static int phy_meson8b_usb2_power_on(struct phy *phy)
{ {
struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy); struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy);
u32 reg;
int ret; int ret;
if (!IS_ERR_OR_NULL(priv->reset)) { if (!IS_ERR_OR_NULL(priv->reset)) {
...@@ -156,40 +164,45 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) ...@@ -156,40 +164,45 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
return ret; return ret;
} }
phy_meson8b_usb2_mask_bits(priv, REG_CONFIG, REG_CONFIG_CLK_32k_ALTSEL, regmap_update_bits(priv->regmap, REG_CONFIG, REG_CONFIG_CLK_32k_ALTSEL,
REG_CONFIG_CLK_32k_ALTSEL); REG_CONFIG_CLK_32k_ALTSEL);
phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_REF_CLK_SEL_MASK, regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_REF_CLK_SEL_MASK,
0x2 << REG_CTRL_REF_CLK_SEL_SHIFT); 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_FSEL_MASK, regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_FSEL_MASK,
0x5 << REG_CTRL_FSEL_SHIFT); 0x5 << REG_CTRL_FSEL_SHIFT);
/* reset the PHY */ /* reset the PHY */
phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_POWER_ON_RESET, regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET,
REG_CTRL_POWER_ON_RESET); REG_CTRL_POWER_ON_RESET);
udelay(RESET_COMPLETE_TIME); udelay(RESET_COMPLETE_TIME);
phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_POWER_ON_RESET, 0); regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET, 0);
udelay(RESET_COMPLETE_TIME); udelay(RESET_COMPLETE_TIME);
phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_SOF_TOGGLE_OUT, regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_SOF_TOGGLE_OUT,
REG_CTRL_SOF_TOGGLE_OUT); REG_CTRL_SOF_TOGGLE_OUT);
if (priv->dr_mode == USB_DR_MODE_HOST) { if (priv->dr_mode == USB_DR_MODE_HOST) {
phy_meson8b_usb2_mask_bits(priv, REG_ADP_BC, regmap_update_bits(priv->regmap, REG_DBG_UART,
REG_DBG_UART_SET_IDDQ, 0);
if (priv->match->host_enable_aca) {
regmap_update_bits(priv->regmap, REG_ADP_BC,
REG_ADP_BC_ACA_ENABLE, REG_ADP_BC_ACA_ENABLE,
REG_ADP_BC_ACA_ENABLE); REG_ADP_BC_ACA_ENABLE);
udelay(ACA_ENABLE_COMPLETE_TIME); udelay(ACA_ENABLE_COMPLETE_TIME);
if (phy_meson8b_usb2_read(priv, REG_ADP_BC) & regmap_read(priv->regmap, REG_ADP_BC, &reg);
REG_ADP_BC_ACA_PIN_FLOAT) { if (reg & REG_ADP_BC_ACA_PIN_FLOAT) {
dev_warn(&phy->dev, "USB ID detect failed!\n"); dev_warn(&phy->dev, "USB ID detect failed!\n");
clk_disable_unprepare(priv->clk_usb); clk_disable_unprepare(priv->clk_usb);
clk_disable_unprepare(priv->clk_usb_general); clk_disable_unprepare(priv->clk_usb_general);
return -EINVAL; return -EINVAL;
} }
} }
}
return 0; return 0;
} }
...@@ -198,6 +211,11 @@ static int phy_meson8b_usb2_power_off(struct phy *phy) ...@@ -198,6 +211,11 @@ static int phy_meson8b_usb2_power_off(struct phy *phy)
{ {
struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy); struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy);
if (priv->dr_mode == USB_DR_MODE_HOST)
regmap_update_bits(priv->regmap, REG_DBG_UART,
REG_DBG_UART_SET_IDDQ,
REG_DBG_UART_SET_IDDQ);
clk_disable_unprepare(priv->clk_usb); clk_disable_unprepare(priv->clk_usb);
clk_disable_unprepare(priv->clk_usb_general); clk_disable_unprepare(priv->clk_usb_general);
...@@ -213,18 +231,26 @@ static const struct phy_ops phy_meson8b_usb2_ops = { ...@@ -213,18 +231,26 @@ static const struct phy_ops phy_meson8b_usb2_ops = {
static int phy_meson8b_usb2_probe(struct platform_device *pdev) static int phy_meson8b_usb2_probe(struct platform_device *pdev)
{ {
struct phy_meson8b_usb2_priv *priv; struct phy_meson8b_usb2_priv *priv;
struct resource *res;
struct phy *phy; struct phy *phy;
struct phy_provider *phy_provider; struct phy_provider *phy_provider;
void __iomem *base;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); base = devm_platform_ioremap_resource(pdev, 0);
priv->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(base))
if (IS_ERR(priv->regs)) return PTR_ERR(base);
return PTR_ERR(priv->regs);
priv->match = device_get_match_data(&pdev->dev);
if (!priv->match)
return -ENODEV;
priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
&phy_meson8b_usb2_regmap_conf);
if (IS_ERR(priv->regmap))
return PTR_ERR(priv->regmap);
priv->clk_usb_general = devm_clk_get(&pdev->dev, "usb_general"); priv->clk_usb_general = devm_clk_get(&pdev->dev, "usb_general");
if (IS_ERR(priv->clk_usb_general)) if (IS_ERR(priv->clk_usb_general))
...@@ -259,11 +285,32 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev) ...@@ -259,11 +285,32 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev)
return PTR_ERR_OR_ZERO(phy_provider); return PTR_ERR_OR_ZERO(phy_provider);
} }
static const struct phy_meson8b_usb2_match_data phy_meson8_usb2_match_data = {
.host_enable_aca = false,
};
static const struct phy_meson8b_usb2_match_data phy_meson8b_usb2_match_data = {
.host_enable_aca = true,
};
static const struct of_device_id phy_meson8b_usb2_of_match[] = { static const struct of_device_id phy_meson8b_usb2_of_match[] = {
{ .compatible = "amlogic,meson8-usb2-phy", }, {
{ .compatible = "amlogic,meson8b-usb2-phy", }, .compatible = "amlogic,meson8-usb2-phy",
{ .compatible = "amlogic,meson-gxbb-usb2-phy", }, .data = &phy_meson8_usb2_match_data
{ }, },
{
.compatible = "amlogic,meson8b-usb2-phy",
.data = &phy_meson8b_usb2_match_data
},
{
.compatible = "amlogic,meson8m2-usb2-phy",
.data = &phy_meson8b_usb2_match_data
},
{
.compatible = "amlogic,meson-gxbb-usb2-phy",
.data = &phy_meson8b_usb2_match_data
},
{ /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, phy_meson8b_usb2_of_match); MODULE_DEVICE_TABLE(of, phy_meson8b_usb2_of_match);
...@@ -277,5 +324,5 @@ static struct platform_driver phy_meson8b_usb2_driver = { ...@@ -277,5 +324,5 @@ static struct platform_driver phy_meson8b_usb2_driver = {
module_platform_driver(phy_meson8b_usb2_driver); module_platform_driver(phy_meson8b_usb2_driver);
MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>"); MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>");
MODULE_DESCRIPTION("Meson8, Meson8b and GXBB USB2 PHY driver"); MODULE_DESCRIPTION("Meson8, Meson8b, Meson8m2 and GXBB USB2 PHY driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
View file @ e611c0fe
...@@ -279,7 +279,7 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id) ...@@ -279,7 +279,7 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct phy_ops ops = { static const struct phy_ops ops = {
.init = ns2_drd_phy_init, .init = ns2_drd_phy_init,
.power_on = ns2_drd_phy_poweron, .power_on = ns2_drd_phy_poweron,
.power_off = ns2_drd_phy_poweroff, .power_off = ns2_drd_phy_poweroff,
......
drivers/phy/broadcom/phy-bcm-sr-usb.c
View file @ e611c0fe
...@@ -16,8 +16,6 @@ enum bcm_usb_phy_version { ...@@ -16,8 +16,6 @@ enum bcm_usb_phy_version {
}; };
enum bcm_usb_phy_reg { enum bcm_usb_phy_reg {
PLL_NDIV_FRAC,
PLL_NDIV_INT,
PLL_CTRL, PLL_CTRL,
PHY_CTRL, PHY_CTRL,
PHY_PLL_CTRL, PHY_PLL_CTRL,
...@@ -31,18 +29,11 @@ static const u8 bcm_usb_combo_phy_ss[] = { ...@@ -31,18 +29,11 @@ static const u8 bcm_usb_combo_phy_ss[] = {
}; };
static const u8 bcm_usb_combo_phy_hs[] = { static const u8 bcm_usb_combo_phy_hs[] = {
[PLL_NDIV_FRAC] = 0x04,
[PLL_NDIV_INT] = 0x08,
[PLL_CTRL] = 0x0c, [PLL_CTRL] = 0x0c,
[PHY_CTRL] = 0x10, [PHY_CTRL] = 0x10,
}; };
#define HSPLL_NDIV_INT_VAL 0x13
#define HSPLL_NDIV_FRAC_VAL 0x1005
static const u8 bcm_usb_hs_phy[] = { static const u8 bcm_usb_hs_phy[] = {
[PLL_NDIV_FRAC] = 0x0,
[PLL_NDIV_INT] = 0x4,
[PLL_CTRL] = 0x8, [PLL_CTRL] = 0x8,
[PHY_CTRL] = 0xc, [PHY_CTRL] = 0xc,
}; };
...@@ -52,7 +43,6 @@ enum pll_ctrl_bits { ...@@ -52,7 +43,6 @@ enum pll_ctrl_bits {
SSPLL_SUSPEND_EN, SSPLL_SUSPEND_EN,
PLL_SEQ_START, PLL_SEQ_START,
PLL_LOCK, PLL_LOCK,
PLL_PDIV,
}; };
static const u8 u3pll_ctrl[] = { static const u8 u3pll_ctrl[] = {
...@@ -66,29 +56,17 @@ static const u8 u3pll_ctrl[] = { ...@@ -66,29 +56,17 @@ static const u8 u3pll_ctrl[] = {
#define HSPLL_PDIV_VAL 0x1 #define HSPLL_PDIV_VAL 0x1
static const u8 u2pll_ctrl[] = { static const u8 u2pll_ctrl[] = {
[PLL_PDIV] = 1,
[PLL_RESETB] = 5, [PLL_RESETB] = 5,
[PLL_LOCK] = 6, [PLL_LOCK] = 6,
}; };
enum bcm_usb_phy_ctrl_bits { enum bcm_usb_phy_ctrl_bits {
CORERDY, CORERDY,
AFE_LDO_PWRDWNB,
AFE_PLL_PWRDWNB,
AFE_BG_PWRDWNB,
PHY_ISO,
PHY_RESETB, PHY_RESETB,
PHY_PCTL, PHY_PCTL,
}; };
#define PHY_PCTL_MASK 0xffff #define PHY_PCTL_MASK 0xffff
/*
* 0x0806 of PCTL_VAL has below bits set
* BIT-8 : refclk divider 1
* BIT-3:2: device mode; mode is not effect
* BIT-1: soft reset active low
*/
#define HSPHY_PCTL_VAL 0x0806
#define SSPHY_PCTL_VAL 0x0006 #define SSPHY_PCTL_VAL 0x0006
static const u8 u3phy_ctrl[] = { static const u8 u3phy_ctrl[] = {
...@@ -98,10 +76,6 @@ static const u8 u3phy_ctrl[] = { ...@@ -98,10 +76,6 @@ static const u8 u3phy_ctrl[] = {
static const u8 u2phy_ctrl[] = { static const u8 u2phy_ctrl[] = {
[CORERDY] = 0, [CORERDY] = 0,
[AFE_LDO_PWRDWNB] = 1,
[AFE_PLL_PWRDWNB] = 2,
[AFE_BG_PWRDWNB] = 3,
[PHY_ISO] = 4,
[PHY_RESETB] = 5, [PHY_RESETB] = 5,
[PHY_PCTL] = 6, [PHY_PCTL] = 6,
}; };
...@@ -186,38 +160,13 @@ static int bcm_usb_hs_phy_init(struct bcm_usb_phy_cfg *phy_cfg) ...@@ -186,38 +160,13 @@ static int bcm_usb_hs_phy_init(struct bcm_usb_phy_cfg *phy_cfg)
int ret = 0; int ret = 0;
void __iomem *regs = phy_cfg->regs; void __iomem *regs = phy_cfg->regs;
const u8 *offset; const u8 *offset;
u32 rd_data;
offset = phy_cfg->offset; offset = phy_cfg->offset;
writel(HSPLL_NDIV_INT_VAL, regs + offset[PLL_NDIV_INT]); bcm_usb_reg32_clrbits(regs + offset[PLL_CTRL],
writel(HSPLL_NDIV_FRAC_VAL, regs + offset[PLL_NDIV_FRAC]); BIT(u2pll_ctrl[PLL_RESETB]));
rd_data = readl(regs + offset[PLL_CTRL]);
rd_data &= ~(HSPLL_PDIV_MASK << u2pll_ctrl[PLL_PDIV]);
rd_data |= (HSPLL_PDIV_VAL << u2pll_ctrl[PLL_PDIV]);
writel(rd_data, regs + offset[PLL_CTRL]);
/* Set Core Ready high */
bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],
BIT(u2phy_ctrl[CORERDY]));
/* Maximum timeout for Core Ready done */
msleep(30);
bcm_usb_reg32_setbits(regs + offset[PLL_CTRL], bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],
BIT(u2pll_ctrl[PLL_RESETB])); BIT(u2pll_ctrl[PLL_RESETB]));
bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],
BIT(u2phy_ctrl[PHY_RESETB]));
rd_data = readl(regs + offset[PHY_CTRL]);
rd_data &= ~(PHY_PCTL_MASK << u2phy_ctrl[PHY_PCTL]);
rd_data |= (HSPHY_PCTL_VAL << u2phy_ctrl[PHY_PCTL]);
writel(rd_data, regs + offset[PHY_CTRL]);
/* Maximum timeout for PLL reset done */
msleep(30);
ret = bcm_usb_pll_lock_check(regs + offset[PLL_CTRL], ret = bcm_usb_pll_lock_check(regs + offset[PLL_CTRL],
BIT(u2pll_ctrl[PLL_LOCK])); BIT(u2pll_ctrl[PLL_LOCK]));
...@@ -256,7 +205,7 @@ static int bcm_usb_phy_init(struct phy *phy) ...@@ -256,7 +205,7 @@ static int bcm_usb_phy_init(struct phy *phy)
return ret; return ret;
} }
static struct phy_ops sr_phy_ops = { static const struct phy_ops sr_phy_ops = {
.init = bcm_usb_phy_init, .init = bcm_usb_phy_init,
.reset = bcm_usb_phy_reset, .reset = bcm_usb_phy_reset,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/phy/broadcom/phy-brcm-usb.c
View file @ e611c0fe
...@@ -39,14 +39,14 @@ struct match_chip_info { ...@@ -39,14 +39,14 @@ struct match_chip_info {
u8 optional_reg; u8 optional_reg;
}; };
static struct value_to_name_map brcm_dr_mode_to_name[] = { static const struct value_to_name_map brcm_dr_mode_to_name[] = {
{ USB_CTLR_MODE_HOST, "host" }, { USB_CTLR_MODE_HOST, "host" },
{ USB_CTLR_MODE_DEVICE, "peripheral" }, { USB_CTLR_MODE_DEVICE, "peripheral" },
{ USB_CTLR_MODE_DRD, "drd" }, { USB_CTLR_MODE_DRD, "drd" },
{ USB_CTLR_MODE_TYPEC_PD, "typec-pd" } { USB_CTLR_MODE_TYPEC_PD, "typec-pd" }
}; };
static struct value_to_name_map brcm_dual_mode_to_name[] = { static const struct value_to_name_map brcm_dual_mode_to_name[] = {
{ 0, "host" }, { 0, "host" },
{ 1, "device" }, { 1, "device" },
{ 2, "auto" }, { 2, "auto" },
...@@ -138,7 +138,7 @@ static int brcm_usb_phy_exit(struct phy *gphy) ...@@ -138,7 +138,7 @@ static int brcm_usb_phy_exit(struct phy *gphy)
return 0; return 0;
} }
static struct phy_ops brcm_usb_phy_ops = { static const struct phy_ops brcm_usb_phy_ops = {
.init = brcm_usb_phy_init, .init = brcm_usb_phy_init,
.exit = brcm_usb_phy_exit, .exit = brcm_usb_phy_exit,
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -170,7 +170,7 @@ static struct phy *brcm_usb_phy_xlate(struct device *dev, ...@@ -170,7 +170,7 @@ static struct phy *brcm_usb_phy_xlate(struct device *dev,
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
static int name_to_value(struct value_to_name_map *table, int count, static int name_to_value(const struct value_to_name_map *table, int count,
const char *name, int *value) const char *name, int *value)
{ {
int x; int x;
...@@ -185,7 +185,7 @@ static int name_to_value(struct value_to_name_map *table, int count, ...@@ -185,7 +185,7 @@ static int name_to_value(struct value_to_name_map *table, int count,
return -EINVAL; return -EINVAL;
} }
static const char *value_to_name(struct value_to_name_map *table, int count, static const char *value_to_name(const struct value_to_name_map *table, int count,
int value) int value)
{ {
if (value >= count) if (value >= count)
...@@ -252,7 +252,7 @@ static const struct attribute_group brcm_usb_phy_group = { ...@@ -252,7 +252,7 @@ static const struct attribute_group brcm_usb_phy_group = {
.attrs = brcm_usb_phy_attrs, .attrs = brcm_usb_phy_attrs,
}; };
static struct match_chip_info chip_info_7216 = { static const struct match_chip_info chip_info_7216 = {
.init_func = &brcm_usb_dvr_init_7216, .init_func = &brcm_usb_dvr_init_7216,
.required_regs = { .required_regs = {
BRCM_REGS_CTRL, BRCM_REGS_CTRL,
...@@ -262,7 +262,7 @@ static struct match_chip_info chip_info_7216 = { ...@@ -262,7 +262,7 @@ static struct match_chip_info chip_info_7216 = {
}, },
}; };
static struct match_chip_info chip_info_7211b0 = { static const struct match_chip_info chip_info_7211b0 = {
.init_func = &brcm_usb_dvr_init_7211b0, .init_func = &brcm_usb_dvr_init_7211b0,
.required_regs = { .required_regs = {
BRCM_REGS_CTRL, BRCM_REGS_CTRL,
...@@ -275,7 +275,7 @@ static struct match_chip_info chip_info_7211b0 = { ...@@ -275,7 +275,7 @@ static struct match_chip_info chip_info_7211b0 = {
.optional_reg = BRCM_REGS_BDC_EC, .optional_reg = BRCM_REGS_BDC_EC,
}; };
static struct match_chip_info chip_info_7445 = { static const struct match_chip_info chip_info_7445 = {
.init_func = &brcm_usb_dvr_init_7445, .init_func = &brcm_usb_dvr_init_7445,
.required_regs = { .required_regs = {
BRCM_REGS_CTRL, BRCM_REGS_CTRL,
......
drivers/phy/cadence/Kconfig
View file @ e611c0fe
...@@ -27,3 +27,12 @@ config PHY_CADENCE_SIERRA ...@@ -27,3 +27,12 @@ config PHY_CADENCE_SIERRA
select GENERIC_PHY select GENERIC_PHY
help help
Enable this to support the Cadence Sierra PHY driver Enable this to support the Cadence Sierra PHY driver
config PHY_CADENCE_SALVO
tristate "Cadence Salvo PHY Driver"
depends on OF && HAS_IOMEM
select GENERIC_PHY
help
Enable this to support the Cadence SALVO PHY driver,
this PHY is a legacy PHY, and only are used for USB3
and USB2.
drivers/phy/cadence/Makefile
View file @ e611c0fe
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
obj-$(CONFIG_PHY_CADENCE_TORRENT) += phy-cadence-torrent.o obj-$(CONFIG_PHY_CADENCE_TORRENT) += phy-cadence-torrent.o
obj-$(CONFIG_PHY_CADENCE_DPHY) += cdns-dphy.o obj-$(CONFIG_PHY_CADENCE_DPHY) += cdns-dphy.o
obj-$(CONFIG_PHY_CADENCE_SIERRA) += phy-cadence-sierra.o obj-$(CONFIG_PHY_CADENCE_SIERRA) += phy-cadence-sierra.o
obj-$(CONFIG_PHY_CADENCE_SALVO) += phy-cadence-salvo.o
drivers/phy/cadence/phy-cadence-salvo.c 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/phy/cadence/phy-cadence-sierra.c
View file @ e611c0fe
...@@ -685,10 +685,10 @@ static struct cdns_reg_pairs cdns_usb_cmn_regs_ext_ssc[] = { ...@@ -685,10 +685,10 @@ static struct cdns_reg_pairs cdns_usb_cmn_regs_ext_ssc[] = {
static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = { static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0xFE0A, SIERRA_DET_STANDEC_A_PREG}, {0xFE0A, SIERRA_DET_STANDEC_A_PREG},
{0x000F, SIERRA_DET_STANDEC_B_PREG}, {0x000F, SIERRA_DET_STANDEC_B_PREG},
{0x00A5, SIERRA_DET_STANDEC_C_PREG}, {0x55A5, SIERRA_DET_STANDEC_C_PREG},
{0x69ad, SIERRA_DET_STANDEC_D_PREG}, {0x69ad, SIERRA_DET_STANDEC_D_PREG},
{0x0241, SIERRA_DET_STANDEC_E_PREG}, {0x0241, SIERRA_DET_STANDEC_E_PREG},
{0x0010, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG}, {0x0110, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
{0x0014, SIERRA_PSM_A0IN_TMR_PREG}, {0x0014, SIERRA_PSM_A0IN_TMR_PREG},
{0xCF00, SIERRA_PSM_DIAG_PREG}, {0xCF00, SIERRA_PSM_DIAG_PREG},
{0x001F, SIERRA_PSC_TX_A0_PREG}, {0x001F, SIERRA_PSC_TX_A0_PREG},
...@@ -696,7 +696,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = { ...@@ -696,7 +696,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x0003, SIERRA_PSC_TX_A2_PREG}, {0x0003, SIERRA_PSC_TX_A2_PREG},
{0x0003, SIERRA_PSC_TX_A3_PREG}, {0x0003, SIERRA_PSC_TX_A3_PREG},
{0x0FFF, SIERRA_PSC_RX_A0_PREG}, {0x0FFF, SIERRA_PSC_RX_A0_PREG},
{0x0619, SIERRA_PSC_RX_A1_PREG}, {0x0003, SIERRA_PSC_RX_A1_PREG},
{0x0003, SIERRA_PSC_RX_A2_PREG}, {0x0003, SIERRA_PSC_RX_A2_PREG},
{0x0001, SIERRA_PSC_RX_A3_PREG}, {0x0001, SIERRA_PSC_RX_A3_PREG},
{0x0001, SIERRA_PLLCTRL_SUBRATE_PREG}, {0x0001, SIERRA_PLLCTRL_SUBRATE_PREG},
...@@ -705,19 +705,19 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = { ...@@ -705,19 +705,19 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x00CA, SIERRA_CLKPATH_BIASTRIM_PREG}, {0x00CA, SIERRA_CLKPATH_BIASTRIM_PREG},
{0x2512, SIERRA_DFE_BIASTRIM_PREG}, {0x2512, SIERRA_DFE_BIASTRIM_PREG},
{0x0000, SIERRA_DRVCTRL_ATTEN_PREG}, {0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
{0x873E, SIERRA_CLKPATHCTRL_TMR_PREG}, {0x823E, SIERRA_CLKPATHCTRL_TMR_PREG},
{0x03CF, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG}, {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
{0x01CE, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG}, {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
{0x7B3C, SIERRA_CREQ_CCLKDET_MODE01_PREG}, {0x7B3C, SIERRA_CREQ_CCLKDET_MODE01_PREG},
{0x033F, SIERRA_RX_CTLE_MAINTENANCE_PREG}, {0x023C, SIERRA_RX_CTLE_MAINTENANCE_PREG},
{0x3232, SIERRA_CREQ_FSMCLK_SEL_PREG}, {0x3232, SIERRA_CREQ_FSMCLK_SEL_PREG},
{0x0000, SIERRA_CREQ_EQ_CTRL_PREG}, {0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
{0x8000, SIERRA_CREQ_SPARE_PREG}, {0x0000, SIERRA_CREQ_SPARE_PREG},
{0xCC44, SIERRA_CREQ_EQ_OPEN_EYE_THRESH_PREG}, {0xCC44, SIERRA_CREQ_EQ_OPEN_EYE_THRESH_PREG},
{0x8453, SIERRA_CTLELUT_CTRL_PREG}, {0x8452, SIERRA_CTLELUT_CTRL_PREG},
{0x4110, SIERRA_DFE_ECMP_RATESEL_PREG}, {0x4121, SIERRA_DFE_ECMP_RATESEL_PREG},
{0x4110, SIERRA_DFE_SMP_RATESEL_PREG}, {0x4121, SIERRA_DFE_SMP_RATESEL_PREG},
{0x0002, SIERRA_DEQ_PHALIGN_CTRL}, {0x0003, SIERRA_DEQ_PHALIGN_CTRL},
{0x3200, SIERRA_DEQ_CONCUR_CTRL1_PREG}, {0x3200, SIERRA_DEQ_CONCUR_CTRL1_PREG},
{0x5064, SIERRA_DEQ_CONCUR_CTRL2_PREG}, {0x5064, SIERRA_DEQ_CONCUR_CTRL2_PREG},
{0x0030, SIERRA_DEQ_EPIPWR_CTRL2_PREG}, {0x0030, SIERRA_DEQ_EPIPWR_CTRL2_PREG},
...@@ -725,7 +725,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = { ...@@ -725,7 +725,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x5A5A, SIERRA_DEQ_ERRCMP_CTRL_PREG}, {0x5A5A, SIERRA_DEQ_ERRCMP_CTRL_PREG},
{0x02F5, SIERRA_DEQ_OFFSET_CTRL_PREG}, {0x02F5, SIERRA_DEQ_OFFSET_CTRL_PREG},
{0x02F5, SIERRA_DEQ_GAIN_CTRL_PREG}, {0x02F5, SIERRA_DEQ_GAIN_CTRL_PREG},
{0x9A8A, SIERRA_DEQ_VGATUNE_CTRL_PREG}, {0x9999, SIERRA_DEQ_VGATUNE_CTRL_PREG},
{0x0014, SIERRA_DEQ_GLUT0}, {0x0014, SIERRA_DEQ_GLUT0},
{0x0014, SIERRA_DEQ_GLUT1}, {0x0014, SIERRA_DEQ_GLUT1},
{0x0014, SIERRA_DEQ_GLUT2}, {0x0014, SIERRA_DEQ_GLUT2},
...@@ -772,6 +772,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = { ...@@ -772,6 +772,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x000F, SIERRA_LFPSFILT_NS_PREG}, {0x000F, SIERRA_LFPSFILT_NS_PREG},
{0x0009, SIERRA_LFPSFILT_RD_PREG}, {0x0009, SIERRA_LFPSFILT_RD_PREG},
{0x0001, SIERRA_LFPSFILT_MP_PREG}, {0x0001, SIERRA_LFPSFILT_MP_PREG},
{0x6013, SIERRA_SIGDET_SUPPORT_PREG},
{0x8013, SIERRA_SDFILT_H2L_A_PREG}, {0x8013, SIERRA_SDFILT_H2L_A_PREG},
{0x8009, SIERRA_SDFILT_L2H_PREG}, {0x8009, SIERRA_SDFILT_L2H_PREG},
{0x0024, SIERRA_RXBUFFER_CTLECTRL_PREG}, {0x0024, SIERRA_RXBUFFER_CTLECTRL_PREG},
......
drivers/phy/intel/Kconfig
View file @ e611c0fe
...@@ -2,8 +2,23 @@ ...@@ -2,8 +2,23 @@
# #
# Phy drivers for Intel Lightning Mountain(LGM) platform # Phy drivers for Intel Lightning Mountain(LGM) platform
# #
config PHY_INTEL_COMBO
bool "Intel ComboPHY driver"
depends on X86 || COMPILE_TEST
depends on OF && HAS_IOMEM
select MFD_SYSCON
select GENERIC_PHY
select REGMAP
help
Enable this to support Intel ComboPhy.
This driver configures ComboPhy subsystem on Intel gateway
chipsets which provides PHYs for various controllers, EMAC,
SATA and PCIe.
config PHY_INTEL_EMMC config PHY_INTEL_EMMC
tristate "Intel EMMC PHY driver" tristate "Intel EMMC PHY driver"
depends on X86 || COMPILE_TEST
select GENERIC_PHY select GENERIC_PHY
help help
Enable this to support the Intel EMMC PHY Enable this to support the Intel EMMC PHY
drivers/phy/intel/Makefile
View file @ e611c0fe
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_PHY_INTEL_COMBO) += phy-intel-combo.o
obj-$(CONFIG_PHY_INTEL_EMMC) += phy-intel-emmc.o obj-$(CONFIG_PHY_INTEL_EMMC) += phy-intel-emmc.o
drivers/phy/intel/phy-intel-combo.c 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/phy/motorola/phy-cpcap-usb.c
View file @ e611c0fe
...@@ -122,7 +122,6 @@ enum cpcap_gpio_mode { ...@@ -122,7 +122,6 @@ enum cpcap_gpio_mode {
struct cpcap_phy_ddata { struct cpcap_phy_ddata {
struct regmap *reg; struct regmap *reg;
struct device *dev; struct device *dev;
struct clk *refclk;
struct usb_phy phy; struct usb_phy phy;
struct delayed_work detect_work; struct delayed_work detect_work;
struct pinctrl *pins; struct pinctrl *pins;
...@@ -707,7 +706,6 @@ static int cpcap_usb_phy_remove(struct platform_device *pdev) ...@@ -707,7 +706,6 @@ static int cpcap_usb_phy_remove(struct platform_device *pdev)
usb_remove_phy(&ddata->phy); usb_remove_phy(&ddata->phy);
cancel_delayed_work_sync(&ddata->detect_work); cancel_delayed_work_sync(&ddata->detect_work);
clk_unprepare(ddata->refclk);
regulator_disable(ddata->vusb); regulator_disable(ddata->vusb);
return 0; return 0;
......
drivers/phy/qualcomm/Kconfig
View file @ e611c0fe
...@@ -18,6 +18,13 @@ config PHY_QCOM_APQ8064_SATA ...@@ -18,6 +18,13 @@ config PHY_QCOM_APQ8064_SATA
depends on OF depends on OF
select GENERIC_PHY select GENERIC_PHY
config PHY_QCOM_IPQ4019_USB
tristate "Qualcomm IPQ4019 USB PHY driver"
depends on OF && (ARCH_QCOM || COMPILE_TEST)
select GENERIC_PHY
help
Support for the USB PHY-s on Qualcomm IPQ40xx SoC-s.
config PHY_QCOM_IPQ806X_SATA config PHY_QCOM_IPQ806X_SATA
tristate "Qualcomm IPQ806x SATA SerDes/PHY driver" tristate "Qualcomm IPQ806x SATA SerDes/PHY driver"
depends on ARCH_QCOM depends on ARCH_QCOM
...@@ -85,6 +92,16 @@ config PHY_QCOM_USB_HS ...@@ -85,6 +92,16 @@ config PHY_QCOM_USB_HS
Support for the USB high-speed ULPI compliant phy on Qualcomm Support for the USB high-speed ULPI compliant phy on Qualcomm
chipsets. chipsets.
config PHY_QCOM_USB_SNPS_FEMTO_V2
tristate "Qualcomm SNPS FEMTO USB HS PHY V2 module"
depends on OF && (ARCH_QCOM || COMPILE_TEST)
select GENERIC_PHY
help
Enable support for the USB high-speed SNPS Femto phy on Qualcomm
chipsets. This PHY has differences in the register map compared
to the V1 variants. The PHY is paired with a Synopsys DWC3 USB
controller on Qualcomm SOCs.
config PHY_QCOM_USB_HSIC config PHY_QCOM_USB_HSIC
tristate "Qualcomm USB HSIC ULPI PHY module" tristate "Qualcomm USB HSIC ULPI PHY module"
depends on USB_ULPI_BUS depends on USB_ULPI_BUS
......
drivers/phy/qualcomm/Makefile
View file @ e611c0fe
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_PHY_ATH79_USB) += phy-ath79-usb.o obj-$(CONFIG_PHY_ATH79_USB) += phy-ath79-usb.o
obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o
obj-$(CONFIG_PHY_QCOM_IPQ4019_USB) += phy-qcom-ipq4019-usb.o
obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o
obj-$(CONFIG_PHY_QCOM_PCIE2) += phy-qcom-pcie2.o obj-$(CONFIG_PHY_QCOM_PCIE2) += phy-qcom-pcie2.o
obj-$(CONFIG_PHY_QCOM_QMP) += phy-qcom-qmp.o obj-$(CONFIG_PHY_QCOM_QMP) += phy-qcom-qmp.o
...@@ -12,3 +13,4 @@ obj-$(CONFIG_PHY_QCOM_USB_HS) += phy-qcom-usb-hs.o ...@@ -12,3 +13,4 @@ obj-$(CONFIG_PHY_QCOM_USB_HS) += phy-qcom-usb-hs.o
obj-$(CONFIG_PHY_QCOM_USB_HSIC) += phy-qcom-usb-hsic.o obj-$(CONFIG_PHY_QCOM_USB_HSIC) += phy-qcom-usb-hsic.o
obj-$(CONFIG_PHY_QCOM_USB_HS_28NM) += phy-qcom-usb-hs-28nm.o obj-$(CONFIG_PHY_QCOM_USB_HS_28NM) += phy-qcom-usb-hs-28nm.o
obj-$(CONFIG_PHY_QCOM_USB_SS) += phy-qcom-usb-ss.o obj-$(CONFIG_PHY_QCOM_USB_SS) += phy-qcom-usb-ss.o
obj-$(CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2)+= phy-qcom-snps-femto-v2.o
drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c 0 → 100644
View file @ e611c0fe
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2018 John Crispin <john@phrozen.org>
*
* Based on code from
* Allwinner Technology Co., Ltd. <www.allwinnertech.com>
*
*/
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of_platform.h>
#include <linux/of_device.h>
#include <linux/phy/phy.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
struct ipq4019_usb_phy {
struct device *dev;
struct phy *phy;
void __iomem *base;
struct reset_control *por_rst;
struct reset_control *srif_rst;
};
static int ipq4019_ss_phy_power_off(struct phy *_phy)
{
struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
reset_control_assert(phy->por_rst);
msleep(10);
return 0;
}
static int ipq4019_ss_phy_power_on(struct phy *_phy)
{
struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
ipq4019_ss_phy_power_off(_phy);
reset_control_deassert(phy->por_rst);
return 0;
}
static struct phy_ops ipq4019_usb_ss_phy_ops = {
.power_on = ipq4019_ss_phy_power_on,
.power_off = ipq4019_ss_phy_power_off,
};
static int ipq4019_hs_phy_power_off(struct phy *_phy)
{
struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
reset_control_assert(phy->por_rst);
msleep(10);
reset_control_assert(phy->srif_rst);
msleep(10);
return 0;
}
static int ipq4019_hs_phy_power_on(struct phy *_phy)
{
struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
ipq4019_hs_phy_power_off(_phy);
reset_control_deassert(phy->srif_rst);
msleep(10);
reset_control_deassert(phy->por_rst);
return 0;
}
static struct phy_ops ipq4019_usb_hs_phy_ops = {
.power_on = ipq4019_hs_phy_power_on,
.power_off = ipq4019_hs_phy_power_off,
};
static const struct of_device_id ipq4019_usb_phy_of_match[] = {
{ .compatible = "qcom,usb-hs-ipq4019-phy", .data = &ipq4019_usb_hs_phy_ops},
{ .compatible = "qcom,usb-ss-ipq4019-phy", .data = &ipq4019_usb_ss_phy_ops},
{ },
};
MODULE_DEVICE_TABLE(of, ipq4019_usb_phy_of_match);
static int ipq4019_usb_phy_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct resource *res;
struct phy_provider *phy_provider;
struct ipq4019_usb_phy *phy;
phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);
if (!phy)
return -ENOMEM;
phy->dev = &pdev->dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
phy->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(phy->base)) {
dev_err(dev, "failed to remap register memory\n");
return PTR_ERR(phy->base);
}
phy->por_rst = devm_reset_control_get(phy->dev, "por_rst");
if (IS_ERR(phy->por_rst)) {
if (PTR_ERR(phy->por_rst) != -EPROBE_DEFER)
dev_err(dev, "POR reset is missing\n");
return PTR_ERR(phy->por_rst);
}
phy->srif_rst = devm_reset_control_get_optional(phy->dev, "srif_rst");
if (IS_ERR(phy->srif_rst))
return PTR_ERR(phy->srif_rst);
phy->phy = devm_phy_create(dev, NULL, of_device_get_match_data(dev));
if (IS_ERR(phy->phy)) {
dev_err(dev, "failed to create PHY\n");
return PTR_ERR(phy->phy);
}
phy_set_drvdata(phy->phy, phy);
phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
return PTR_ERR_OR_ZERO(phy_provider);
}
static struct platform_driver ipq4019_usb_phy_driver = {
.probe = ipq4019_usb_phy_probe,
.driver = {
.of_match_table = ipq4019_usb_phy_of_match,
.name = "ipq4019-usb-phy",
}
};
module_platform_driver(ipq4019_usb_phy_driver);
MODULE_DESCRIPTION("QCOM/IPQ4019 USB phy driver");
MODULE_AUTHOR("John Crispin <john@phrozen.org>");
MODULE_LICENSE("GPL v2");
drivers/phy/qualcomm/phy-qcom-qmp.c
View file @ e611c0fe
This diff is collapsed.
drivers/phy/qualcomm/phy-qcom-qmp.h
View file @ e611c0fe
This diff is collapsed.
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/phy/samsung/phy-s5pv210-usb2.c
View file @ e611c0fe
...@@ -139,6 +139,10 @@ static void s5pv210_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on) ...@@ -139,6 +139,10 @@ static void s5pv210_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
udelay(10); udelay(10);
rst &= ~rstbits; rst &= ~rstbits;
writel(rst, drv->reg_phy + S5PV210_UPHYRST); writel(rst, drv->reg_phy + S5PV210_UPHYRST);
/* The following delay is necessary for the reset sequence to be
* completed
*/
udelay(80);
} else { } else {
pwr = readl(drv->reg_phy + S5PV210_UPHYPWR); pwr = readl(drv->reg_phy + S5PV210_UPHYPWR);
pwr |= phypwr; pwr |= phypwr;
......
drivers/phy/ti/phy-am654-serdes.c
View file @ e611c0fe
...@@ -77,6 +77,7 @@ static struct regmap_config serdes_am654_regmap_config = { ...@@ -77,6 +77,7 @@ static struct regmap_config serdes_am654_regmap_config = {
.val_bits = 32, .val_bits = 32,
.reg_stride = 4, .reg_stride = 4,
.fast_io = true, .fast_io = true,
.max_register = 0x1ffc,
}; };
static const struct reg_field cmu_master_cdn_o = REG_FIELD(CMU_R07C, 24, 24); static const struct reg_field cmu_master_cdn_o = REG_FIELD(CMU_R07C, 24, 24);
...@@ -200,9 +201,91 @@ static int serdes_am654_power_off(struct phy *x) ...@@ -200,9 +201,91 @@ static int serdes_am654_power_off(struct phy *x)
return 0; return 0;
} }
static int serdes_am654_init(struct phy *x) #define SERDES_AM654_CFG(offset, a, b, val) \
regmap_update_bits(phy->regmap, (offset),\
GENMASK((a), (b)), (val) << (b))
static int serdes_am654_usb3_init(struct serdes_am654 *phy)
{
SERDES_AM654_CFG(0x0000, 31, 24, 0x17);
SERDES_AM654_CFG(0x0004, 15, 8, 0x02);
SERDES_AM654_CFG(0x0004, 7, 0, 0x0e);
SERDES_AM654_CFG(0x0008, 23, 16, 0x2e);
SERDES_AM654_CFG(0x0008, 31, 24, 0x2e);
SERDES_AM654_CFG(0x0060, 7, 0, 0x4b);
SERDES_AM654_CFG(0x0060, 15, 8, 0x98);
SERDES_AM654_CFG(0x0060, 23, 16, 0x60);
SERDES_AM654_CFG(0x00d0, 31, 24, 0x45);
SERDES_AM654_CFG(0x00e8, 15, 8, 0x0e);
SERDES_AM654_CFG(0x0220, 7, 0, 0x34);
SERDES_AM654_CFG(0x0220, 15, 8, 0x34);
SERDES_AM654_CFG(0x0220, 31, 24, 0x37);
SERDES_AM654_CFG(0x0224, 7, 0, 0x37);
SERDES_AM654_CFG(0x0224, 15, 8, 0x37);
SERDES_AM654_CFG(0x0228, 23, 16, 0x37);
SERDES_AM654_CFG(0x0228, 31, 24, 0x37);
SERDES_AM654_CFG(0x022c, 7, 0, 0x37);
SERDES_AM654_CFG(0x022c, 15, 8, 0x37);
SERDES_AM654_CFG(0x0230, 15, 8, 0x2a);
SERDES_AM654_CFG(0x0230, 23, 16, 0x2a);
SERDES_AM654_CFG(0x0240, 23, 16, 0x10);
SERDES_AM654_CFG(0x0240, 31, 24, 0x34);
SERDES_AM654_CFG(0x0244, 7, 0, 0x40);
SERDES_AM654_CFG(0x0244, 23, 16, 0x34);
SERDES_AM654_CFG(0x0248, 15, 8, 0x0d);
SERDES_AM654_CFG(0x0258, 15, 8, 0x16);
SERDES_AM654_CFG(0x0258, 23, 16, 0x84);
SERDES_AM654_CFG(0x0258, 31, 24, 0xf2);
SERDES_AM654_CFG(0x025c, 7, 0, 0x21);
SERDES_AM654_CFG(0x0260, 7, 0, 0x27);
SERDES_AM654_CFG(0x0260, 15, 8, 0x04);
SERDES_AM654_CFG(0x0268, 15, 8, 0x04);
SERDES_AM654_CFG(0x0288, 15, 8, 0x2c);
SERDES_AM654_CFG(0x0330, 31, 24, 0xa0);
SERDES_AM654_CFG(0x0338, 23, 16, 0x03);
SERDES_AM654_CFG(0x0338, 31, 24, 0x00);
SERDES_AM654_CFG(0x033c, 7, 0, 0x00);
SERDES_AM654_CFG(0x0344, 31, 24, 0x18);
SERDES_AM654_CFG(0x034c, 7, 0, 0x18);
SERDES_AM654_CFG(0x039c, 23, 16, 0x3b);
SERDES_AM654_CFG(0x0a04, 7, 0, 0x03);
SERDES_AM654_CFG(0x0a14, 31, 24, 0x3c);
SERDES_AM654_CFG(0x0a18, 15, 8, 0x3c);
SERDES_AM654_CFG(0x0a38, 7, 0, 0x3e);
SERDES_AM654_CFG(0x0a38, 15, 8, 0x3e);
SERDES_AM654_CFG(0x0ae0, 7, 0, 0x07);
SERDES_AM654_CFG(0x0b6c, 23, 16, 0xcd);
SERDES_AM654_CFG(0x0b6c, 31, 24, 0x04);
SERDES_AM654_CFG(0x0b98, 23, 16, 0x03);
SERDES_AM654_CFG(0x1400, 7, 0, 0x3f);
SERDES_AM654_CFG(0x1404, 23, 16, 0x6f);
SERDES_AM654_CFG(0x1404, 31, 24, 0x6f);
SERDES_AM654_CFG(0x140c, 7, 0, 0x6f);
SERDES_AM654_CFG(0x140c, 15, 8, 0x6f);
SERDES_AM654_CFG(0x1410, 15, 8, 0x27);
SERDES_AM654_CFG(0x1414, 7, 0, 0x0c);
SERDES_AM654_CFG(0x1414, 23, 16, 0x07);
SERDES_AM654_CFG(0x1418, 23, 16, 0x40);
SERDES_AM654_CFG(0x141c, 7, 0, 0x00);
SERDES_AM654_CFG(0x141c, 15, 8, 0x1f);
SERDES_AM654_CFG(0x1428, 31, 24, 0x08);
SERDES_AM654_CFG(0x1434, 31, 24, 0x00);
SERDES_AM654_CFG(0x1444, 7, 0, 0x94);
SERDES_AM654_CFG(0x1460, 31, 24, 0x7f);
SERDES_AM654_CFG(0x1464, 7, 0, 0x43);
SERDES_AM654_CFG(0x1464, 23, 16, 0x6f);
SERDES_AM654_CFG(0x1464, 31, 24, 0x43);
SERDES_AM654_CFG(0x1484, 23, 16, 0x8f);
SERDES_AM654_CFG(0x1498, 7, 0, 0x4f);
SERDES_AM654_CFG(0x1498, 23, 16, 0x4f);
SERDES_AM654_CFG(0x007c, 31, 24, 0x0d);
SERDES_AM654_CFG(0x0b90, 15, 8, 0x0f);
return 0;
}
static int serdes_am654_pcie_init(struct serdes_am654 *phy)
{ {
struct serdes_am654 *phy = phy_get_drvdata(x);
int ret; int ret;
ret = regmap_field_write(phy->config_version, VERSION); ret = regmap_field_write(phy->config_version, VERSION);
...@@ -220,11 +303,28 @@ static int serdes_am654_init(struct phy *x) ...@@ -220,11 +303,28 @@ static int serdes_am654_init(struct phy *x)
return 0; return 0;
} }
static int serdes_am654_init(struct phy *x)
{
struct serdes_am654 *phy = phy_get_drvdata(x);
switch (phy->type) {
case PHY_TYPE_PCIE:
return serdes_am654_pcie_init(phy);
case PHY_TYPE_USB3:
return serdes_am654_usb3_init(phy);
default:
return -EINVAL;
}
}
static int serdes_am654_reset(struct phy *x) static int serdes_am654_reset(struct phy *x)
{ {
struct serdes_am654 *phy = phy_get_drvdata(x); struct serdes_am654 *phy = phy_get_drvdata(x);
int ret; int ret;
serdes_am654_disable_pll(phy);
serdes_am654_disable_txrx(phy);
ret = regmap_field_write(phy->por_en, 0x1); ret = regmap_field_write(phy->por_en, 0x1);
if (ret) if (ret)
return ret; return ret;
......
drivers/phy/ti/phy-j721e-wiz.c
View file @ e611c0fe
This diff is collapsed.
drivers/phy/ti/phy-omap-usb2.c
View file @ e611c0fe
This diff is collapsed.
drivers/thunderbolt/Kconfig
View file @ e611c0fe
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
menuconfig USB4 menuconfig USB4
tristate "Unified support for USB4 and Thunderbolt" tristate "Unified support for USB4 and Thunderbolt"
depends on PCI depends on PCI
depends on X86 || COMPILE_TEST
select APPLE_PROPERTIES if EFI_STUB && X86 select APPLE_PROPERTIES if EFI_STUB && X86
select CRC32 select CRC32
select CRYPTO select CRYPTO
......
drivers/thunderbolt/icm.c
View file @ e611c0fe
...@@ -1633,6 +1633,15 @@ static void icm_icl_rtd3_veto(struct tb *tb, const struct icm_pkg_header *hdr) ...@@ -1633,6 +1633,15 @@ static void icm_icl_rtd3_veto(struct tb *tb, const struct icm_pkg_header *hdr)
icm_veto_end(tb); icm_veto_end(tb);
} }
static bool icm_tgl_is_supported(struct tb *tb)
{
/*
* If the firmware is not running use software CM. This platform
* should fully support both.
*/
return icm_firmware_running(tb->nhi);
}
static void icm_handle_notification(struct work_struct *work) static void icm_handle_notification(struct work_struct *work)
{ {
struct icm_notification *n = container_of(work, typeof(*n), work); struct icm_notification *n = container_of(work, typeof(*n), work);
...@@ -2269,6 +2278,19 @@ struct tb *icm_probe(struct tb_nhi *nhi) ...@@ -2269,6 +2278,19 @@ struct tb *icm_probe(struct tb_nhi *nhi)
icm->rtd3_veto = icm_icl_rtd3_veto; icm->rtd3_veto = icm_icl_rtd3_veto;
tb->cm_ops = &icm_icl_ops; tb->cm_ops = &icm_icl_ops;
break; break;
case PCI_DEVICE_ID_INTEL_TGL_NHI0:
case PCI_DEVICE_ID_INTEL_TGL_NHI1:
icm->is_supported = icm_tgl_is_supported;
icm->driver_ready = icm_icl_driver_ready;
icm->set_uuid = icm_icl_set_uuid;
icm->device_connected = icm_icl_device_connected;
icm->device_disconnected = icm_tr_device_disconnected;
icm->xdomain_connected = icm_tr_xdomain_connected;
icm->xdomain_disconnected = icm_tr_xdomain_disconnected;
icm->rtd3_veto = icm_icl_rtd3_veto;
tb->cm_ops = &icm_icl_ops;
break;
} }
if (!icm->is_supported || !icm->is_supported(tb)) { if (!icm->is_supported || !icm->is_supported(tb)) {
......
drivers/thunderbolt/nhi.c
View file @ e611c0fe
This diff is collapsed.
drivers/thunderbolt/nhi.h
View file @ e611c0fe
...@@ -73,6 +73,8 @@ extern const struct tb_nhi_ops icl_nhi_ops; ...@@ -73,6 +73,8 @@ extern const struct tb_nhi_ops icl_nhi_ops;
#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_BRIDGE 0x15ef #define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_BRIDGE 0x15ef
#define PCI_DEVICE_ID_INTEL_ICL_NHI1 0x8a0d #define PCI_DEVICE_ID_INTEL_ICL_NHI1 0x8a0d
#define PCI_DEVICE_ID_INTEL_ICL_NHI0 0x8a17 #define PCI_DEVICE_ID_INTEL_ICL_NHI0 0x8a17
#define PCI_DEVICE_ID_INTEL_TGL_NHI0 0x9a1b
#define PCI_DEVICE_ID_INTEL_TGL_NHI1 0x9a1d
#define PCI_CLASS_SERIAL_USB_USB4 0x0c0340 #define PCI_CLASS_SERIAL_USB_USB4 0x0c0340
......
drivers/thunderbolt/switch.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/cdns3/cdns3-ti.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/cdns3/core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/cdns3/core.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/cdns3/drd.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/cdns3/ep0.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/cdns3/gadget.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/Kconfig
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/Makefile
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/ci.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/ci_hdrc_imx.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/ci_hdrc_imx.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/ci_hdrc_usb2.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/ci_hdrc_zevio.c deleted 100644 → 0
View file @ 3b69e8b4
This diff is collapsed.
drivers/usb/chipidea/core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/udc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/chipidea/usbmisc_imx.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/class/cdc-acm.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/class/usblp.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/core/hcd-pci.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/core/hub.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/core/hub.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/core/otg_whitelist.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/core/sysfs.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/core/usb.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/core.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/core_intr.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/debug.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/hcd.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/hw.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/params.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc2/platform.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/core.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/debug.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/debugfs.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/drd.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/dwc3-keystone.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/dwc3-meson-g12a.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/dwc3-of-simple.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/gadget.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/gadget.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/host.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/io.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/dwc3/trace.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/early/xhci-dbc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/early/xhci-dbc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/composite.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/configfs.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/f_acm.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/f_eem.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/f_fs.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/f_serial.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/f_tcm.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/f_uvc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/rndis.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_audio.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_ecm.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_eem.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_ether.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_fs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_gether.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_hid.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_midi.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_ncm.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_phonet.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_printer.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_rndis.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_serial.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_serial.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_tcm.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_uac1.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_uac1_legacy.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_uac2.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/u_uvc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/uvc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/uvc_configfs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/uvc_v4l2.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/uvc_v4l2.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/uvc_video.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/function/uvc_video.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/legacy/mass_storage.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/aspeed-vhub/core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/aspeed-vhub/hub.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/aspeed-vhub/vhub.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/atmel_usba_udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/atmel_usba_udc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/dummy_hcd.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/fsl_udc_core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/gr_udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/lpc32xx_udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/m66592-udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/max3420_udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/mv_u3d_core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/net2272.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/omap_udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/s3c2410_udc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/tegra-xudc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/udc/udc-xilinx.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/gadget/usbstring.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/Kconfig
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/Makefile
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-brcm.c 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-fsl.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-mv.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-mxc.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-pci.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-platform.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci-tegra.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ehci.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/fhci.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/imx21-hcd.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ohci-pci.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ohci-platform.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ohci-sm501.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/ohci.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/pci-quirks.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/r8a66597.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/u132-hcd.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/uhci-pci.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-debugfs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-ext-caps.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-mtk.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-mvebu.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-pci-renesas.c 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-pci.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-pci.h 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-plat.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-plat.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-rcar.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci-trace.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/host/xhci.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/isp1760/isp1760-core.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/isp1760/isp1760-regs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/isp1760/isp1760-udc.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/misc/sisusbvga/sisusb.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/misc/sisusbvga/sisusb_init.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/misc/sisusbvga/sisusb_struct.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/misc/usb_u132.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/mtu3/mtu3.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/mtu3/mtu3_debug.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/mtu3/mtu3_dr.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/mtu3/mtu3_hw_regs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/mtu3/mtu3_qmu.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/mtu3/mtu3_trace.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/davinci.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/jz4740.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/mediatek.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_core.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_core.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_debug.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_debugfs.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_dma.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_gadget.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_host.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_host.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_io.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_regs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/musb_trace.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/omap2430.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/musb/tusb6010.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/phy/phy-fsl-usb.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/phy/phy-jz4770.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/phy/phy-mv-usb.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/common.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/fifo.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/mod.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/pipe.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/rcar2.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/rcar3.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/renesas_usbhs/rza.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/roles/class.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/belkin_sa.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/ch341.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/io_16654.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/io_edgeport.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/io_ionsp.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/io_ti.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/io_usbvend.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/iuu_phoenix.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/mct_u232.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/option.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/oti6858.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/pl2303.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/qcserial.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/usb_wwan.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/visor.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/serial/whiteheat.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/debug.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/initializers.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/protocol.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/scsiglue.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/sierra_ms.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/transport.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_alauda.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_cypress.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_datafab.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_devs.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_ene_ub6250.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_freecom.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_isd200.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_jumpshot.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_karma.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_onetouch.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_realtek.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_sddr09.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_sddr55.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_uas.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/unusual_usbat.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/storage/usb.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/Kconfig
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/class.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/mux/intel_pmc_mux.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/tcpm/fusb302.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/tcpm/fusb302_reg.h
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/tps6598x.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/ucsi/Makefile
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/ucsi/psy.c 0 → 100644
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/ucsi/trace.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/ucsi/ucsi.c
View file @ e611c0fe
This diff is collapsed.
drivers/usb/typec/ucsi/ucsi.h
View file @ e611c0fe
This diff is collapsed.
include/dt-bindings/phy/phy.h
View file @ e611c0fe
This diff is collapsed.
include/linux/phy/omap_usb.h
View file @ e611c0fe
This diff is collapsed.
include/linux/thunderbolt.h
View file @ e611c0fe
This diff is collapsed.
include/linux/usb/chipidea.h
View file @ e611c0fe
This diff is collapsed.
include/linux/usb/composite.h
View file @ e611c0fe
This diff is collapsed.
include/linux/usb/gadget.h
View file @ e611c0fe
This diff is collapsed.
include/linux/usb/hcd.h
View file @ e611c0fe
This diff is collapsed.
include/linux/usb/typec.h
View file @ e611c0fe
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7