Skip to content

Commit

Permalink
staging: mt7621-pci: use only two phys from device tree
Browse files Browse the repository at this point in the history
In order to align work with the mt7621-pci-phy part of
the driver and device tree which is now using only two
real phys one of them dual ported properly parse the
device tree and don't call phy initialization for the
slot 1 because is being taking into account when the
phy for the slot 0 is instantiated.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20200320110123.9907-4-sergio.paracuellos@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
paraka authored and gregkh committed Mar 20, 2020
1 parent f178754 commit bf516f4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/staging/mt7621-pci/pci-mt7621.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ static int mt7621_pcie_parse_port(struct mt7621_pcie *pcie,

snprintf(name, sizeof(name), "pcie-phy%d", slot);
port->phy = devm_phy_get(dev, name);
if (IS_ERR(port->phy))
if (IS_ERR(port->phy) && slot != 1)
return PTR_ERR(port->phy);

port->gpio_rst = devm_gpiod_get_index_optional(dev, "reset", slot,
Expand Down Expand Up @@ -495,6 +495,11 @@ static void mt7621_pcie_init_ports(struct mt7621_pcie *pcie)
list_for_each_entry_safe(port, tmp, &pcie->ports, list) {
u32 slot = port->slot;

if (slot == 1) {
port->enabled = true;
continue;
}

err = mt7621_pcie_init_port(port);
if (err) {
dev_err(dev, "Initiating port %d failed\n", slot);
Expand Down

0 comments on commit bf516f4

Please sign in to comment.