aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-02-14 11:34:23 +0100
committerStefan Roese <sr@denx.de>2022-02-17 14:17:07 +0100
commit9bc68546bb1a4bb6e349cc2bf608348ed4f0538e (patch)
tree3b2b78f0bfa928ae3852f0be9ee21afa6749f0b1
parent48c144f8ef9c6b35dc76b803bf8277131993381f (diff)
downloadu-boot-9bc68546bb1a4bb6e349cc2bf608348ed4f0538e.zip
u-boot-9bc68546bb1a4bb6e349cc2bf608348ed4f0538e.tar.gz
u-boot-9bc68546bb1a4bb6e349cc2bf608348ed4f0538e.tar.bz2
phy: marvell: a3700: Update compatible string to official DT bindings
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@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/arm/dts/armada-37xx.dtsi2
-rw-r--r--drivers/phy/marvell/comphy_core.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index bef6ef0..b363212 100644
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -313,7 +313,7 @@
};
comphy: comphy@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 5bb994f..df2460d 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" },
{ }
};