Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Steen Hegelund <Steen.Hegelund@microchip.com>,
        Lars Povlsen <lars.povlsen@microchip.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Russell King <linux@armlinux.org.uk>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Jakub Kicinski <kuba@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>, UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Lee Jones <lee.jones@linaro.org>, katie.morris@in-advantage.com
Subject: [RFC v6 net-next 4/9] net: mdio: mscc-miim: add ability to externally register phy reset control
Date:   Sat, 29 Jan 2022 14:02:16 -0800
Message-Id: <20220129220221.2823127-5-colin.foster@in-advantage.com>
In-Reply-To: <20220129220221.2823127-1-colin.foster@in-advantage.com>
References: <20220129220221.2823127-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?942kI0hKvSbzADZWTkJvqcrtEdkDTPLQ+tdKkVE7c6zVJxw78TEYJlTiJk3r?=
 =?us-ascii?Q?JjAk9mtQyOFmvjFWo7PhzO/Cgx2Iiv5hOKyAnAlwqiLoLu3t9sXcT+ubNCi7?=
 =?us-ascii?Q?9rMtR9Wsu6vn5XwShjURgHFx/qVkMcPb8jgSa17bPM0f/Kdvc5CDzhsg/iv+?=
 =?us-ascii?Q?jdd+xkXaf8Ym4EQv7KvWnC2hNUCYtva4sZRHFZaeoGxlXP7Jt4Fx3KlP4J+F?=
 =?us-ascii?Q?YSyDra4a2xQWXbrL1hlkekGYxHaQ6HEuZyg6jW7h1Tj48WUCReC9ADnwP0lG?=
 =?us-ascii?Q?BRTL+85PLvWJh8O42QELDj6HCB2K7u/9oyruANxmRkLGaDkI4yECOpzxXs3f?=
 =?us-ascii?Q?B1iC9vxoRlkbzmhAanUZjWCEZM4Ly/ytEG735lzze9rCqVNE+0/ePlv+RVmV?=
 =?us-ascii?Q?6Q7Ybr4FtoFAjPcIUniTBoK3yyOAVYXw2oiQfNPYGw7j2FB1Iub59tIhDKZL?=
 =?us-ascii?Q?TipCYUvN95m6iGckhsVOlovVI1yT4co9qXlPEEIjZk76eOUGaCKJ7z5WiUCw?=
 =?us-ascii?Q?XDkbh2u6EtmyrEmXokOHwRq6ZIDW/RHDtTn3D/Mrh8cDawrVjVzNWkAkWm8b?=
 =?us-ascii?Q?AXAAIerNXT699m9si0BvZxqzcbDA/YwUZu+B+xWWBPI85Q3VDwOynOWgMkw1?=
 =?us-ascii?Q?+umqf8pA61HmaIRwarUkLyfe/hh3wrxSY2FVTcVLuW9JZvVYzn7/dwGhahEd?=
 =?us-ascii?Q?y6Z9v+I25SuUuy+kclTptoqzAnvoCn5fX8rR1Dl6ThTk3afMEDvPrAybiVGT?=
 =?us-ascii?Q?mhw1BukbLwpKFtjkt6xJNYFRdTjarMEIOGF7LKD5QlUBIdhnF7LzSObsaHux?=
 =?us-ascii?Q?u4t2ncl2Q+FDrUk/xrPvtfcLFmE5oE3OKhbu4Pt7XgFs0fxUscLwGSS4KVcZ?=
 =?us-ascii?Q?uNdAFcBltp/xXiYYQLmzzvojckH1pt+gPCcN+otx18xSRC3FVjWYP2yIaRWU?=
 =?us-ascii?Q?rbHXrELGYM/Amh3MdXUm7Cknz6NpcdoKjInBdqD/1nnaTDGbStXrNdFNo0/i?=
 =?us-ascii?Q?NrVY6UzmIL1Fv8TH221cgOdaBoYf9aZomA3MMfkBIwmWk9NCtHp/SJ2ar27p?=
 =?us-ascii?Q?n3DvgZ+jbwhhZrB7SXRbqv6w0nmzU9FbBCKUT86r67uml4ibCS19jHxw6mRe?=
 =?us-ascii?Q?GiRIU3k/vii1UFNv2g+MNndva4ToXOKb8TSONqTbsL5Tk+d6uK8h1PayK0SA?=
 =?us-ascii?Q?4X2biGGOMkx05iP4+FiLX2OC5t0c+tuN8BR10ZKrAxIiYFRm5BhxSiIAlSjm?=
 =?us-ascii?Q?ZStzoKrvjWHsEcCpJ8cVhG5KKrivj77jfghbii0nmyX3341VeinC9M4oiVRg?=
 =?us-ascii?Q?TIZTXM5eV9mJr49cq5pCyiEQItC1doOdoPSKsl1Ic5kbhqwnhYAbzClEpDVm?=
 =?us-ascii?Q?j8c6S7iyOL2RPyh7/3RiK5t/q5+dkwnR/1NnZdJ+iRCtMTcXh4PJqobZ8UPH?=
 =?us-ascii?Q?vsruVRYt4HSkhlCU7ZfD2ENQ+Yv44P6fHzgGaAqOBCYSHCZYcA7Nwarc9Lfr?=
 =?us-ascii?Q?/iVWKN2OCIw0/mP8aRt6GjmAiYrrKe4gUFrhEo5dKqLnODa8tEvcizNAOHuQ?=
 =?us-ascii?Q?Wj1YSIx1WM6kOrmmo6N3rFykCAQqJsgA97sOwJW437CQzMSy0XOo4/XbEdYx?=
 =?us-ascii?Q?iAf6Squ62Uow68MfvVjbcxVGZAQ0DOYCY5BV78WD6RbWwl0qN9Yrmh114EAX?=
 =?us-ascii?Q?BbHzyg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2374cf7e-d90c-4a2d-f634-08d9e3731295
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2022 22:02:42.4072
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JOU9PqrBWEU0O5aS0li0bBiwb6lAyLBi2/bJDNQ2EomBuao0rHEx6Psu5M9/lmTGtIOjsSl2QS3ze1UaszXBMGzzpUv8s5uBIjuUAhhvBFI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2968
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The ocelot-ext driver requires the phys to be externally controlled by an
optional parameter. This commit exposes that variable so it can be
utilized.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/net/dsa/ocelot/seville_vsc9953.c |  3 ++-
 drivers/net/mdio/mdio-mscc-miim.c        | 10 ++++++----
 include/linux/mdio/mdio-mscc-miim.h      |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 8c1c9da61602..c6264e9f4c37 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -1021,7 +1021,8 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
 
 	rc = mscc_miim_setup(dev, &bus, "VSC9953 internal MDIO bus",
 			     ocelot->targets[GCB],
-			     ocelot->map[GCB][GCB_MIIM_MII_STATUS & REG_MASK]);
+			     ocelot->map[GCB][GCB_MIIM_MII_STATUS & REG_MASK],
+			     NULL, 0);
 
 	if (rc) {
 		dev_err(dev, "failed to setup MDIO bus\n");
diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c
index 6b14f3cf3891..07baf8390744 100644
--- a/drivers/net/mdio/mdio-mscc-miim.c
+++ b/drivers/net/mdio/mdio-mscc-miim.c
@@ -188,7 +188,8 @@ static const struct regmap_config mscc_miim_regmap_config = {
 };
 
 int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name,
-		    struct regmap *mii_regmap, int status_offset)
+		    struct regmap *mii_regmap, int status_offset,
+		    struct regmap *phy_regmap, int phy_offset)
 {
 	struct mscc_miim_dev *miim;
 	struct mii_bus *bus;
@@ -210,6 +211,8 @@ int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name,
 
 	miim->regs = mii_regmap;
 	miim->mii_status_offset = status_offset;
+	miim->phy_regs = phy_regmap;
+	miim->phy_reset_offset = phy_offset;
 
 	*pbus = bus;
 
@@ -257,15 +260,14 @@ static int mscc_miim_probe(struct platform_device *pdev)
 		}
 	}
 
-	ret = mscc_miim_setup(dev, &bus, "mscc_miim", mii_regmap, 0);
+	ret = mscc_miim_setup(&pdev->dev, &bus, "mscc_miim", mii_regmap, 0,
+			      phy_regmap, 0);
 	if (ret < 0) {
 		dev_err(dev, "Unable to setup the MDIO bus\n");
 		return ret;
 	}
 
 	miim = bus->priv;
-	miim->phy_regs = phy_regmap;
-	miim->phy_reset_offset = 0;
 
 	ret = of_mdiobus_register(bus, dev->of_node);
 	if (ret < 0) {
diff --git a/include/linux/mdio/mdio-mscc-miim.h b/include/linux/mdio/mdio-mscc-miim.h
index 5b4ed2c3cbb9..5a95e43f73f9 100644
--- a/include/linux/mdio/mdio-mscc-miim.h
+++ b/include/linux/mdio/mdio-mscc-miim.h
@@ -14,6 +14,7 @@
 
 int mscc_miim_setup(struct device *device, struct mii_bus **bus,
 		    const char *name, struct regmap *mii_regmap,
-		    int status_offset);
+		    int status_offset, struct regmap *phy_regmap,
+		    int phy_offset);
 
 #endif
-- 
2.25.1