Commit bf516f41 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: mt7621-pci: use only two phys from device tree 



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: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20200320110123.9907-4-sergio.paracuellos@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f178754e

drivers/staging/mt7621-pci/pci-mt7621.c

+6 −1
Original line number Diff line number Diff line
@@ -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,
@@ -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);