mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
020ddfcfa1
* Address stability issues, update configuration. * Cleanup - remove not needed patches * Add upstream patches Board survived regular stress testing while previous config/version hanged instantly.
271 lines
9.2 KiB
Diff
271 lines
9.2 KiB
Diff
Convert DWC2 bindings to DT schema format using json-schema.
|
|
DWC2 is widely use but a couple of compatibles and properties
|
|
(vusb_d-supply,vusb_a-supply) were missing in dwc2.txt, the
|
|
patch add them.
|
|
|
|
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
|
|
---
|
|
CC: Minas Harutyunyan <hminas@synopsys.com>
|
|
|
|
changes in version 2:
|
|
- put Minas Harutyunyan <hminas@synopsys.com> as maintainer
|
|
- remove type and description from phy property
|
|
- remove description from compatible items
|
|
- simplify samsung,s3c6400-hsotg compatible handling
|
|
|
|
Documentation/devicetree/bindings/usb/dwc2.txt | 64 ----------
|
|
Documentation/devicetree/bindings/usb/dwc2.yaml | 152 ++++++++++++++++++++++++
|
|
2 files changed, 152 insertions(+), 64 deletions(-)
|
|
delete mode 100644 Documentation/devicetree/bindings/usb/dwc2.txt
|
|
create mode 100644 Documentation/devicetree/bindings/usb/dwc2.yaml
|
|
|
|
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
|
|
deleted file mode 100644
|
|
index aafff3a6904d..000000000000
|
|
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
|
|
+++ /dev/null
|
|
@@ -1,64 +0,0 @@
|
|
-Platform DesignWare HS OTG USB 2.0 controller
|
|
------------------------------------------------------
|
|
-
|
|
-Required properties:
|
|
-- compatible : One of:
|
|
- - brcm,bcm2835-usb: The DWC2 USB controller instance in the BCM2835 SoC.
|
|
- - hisilicon,hi6220-usb: The DWC2 USB controller instance in the hi6220 SoC.
|
|
- - rockchip,rk3066-usb: The DWC2 USB controller instance in the rk3066 Soc;
|
|
- - "rockchip,px30-usb", "rockchip,rk3066-usb", "snps,dwc2": for px30 Soc;
|
|
- - "rockchip,rk3188-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3188 Soc;
|
|
- - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;
|
|
- - "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;
|
|
- - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;
|
|
- - "amlogic,meson8-usb": The DWC2 USB controller instance in Amlogic Meson8 SoCs;
|
|
- - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;
|
|
- - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;
|
|
- - "amlogic,meson-g12a-usb": The DWC2 USB controller instance in Amlogic G12A SoCs;
|
|
- - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;
|
|
- - snps,dwc2: A generic DWC2 USB controller with default parameters.
|
|
- - "st,stm32f4x9-fsotg": The DWC2 USB FS/HS controller instance in STM32F4x9 SoCs
|
|
- configured in FS mode;
|
|
- - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs
|
|
- configured in HS mode;
|
|
- - "st,stm32f7-hsotg": The DWC2 USB HS controller instance in STM32F7 SoCs
|
|
- configured in HS mode;
|
|
-- reg : Should contain 1 register range (address and length)
|
|
-- interrupts : Should contain 1 interrupt
|
|
-- clocks: clock provider specifier
|
|
-- clock-names: shall be "otg"
|
|
-Refer to clk/clock-bindings.txt for generic clock consumer properties
|
|
-
|
|
-Optional properties:
|
|
-- phys: phy provider specifier
|
|
-- phy-names: shall be "usb2-phy"
|
|
-- vbus-supply: reference to the VBUS regulator. Depending on the current mode
|
|
- this is enabled (in "host" mode") or disabled (in "peripheral" mode). The
|
|
- regulator is updated if the controller is configured in "otg" mode and the
|
|
- status changes between "host" and "peripheral".
|
|
-Refer to phy/phy-bindings.txt for generic phy consumer properties
|
|
-- dr_mode: shall be one of "host", "peripheral" and "otg"
|
|
- Refer to usb/generic.txt
|
|
-- g-rx-fifo-size: size of rx fifo size in gadget mode.
|
|
-- g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
|
|
-- g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
|
|
-- snps,need-phy-for-wake: If present indicates that the phy needs to be left
|
|
- on for remote wakeup during suspend.
|
|
-- snps,reset-phy-on-wake: If present indicates that we need to reset the PHY when
|
|
- we detect a wakeup. This is due to a hardware errata.
|
|
-
|
|
-Deprecated properties:
|
|
-- g-use-dma: gadget DMA mode is automatically detected
|
|
-
|
|
-Example:
|
|
-
|
|
- usb@101c0000 {
|
|
- compatible = "ralink,rt3050-usb, snps,dwc2";
|
|
- reg = <0x101c0000 40000>;
|
|
- interrupts = <18>;
|
|
- clocks = <&usb_otg_ahb_clk>;
|
|
- clock-names = "otg";
|
|
- phys = <&usbphy>;
|
|
- phy-names = "usb2-phy";
|
|
- snps,need-phy-for-wake;
|
|
- };
|
|
diff --git a/Documentation/devicetree/bindings/usb/dwc2.yaml b/Documentation/devicetree/bindings/usb/dwc2.yaml
|
|
new file mode 100644
|
|
index 000000000000..e29dfcd2466c
|
|
--- /dev/null
|
|
+++ b/Documentation/devicetree/bindings/usb/dwc2.yaml
|
|
@@ -0,0 +1,152 @@
|
|
+# SPDX-License-Identifier: GPL-2.0
|
|
+%YAML 1.2
|
|
+---
|
|
+$id: http://devicetree.org/schemas/usb/dwc2.yaml#
|
|
+$schema: http://devicetree.org/meta-schemas/core.yaml#
|
|
+
|
|
+title: DesignWare HS OTG USB 2.0 controller Bindings
|
|
+
|
|
+maintainers:
|
|
+ - Minas Harutyunyan <hminas@synopsys.com>
|
|
+
|
|
+properties:
|
|
+ compatible:
|
|
+ oneOf:
|
|
+ - const: brcm,bcm2835-usb
|
|
+ - const: hisilicon,hi6220-usb
|
|
+ - items:
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: rockchip,px30-usb
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: rockchip,rk3036-usb
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: rockchip,rv1108-usb
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: rockchip,rk3188-usb
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: rockchip,rk3228-usb
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: rockchip,rk3288-usb
|
|
+ - const: rockchip,rk3066-usb
|
|
+ - const: snps,dwc2
|
|
+ - const: lantiq,arx100-usb
|
|
+ - const: lantiq,xrx200-usb
|
|
+ - items:
|
|
+ - const: amlogic,meson8-usb
|
|
+ - const: snps,dwc2
|
|
+ - items:
|
|
+ - const: amlogic,meson8b-usb
|
|
+ - const: snps,dwc2
|
|
+ - const: amlogic,meson-gxbb-usb
|
|
+ - items:
|
|
+ - const: amlogic,meson-g12a-usb
|
|
+ - const: snps,dwc2
|
|
+ - const: amcc,dwc-otg
|
|
+ - const: snps,dwc2
|
|
+ - const: st,stm32f4x9-fsotg
|
|
+ - const: st,stm32f4x9-hsotg
|
|
+ - const: st,stm32f7-hsotg
|
|
+ - const: samsung,s3c6400-hsotg
|
|
+
|
|
+ reg:
|
|
+ maxItems: 1
|
|
+
|
|
+ interrupts:
|
|
+ maxItems: 1
|
|
+
|
|
+ clocks:
|
|
+ maxItems: 1
|
|
+
|
|
+ clock-names:
|
|
+ items:
|
|
+ - const: otg
|
|
+
|
|
+ resets:
|
|
+ items:
|
|
+ - description: common reset
|
|
+ - description: ecc reset
|
|
+ minItems: 1
|
|
+
|
|
+ reset-names:
|
|
+ items:
|
|
+ - const: dwc2
|
|
+ - const: dwc2-ecc
|
|
+ minItems: 1
|
|
+
|
|
+ phys:
|
|
+ maxItems: 1
|
|
+
|
|
+ phy-names:
|
|
+ const: usb2-phy
|
|
+
|
|
+ vbus-supply:
|
|
+ description: reference to the VBUS regulator. Depending on the current mode
|
|
+ this is enabled (in "host" mode") or disabled (in "peripheral" mode). The
|
|
+ regulator is updated if the controller is configured in "otg" mode and the
|
|
+ status changes between "host" and "peripheral".
|
|
+
|
|
+ vusb_d-supply:
|
|
+ description: phandle to voltage regulator of digital section,
|
|
+
|
|
+ vusb_a-supply:
|
|
+ description: phandle to voltage regulator of analog section.
|
|
+
|
|
+ dr_mode:
|
|
+ enum: [host, peripheral, otg]
|
|
+
|
|
+ g-rx-fifo-size:
|
|
+ $ref: /schemas/types.yaml#/definitions/uint32
|
|
+ description: size of rx fifo size in gadget mode.
|
|
+
|
|
+ g-np-tx-fifo-size:
|
|
+ $ref: /schemas/types.yaml#/definitions/uint32
|
|
+ description: size of non-periodic tx fifo size in gadget mode.
|
|
+
|
|
+ g-tx-fifo-size:
|
|
+ $ref: /schemas/types.yaml#/definitions/uint32-array
|
|
+ description: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
|
|
+
|
|
+ snps,need-phy-for-wake:
|
|
+ $ref: /schemas/types.yaml#/definitions/flag
|
|
+ description: If present indicates that the phy needs to be left on for remote wakeup during suspend.
|
|
+
|
|
+ snps,reset-phy-on-wake:
|
|
+ $ref: /schemas/types.yaml#/definitions/flag
|
|
+ description: If present indicates that we need to reset the PHY when we detect a wakeup.
|
|
+ This is due to a hardware errata.
|
|
+
|
|
+required:
|
|
+ - compatible
|
|
+ - reg
|
|
+ - interrupts
|
|
+ - clocks
|
|
+ - clock-names
|
|
+
|
|
+additionalProperties: false
|
|
+
|
|
+examples:
|
|
+ - |
|
|
+ usb@101c0000 {
|
|
+ compatible = "ralink,rt3050-usb, snps,dwc2";
|
|
+ reg = <0x101c0000 40000>;
|
|
+ interrupts = <18>;
|
|
+ clocks = <&usb_otg_ahb_clk>;
|
|
+ clock-names = "otg";
|
|
+ phys = <&usbphy>;
|
|
+ phy-names = "usb2-phy";
|
|
+ snps,need-phy-for-wake;
|
|
+ };
|
|
+
|
|
+...
|
|
|
|
Remove "snps,dwc2" from hsotg@12480000 node compatible list because
|
|
"samsung,s3c6400-hsotg" should be enough.
|
|
|
|
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
|
|
---
|
|
arch/arm/boot/dts/exynos3250.dtsi | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
|
|
index b016b0b68306..d4866269f4ee 100644
|
|
--- a/arch/arm/boot/dts/exynos3250.dtsi
|
|
+++ b/arch/arm/boot/dts/exynos3250.dtsi
|
|
@@ -362,7 +362,7 @@
|
|
};
|
|
|
|
hsotg: hsotg@12480000 {
|
|
- compatible = "samsung,s3c6400-hsotg", "snps,dwc2";
|
|
+ compatible = "samsung,s3c6400-hsotg";
|
|
reg = <0x12480000 0x20000>;
|
|
interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&cmu CLK_USBOTG>;
|