[PATCH u-boot-marvell 2/9] phy: marvell: a3700: Update compatible string to official DT bindings

Pali Rohár pali at kernel.org
Mon Feb 14 11:34:23 CET 2022


In commit d368e1070514 ("phy: marvell: a3700: Convert to official DT
bindings in COMPHY driver") was done update to official DT bindings but
compatible string of official DT bindings was not updated.

Fix it now.

Fixes: d368e1070514 ("phy: marvell: a3700: Convert to official DT bindings in COMPHY driver")
Signed-off-by: Pali Rohár <pali at kernel.org>
---
 arch/arm/dts/armada-37xx.dtsi     | 2 +-
 drivers/phy/marvell/comphy_core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index bef6ef03df68..b363212dc8bd 100644
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -313,7 +313,7 @@
 			};
 
 			comphy: comphy at 18300 {
-				compatible = "marvell,mvebu-comphy", "marvell,comphy-armada-3700";
+				compatible = "marvell,comphy-a3700";
 				reg = <0x18300 0x28>,
 				      <0x1f300 0x3d000>;
 				#address-cells = <1>;
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 5bb994fe42a5..df2460dbd7dc 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -96,7 +96,7 @@ static int comphy_probe(struct udevice *dev)
 	if (IS_ERR(chip_cfg->hpipe3_base_addr))
 		return PTR_ERR(chip_cfg->hpipe3_base_addr);
 
-	if (device_is_compatible(dev, "marvell,comphy-armada-3700")) {
+	if (device_is_compatible(dev, "marvell,comphy-a3700")) {
 		chip_cfg->comphy_init_map = comphy_a3700_init_serdes_map;
 		chip_cfg->ptr_comphy_chip_init = comphy_a3700_init;
 		chip_cfg->rx_training = NULL;
@@ -145,6 +145,7 @@ static int comphy_probe(struct udevice *dev)
 
 static const struct udevice_id comphy_ids[] = {
 	{ .compatible = "marvell,mvebu-comphy" },
+	{ .compatible = "marvell,comphy-a3700" },
 	{ }
 };
 
-- 
2.20.1



More information about the U-Boot mailing list