Armada 380 has smilar USB-2.0 PHYs as CP-110 (Armada 8K).
Add support for Armada 380 to cp110 utmi phy driver, and enable it for armada-388-clearfog boards.
Additionally add a small bugfix for armada-388 clearfog: Enable Clearfog Base M.2 connector for cellular modems with USB-2.0/3.0 interface. This is not separated out to avoid future merge conflicts.
Signed-off-by: Josua Mayer josua@solid-run.com --- Changes in v3: - updated bindings with additional comments, tested with dtbs_check: used anyOf for the newly-added optional regs - added fix for clearfog base m.2 connector / enable third usb - dropped unnecessary syscon node using invalid compatible (Reported-by: Krzysztof Kozlowski krzk@kernel.org) - Link to v2: https://lore.kernel.org/r/20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run...
Changes in v2: - add support for optional regs / make syscon use optional - add device-tree changes for armada-388-clearfog - attempted to fix warning reported by krobot (untested) - tested on actual hardware - drafted dt-bindings - Link to v1: https://lore.kernel.org/r/20240715-a38x-utmi-phy-v1-0-d57250f53cf2@solid-run...
--- Josua Mayer (6): arm: dts: marvell: armada-388-clearfog: enable third usb on m.2/mpcie arm: dts: marvell: armada-388-clearfog-base: add rfkill for m.2 dt-bindings: phy: cp110-utmi-phy: add compatible string for armada-38x arm: dts: marvell: armada-38x: add description for usb phys phy: mvebu-cp110-utmi: add support for armada-380 utmi phys arm: dts: marvell: armada-388-clearfog: add description for usb phys
.../phy/marvell,armada-cp110-utmi-phy.yaml | 34 +++- .../boot/dts/marvell/armada-388-clearfog-base.dts | 41 ++++ arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 8 + arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi | 30 ++- arch/arm/boot/dts/marvell/armada-38x.dtsi | 24 +++ drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 209 ++++++++++++++++----- 6 files changed, 288 insertions(+), 58 deletions(-) --- base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 change-id: 20240715-a38x-utmi-phy-02e8059afe35
Sincerely,
Armada 388 Clearfog Pro has a USB-2.0 capable minipcie connector "CON2". Clearfog Base has an M.2 connector combining USB-2.0 and USB-3.0 plus various pins controlled by the host:
- FULL_CARD_POWER_OFF#: When low, M.2 LTE modules are switched off. Many modules include pull-down, thus it must be driven high actively. - RESET#: Puts modules into reset when low. Modules are expected to include pull-up. - GNSS_DISABLE# - W_DISABLE#
Enable the usb controller node for the first combined usb-2.0/3.0 controller, for both clearfog base and pro.
To Clearfog base add gpio hogs for power-off and reset to ensure modules are operational by default.
Cc: stable@vger.kernel.org Signed-off-by: Josua Mayer josua@solid-run.com --- .../boot/dts/marvell/armada-388-clearfog-base.dts | 21 +++++++++++++++++++++ arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 5 +++++ 2 files changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts index f7daa3bc707e..03153186c7bb 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts @@ -33,6 +33,22 @@ ð1 { phy = <&phy1>; };
+&expander0 { + m2-full-card-power-off-hog { + gpio-hog; + gpios = <2 GPIO_ACTIVE_LOW>; + output-low; + line-name = "m2-full-card-power-off"; + }; + + m2-reset-hog { + gpio-hog; + gpios = <10 GPIO_ACTIVE_LOW>; + output-low; + line-name = "m2-reset"; + }; +}; + &gpio0 { phy1_reset { gpio-hog; @@ -66,3 +82,8 @@ rear_button_pins: rear-button-pins { marvell,function = "gpio"; }; }; + +/* SRDS #4 - USB-2.0/3.0 Host, M.2 */ +&usb3_0 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts index 09bf2e6d4ed0..d6d7cc885f4d 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts @@ -182,3 +182,8 @@ &spi1 { */ pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>; }; + +/* USB-2.0 Host, CON2 - nearest CPU */ +&usb3_0 { + status = "okay"; +};
On Sat, 20 Jul 2024 16:19:17 +0200, Josua Mayer wrote:
Armada 380 has smilar USB-2.0 PHYs as CP-110 (Armada 8K).
Add support for Armada 380 to cp110 utmi phy driver, and enable it for armada-388-clearfog boards.
Additionally add a small bugfix for armada-388 clearfog: Enable Clearfog Base M.2 connector for cellular modems with USB-2.0/3.0 interface. This is not separated out to avoid future merge conflicts.
Signed-off-by: Josua Mayer josua@solid-run.com
Changes in v3:
- updated bindings with additional comments, tested with dtbs_check: used anyOf for the newly-added optional regs
- added fix for clearfog base m.2 connector / enable third usb
- dropped unnecessary syscon node using invalid compatible (Reported-by: Krzysztof Kozlowski krzk@kernel.org)
- Link to v2: https://lore.kernel.org/r/20240716-a38x-utmi-phy-v2-0-dae3a9c6ca3e@solid-run...
Changes in v2:
- add support for optional regs / make syscon use optional
- add device-tree changes for armada-388-clearfog
- attempted to fix warning reported by krobot (untested)
- tested on actual hardware
- drafted dt-bindings
- Link to v1: https://lore.kernel.org/r/20240715-a38x-utmi-phy-v1-0-d57250f53cf2@solid-run...
Josua Mayer (6): arm: dts: marvell: armada-388-clearfog: enable third usb on m.2/mpcie arm: dts: marvell: armada-388-clearfog-base: add rfkill for m.2 dt-bindings: phy: cp110-utmi-phy: add compatible string for armada-38x arm: dts: marvell: armada-38x: add description for usb phys phy: mvebu-cp110-utmi: add support for armada-380 utmi phys arm: dts: marvell: armada-388-clearfog: add description for usb phys
.../phy/marvell,armada-cp110-utmi-phy.yaml | 34 +++- .../boot/dts/marvell/armada-388-clearfog-base.dts | 41 ++++ arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 8 + arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi | 30 ++- arch/arm/boot/dts/marvell/armada-38x.dtsi | 24 +++ drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 209 ++++++++++++++++----- 6 files changed, 288 insertions(+), 58 deletions(-)
base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 change-id: 20240715-a38x-utmi-phy-02e8059afe35
Sincerely,
Josua Mayer josua@solid-run.com
My bot found new DTB warnings on the .dts files added or changed in this series.
Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.
If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:
pip3 install dtschema --upgrade
New warnings running 'make CHECK_DTBS=y marvell/armada-388-clearfog-base.dtb marvell/armada-388-clearfog.dtb' for 20240720-a38x-utmi-phy-v3-0-4c16f9abdbdc@solid-run.com:
arch/arm/boot/dts/marvell/armada-388-clearfog-base.dtb: usb@58000: phy-names:0: 'usb' was expected from schema $id: http://devicetree.org/schemas/usb/generic-ehci.yaml# arch/arm/boot/dts/marvell/armada-388-clearfog.dtb: usb@58000: phy-names:0: 'usb' was expected from schema $id: http://devicetree.org/schemas/usb/generic-ehci.yaml# arch/arm/boot/dts/marvell/armada-388-clearfog-base.dtb: usb3@f0000: Unevaluated properties are not allowed ('compatible', 'dr_mode', 'reg' were unexpected) from schema $id: http://devicetree.org/schemas/usb/generic-xhci.yaml# arch/arm/boot/dts/marvell/armada-388-clearfog-base.dtb: usb3@f8000: Unevaluated properties are not allowed ('compatible', 'dr_mode', 'reg' were unexpected) from schema $id: http://devicetree.org/schemas/usb/generic-xhci.yaml# arch/arm/boot/dts/marvell/armada-388-clearfog.dtb: usb3@f0000: Unevaluated properties are not allowed ('compatible', 'dr_mode', 'reg' were unexpected) from schema $id: http://devicetree.org/schemas/usb/generic-xhci.yaml# arch/arm/boot/dts/marvell/armada-388-clearfog.dtb: usb3@f8000: Unevaluated properties are not allowed ('compatible', 'dr_mode', 'reg' were unexpected) from schema $id: http://devicetree.org/schemas/usb/generic-xhci.yaml#
linux-stable-mirror@lists.linaro.org
-
Josua Mayer -
Rob Herring (Arm)