From eefed634eb61e4094b9fb8183cb8d43b26838517 Mon Sep 17 00:00:00 2001

From: Grygorii Strashko <grygorii.strashko@ti.com>

Date: Fri, 14 Feb 2020 21:08:00 +0200

Subject: [PATCH] phy: ti: gmii-sel: fix set of copy-paste errors

Git-commit: eefed634eb61e4094b9fb8183cb8d43b26838517

Patch-mainline: v5.6-rc5

References: git-fixes

- under PHY_INTERFACE_MODE_MII the 'mode' func parameter is assigned

instead of 'gmii_sel_mode' and it's working only because the default value

'gmii_sel_mode' is set to 0.

- console outputs use 'rgmii_id' and 'mode' values to print PHY mode

instead of using 'submode' value which is representing PHY interface mode

now.

This patch fixes above two cases.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/phy/ti/phy-gmii-sel.c | 9 ++++-----

 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/phy/ti/phy-gmii-sel.c b/drivers/phy/ti/phy-gmii-sel.c

index a28bd15297f5..e998e9cd8d1f 100644

--- a/drivers/phy/ti/phy-gmii-sel.c

+++ b/drivers/phy/ti/phy-gmii-sel.c

@@ -80,20 +80,19 @@ static int phy_gmii_sel_mode(struct phy *phy, enum phy_mode mode, int submode)

 		break;

 	case PHY_INTERFACE_MODE_MII:

-		mode = AM33XX_GMII_SEL_MODE_MII;

+		gmii_sel_mode = AM33XX_GMII_SEL_MODE_MII;

 		break;

 	default:

-		dev_warn(dev,

-			 "port%u: unsupported mode: \"%s\". Defaulting to MII.\n",

-			 if_phy->id, phy_modes(rgmii_id));

+		dev_warn(dev, "port%u: unsupported mode: \"%s\"\n",

+			 if_phy->id, phy_modes(submode));

 		return -EINVAL;

 	}

 	if_phy->phy_if_mode = submode;

 	dev_dbg(dev, "%s id:%u mode:%u rgmii_id:%d rmii_clk_ext:%d\n",

-		__func__, if_phy->id, mode, rgmii_id,

+		__func__, if_phy->id, submode, rgmii_id,

 		if_phy->rmii_clock_external);

 	regfield = if_phy->fields[PHY_GMII_SEL_PORT_MODE];

-- 

2.16.4