From nobody Tue Dec 16 06:23:21 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63EF3309EF5 for ; Mon, 15 Dec 2025 14:41:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765809719; cv=none; b=Sl360mQ72WeY+BXpOWAYtur7miZpZH6b+iO6CpcRk2rO4fe+5uYUZV0P9himVdoQpyzBcti56PyajT+iyqrReZAoyQfge7nI3m2zDFviMKYLKmpUja1M+hSrOEbgxrWqu4XA/8PqOnRngGyG2AHY+9LKnh29XWm7gr9gDIrTVqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765809719; c=relaxed/simple; bh=RDwklFHaFNSV++/BoiPNwCn/lAhftfIyvmWeyKBJWJU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BhiZzqMHIFj7lBQmoXJVfvVgmtBm8kZhNAT7pC6QBzP6L3lFO+1SEhhAHpNopR8yzBHvQOf+AIqrEKiXnZvLBMWsDqkuWaJiBpYqg7aEio7LjhpxGf5heSwpgCGqRDA9QBW5g44M/klw5MUSWF0tSDL8qhakG4ZRx6okOsHQZyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=C1OQq0Cm; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="C1OQq0Cm" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-47118259fd8so35793775e9.3 for ; Mon, 15 Dec 2025 06:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765809712; x=1766414512; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=vYKorhS7YGhwUqCGDk14PflDiZGeXR2MSlBlFfYQc3I=; b=C1OQq0Cm0Q30AhjOtueiuiYa7cqoNIBSlkQ1+GLrZFgWzfeyYklFFrwW9+eMhIflem YVWBCp/6XDCjkAuoDYI0qlgWvoEG4IH0bRMjhKQo6kOHDCb1kejkC8+xsJ/NPMi+pmzB HAXbse7clsk0crX3Pcf1x96f1HgnElc+urfX5LoSnAQrW41F3axcojMpYImb8w0QcQ9E vgJwOPye5OZRhqcvOOXZ1+ZJSxUQd0jGoJ0dVAAGXshuqrplEdL2+f50JRVFVXEhaSMD QNTCFxA9R0sS5/J+tu/Oh1ed/TlWBu1RI3+BikOM1MspJtaDkgxRWe9Zdt2YucuiKdbn qyGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765809712; x=1766414512; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vYKorhS7YGhwUqCGDk14PflDiZGeXR2MSlBlFfYQc3I=; b=BfHUKuGAmmMxsy+TywGvQSqjs7gIKuaoFIOvfIjBM2qKDuzF5u4WtCJ/mfQbYRkBZd MtB5MXulM+Rx44pHPlgmVZNGA55pcs9Z//oewLwH8d57NuND4VbxK8uixKgWPcwSJQv3 CQ5jEY44eCveIFtKfSZ6wIsDcJDpOGReWoouMxmNGxOydyZJYIOL+Ok3p6mJ8SP10ymh rgitNpajIW4UixrGNw3pYHom6qwbb6TdKOV90djZ2Xx61NJmNng0saeuDx8AOVm7rH3p 4I8bt7p52VmGbpWoN8uOGowc+seEQrkmRgUXy+aIDfot+pcqqmZ8ugi2Y19pB/0ZBACU 3LCw== X-Forwarded-Encrypted: i=1; AJvYcCWX6UrS6HMVjws7mUeHM7VZ2mY93/+hVATaumsTPzK2nzpJnIGdgcwYPw0aA+MG9vhUiBnxYpfTM+k/kfI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/lt8RuMLokX6Ie7RrOYO3tGL4Ay95WgEZeVyHevVv8H+B1ORU IovN4+CvxkadEi58ikbFKF+CNK+Uoc/4+Krrxdvl6aGug3pWgGN7JfR/9J8HEcKC17Q= X-Gm-Gg: AY/fxX6E55RfGp7bJ3NvpC0LzOtFspnBbMxm052qNNjq1jZCswhputV3yxGc2tTY3Za xRqqez3p8IlKSH56+fvST5gr+wgC1xHM4Dinc9xS0Cwj/RS/7xlGQ9gJIZNrd3IPd+52aAFxhJT syO10xVEsZzcS3JVbaZM0bPHMKFygEo0PY7mv/1N72Y4uwz4vJvqKd/8atEF1T7OmjeTpARPJU1 TwOMA/iSY2h3W4p1LOywPw2UyBG/AVCZLjnFnBTYK/+8ccnySrSdNgvk52yKkUt6MwrMcZrRJUW tdN07/DPviT+V1kNs0TCPglpksD5sAasLmm79M3Gqvy4IGdrqNCel7JEO6zq83zTZuwJmhlIw91 u5Tw//IHAoNKWjToVD0nD2jw5sD/flj5q1QWVuGB2NQs9Ysb0hXlWNa6QODm8NmnVIwdjaA6UID ljoRzaOz1ZH9QyGTKI1iK5j5Yr2nM= X-Google-Smtp-Source: AGHT+IEW/XhvEhUWKukxpWXuAbDWYWTlu7iooVXodta81YuWRVJW/8nSpMCMutfNZkEu59rJRR8Kmw== X-Received: by 2002:a05:600c:35c9:b0:479:3046:6bb3 with SMTP id 5b1f17b1804b1-47a8f906f07mr122335555e9.23.1765809711699; Mon, 15 Dec 2025 06:41:51 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a8f8d9a06sm187528625e9.10.2025.12.15.06.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 06:41:51 -0800 (PST) Date: Mon, 15 Dec 2025 17:41:48 +0300 From: Dan Carpenter To: Jan Petrous Cc: s32@nxp.com, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linaro-s32@linaro.org Subject: [PATCH v2 1/4] net: stmmac: s32: use a syscon for S32_PHY_INTF_SEL_RGMII Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On the s32 chipsets the GMAC_0_CTRL_STS register is in GPR region. Originally, accessing this register was done in a sort of ad-hoc way, but we want to use the syscon interface to do it. This is a little bit ugly because we have to maintain backwards compatibility to the old device trees so we have to support both ways to access this register. Signed-off-by: Dan Carpenter --- Fix forward porting bug. s/PHY_INTF_SEL_RGMII/S32_PHY_INTF_SEL_RGMII/ .../net/ethernet/stmicro/stmmac/dwmac-s32.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c b/drivers/net/= ethernet/stmicro/stmmac/dwmac-s32.c index 5a485ee98fa7..2e6bb41f49e1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c @@ -11,12 +11,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include =20 #include "stmmac_platform.h" @@ -32,6 +34,8 @@ struct s32_priv_data { void __iomem *ioaddr; void __iomem *ctrl_sts; + struct regmap *sts_regmap; + unsigned int sts_offset; struct device *dev; phy_interface_t *intf_mode; struct clk *tx_clk; @@ -40,7 +44,10 @@ struct s32_priv_data { =20 static int s32_gmac_write_phy_intf_select(struct s32_priv_data *gmac) { - writel(S32_PHY_INTF_SEL_RGMII, gmac->ctrl_sts); + if (gmac->ctrl_sts) + writel(S32_PHY_INTF_SEL_RGMII, gmac->ctrl_sts); + else + regmap_write(gmac->sts_regmap, gmac->sts_offset, S32_PHY_INTF_SEL_RGMII); =20 dev_dbg(gmac->dev, "PHY mode set to %s\n", phy_modes(*gmac->intf_mode)); =20 @@ -125,10 +132,16 @@ static int s32_dwmac_probe(struct platform_device *pd= ev) "dt configuration failed\n"); =20 /* PHY interface mode control reg */ - gmac->ctrl_sts =3D devm_platform_get_and_ioremap_resource(pdev, 1, NULL); - if (IS_ERR(gmac->ctrl_sts)) - return dev_err_probe(dev, PTR_ERR(gmac->ctrl_sts), - "S32CC config region is missing\n"); + gmac->sts_regmap =3D syscon_regmap_lookup_by_phandle_args(dev->of_node, + "nxp,phy-sel", 1, &gmac->sts_offset); + if (gmac->sts_regmap =3D=3D ERR_PTR(-EPROBE_DEFER)) + return PTR_ERR(gmac->sts_regmap); + if (IS_ERR(gmac->sts_regmap)) { + gmac->ctrl_sts =3D devm_platform_get_and_ioremap_resource(pdev, 1, NULL); + if (IS_ERR(gmac->ctrl_sts)) + return dev_err_probe(dev, PTR_ERR(gmac->ctrl_sts), + "S32CC config region is missing\n"); + } =20 /* tx clock */ gmac->tx_clk =3D devm_clk_get(&pdev->dev, "tx"); --=20 2.51.0