On 2/14/22 11:34, Pali Rohár wrote:
Official DT bindings use compatible string marvell,armada-3700-ehci. Update drivers and DTS files.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
arch/arm/dts/armada-37xx.dtsi | 2 +- drivers/phy/marvell/comphy_a3700.c | 2 +- drivers/usb/host/ehci-marvell.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi index b363212dc8bd..a427d9cf6218 100644 --- a/arch/arm/dts/armada-37xx.dtsi +++ b/arch/arm/dts/armada-37xx.dtsi @@ -234,7 +234,7 @@ };
usb2: usb@5e000 {
compatible = "marvell,armada3700-ehci";
compatible = "marvell,armada-3700-ehci"; reg = <0x5e000 0x450>; status = "disabled"; };diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c index 7cde59b8e28f..c490dc69c695 100644 --- a/drivers/phy/marvell/comphy_a3700.c +++ b/drivers/phy/marvell/comphy_a3700.c @@ -937,7 +937,7 @@ void comphy_dedicated_phys_init(void) */ if (usb32 == 0) { node = fdt_node_offset_by_compatible(
blob, -1, "marvell,armada3700-ehci");
blob, -1, "marvell,armada-3700-ehci");diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 5420bb9772b5..b7e60c690a4f 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -123,7 +123,7 @@ static int ehci_mvebu_probe(struct udevice *dev) * Also, the address decoder doesn't need to get setup with this * SoC, so don't call usb_brg_adrdec_setup(). */
- if (device_is_compatible(dev, "marvell,armada3700-ehci"))
- if (device_is_compatible(dev, "marvell,armada-3700-ehci")) marvell_ehci_ops.powerup_fixup = marvell_ehci_powerup_fixup; else usb_brg_adrdec_setup((void *)priv->hcd_base);
@@ -142,7 +142,7 @@ static int ehci_mvebu_probe(struct udevice *dev)
static const struct udevice_id ehci_usb_ids[] = { { .compatible = "marvell,orion-ehci", },
- { .compatible = "marvell,armada3700-ehci", },
- { .compatible = "marvell,armada-3700-ehci", }, { } };
Viele Grüße, Stefan Roese