From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ADE60C55175 for ; Sat, 1 Aug 2026 14:23:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fTbZp/ChtgSMbHsJmXXDBUtpO1bOy1YQWdOODbeZxQU=; b=liyVuocfqj96PHSdbK98bMC5k1 SUB4d7rlPz29YMwwJpCWRJ/i/i35IKH3qejENm3wxixJSA66JGNa7D6LIvPORpaCDfGPS6YDKUi/w v+Gh8N09a5V4DDjJSL27lM+f/be1KKm6HQl4HXCA/cZtXdV2TUkDCq4Jv2vQkivcaJ4GCgiKO78vC q2aJc+cm0nj6rF7LF7vWZNvoFeSNFllbp76mXpJAR+s6swoSf+2OyyyGIn1sOotBNg0gmW3j+9Mvp 59d9xSbF2CVDeABIck/bfBqq2jiFpfcC75X0cvAn1uyDjp+arCCxbCO5OzrEeEnfNK/p9oTFpHLdq Fq6BiIog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqAcj-0000000EiW4-23kX; Sat, 01 Aug 2026 14:23:37 +0000 Received: from mail-pj2-x00.google.com ([2607:f8b0:4864:39::]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqAcg-0000000EiTC-1w1y for linux-arm-kernel@lists.infradead.org; Sat, 01 Aug 2026 14:23:35 +0000 Received: by mail-pj2-x00.google.com with SMTP id d9443c01a7336-2cc7a345f51so14519365ad.0 for ; Sat, 01 Aug 2026 07:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785594214; x=1786199014; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fTbZp/ChtgSMbHsJmXXDBUtpO1bOy1YQWdOODbeZxQU=; b=NrIlRyCP7NaPLT9Xn85C3CV668z230oikdO+8zkKY9BkF20urrz2AxPg2xfsxI8P1v QLxH+PZng0dq5nQfDEBOhZjqhPLFbDaB7MTh+McAccw3tNM6Jst6641Ikha2hoTiMRhM AeIBSQpSu/fdY1u3tlZuxxVD0GYhV2JxqRCZ4YBZN7ci8kTAWTof9SSKSl2ScdxofL8+ vmznuoGrpvEfyrQuuiCd+2nrAWrx0OY/KGAcJyJ54EnEb2+vydlYay/SzVE6I4p5eWmP FNTH6XgvUjq8i4aTc3ZgzPtW8SxOYYW3UpDFloVt03/vbbzziAQNDEKtdZRaWGtDYhW0 6sYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785594214; x=1786199014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=fTbZp/ChtgSMbHsJmXXDBUtpO1bOy1YQWdOODbeZxQU=; b=Qm2a8tcHRF9pKtVgLG4wTv+FGXPJ5jNc22cICeYfho9Sbrbi1WTfZ2WFZmurDy4VY6 TOrcMBNYHTm4oipjmQhPKU4n8SDH1SuyrOgllkJTrnNCFuQksgSS9mKSFovnRWcNRkRh yVDvmpcCglpgrYIjFG+4oQV9rtKymbEJJXGbvZuP17b+5+np1LJVbZ5LsCQr5E1nT8kk gMrMWoFfOGjf1W8vbnmNIMLg43HLQQIKc1vHgBnl2s1YJHdAw6YS2QwV8ifDsk2zGukV 38Wn0hRF9xLby/T34KpYOdTwq8heo4pjkPTggHLtX5xPFeOebIdlAu2IAWrXqmDDyq7q 1nFQ== X-Forwarded-Encrypted: i=1; AHgh+RpAGRKLUXjZoNrBRSS9AGr3p93Qt9fqrqJP/bbH2KMiQWdUTE2dWLn9B987ApH2mONK/sIAcjNb3jTNAZk/DeKT@lists.infradead.org X-Gm-Message-State: AOJu0YwupsXjP2pfmmMgqZ7++q/7XD4EBFVKvnYTZhPa8Ujp2PDPoAW+ muN0QVB/x82L8rGxB/KGAcch0gXaTyAcME2gYCYKbElhkP16Mv+rDqcb X-Gm-Gg: AR+sD13T4CZDUDrPRQ9OYgA6yoFHG/bkqeTC+9/Rgc0edS8MJxwu6xTfvGyN9EKkta/ WgoYxKIY3PudZQLTA3Lh61mll/Mez6MrLqhlGKU13sReeV1+MQxj+evWfTJHRZFj9hP/AjmOmqo +9jizNgZfEGJu1urQtX4zrlXRBVncb6kk5pGrtvudNidI16vy4C7BbeaPkf6XY9AGIRw6xaWIGn 0kibDm7eYTOoELJyYTn0AsIOYTopi58IpUNZxgzZWpANBgtEMHQmo4lXOTUJqwaUPJzTgME0rds JTPA0nvGNpf2kaC3R7CwMIStzekCOe6oFRC2B4/2klcKk0mLFpBDCujmBJx+qZ4SYuuj4TzLY0Y 6eRfyZKEsbjnE/NyZ3HND3LdeYVZlRrkNG0LoMwtds1XGYOXkYSb3A61MpPHexIJkn29Kx6X78P S3F6sGAr0CewbNwEkyOn9Xs3QYPJiruSKUp8ECUk/UAysTv05FnbQ2/mk= X-Received: by 2002:a17:902:d4c7:b0:2cc:84e7:73bc with SMTP id d9443c01a7336-2d0524a6a1fmr38459995ad.32.1785594213748; Sat, 01 Aug 2026 07:23:33 -0700 (PDT) Received: from server.lan ([103.213.4.16]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d04ae5ac3dsm18043845ad.23.2026.08.01.07.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2026 07:23:33 -0700 (PDT) From: Coia Prant To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Vinod Koul , Maxime Chevallier , Maxime Coquelin , Alexandre Torgue , Lad Prabhakar , Romain Gantois , Heiner Kallweit , Coia Prant Cc: Neil Armstrong , Russell King , Shawn Lin , David Heidelberg , netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-renesas-soc@vger.kernel.org Subject: [PATCH v2 03/10] phy: rockchip: naneng-combphy: add SGMII MAC selection for RK3568 Date: Sat, 1 Aug 2026 22:22:27 +0800 Message-ID: <20260801142244.679437-5-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260801142244.679437-2-coiaprant@gmail.com> References: <20260801142244.679437-2-coiaprant@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260801_072334_521149_B0DA6EAE X-CRM114-Status: GOOD ( 16.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On RK3568, the SGMII interface can be routed to either GMAC0 or GMAC1 via the GRF register pipe_sgmii_mac_sel. Add support for this selection by introducing the "rockchip,sgmii-mac-sel" DT property. The hardware reset value is GMAC1 (1). If the property is set to 0, the driver routes SGMII to GMAC0; if set to 1 (or omitted), it remains at GMAC1. This is necessary for boards such as the Ariaboard Photonicat, which uses the SGMII interface connected to GMAC0. Link: https://dl.radxa.com/rock3/docs/hw/datasheet/Rockchip%20RK3568%20TRM%20Part1%20V1.1-20210301.pdf (Page 229) Signed-off-by: Coia Prant --- drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c index 2b0f152f54709..539acd1459948 100644 --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c @@ -186,6 +186,7 @@ struct rockchip_combphy_grfcfg { struct combphy_reg pipe_xpcs_phy_ready; struct combphy_reg pipe_pcie1l0_sel; struct combphy_reg pipe_pcie1l1_sel; + struct combphy_reg pipe_sgmii_mac_sel; struct combphy_reg u3otg0_port_en; struct combphy_reg u3otg1_port_en; }; @@ -212,6 +213,7 @@ struct rockchip_combphy_priv { bool enable_ssc; bool ext_refclk; struct clk *refclk; + u32 sgmii_mac_sel; }; static void rockchip_combphy_updatel(struct rockchip_combphy_priv *priv, @@ -375,6 +377,9 @@ static int rockchip_combphy_parse_dt(struct device *dev, struct rockchip_combphy priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk"); + priv->sgmii_mac_sel = 1; + device_property_read_u32(dev, "rockchip,sgmii-mac-sel", &priv->sgmii_mac_sel); + priv->phy_rst = devm_reset_control_get_exclusive(dev, "phy"); /* fallback to old behaviour */ if (PTR_ERR(priv->phy_rst) == -ENOENT) @@ -873,6 +878,8 @@ static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv) break; case PHY_TYPE_SGMII: + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_sgmii_mac_sel, + priv->sgmii_mac_sel > 0); rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_xpcs_phy_ready, true); rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_phymode_sel, true); rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_sel_qsgmii, true); @@ -984,6 +991,7 @@ static const struct rockchip_combphy_grfcfg rk3568_combphy_grfcfgs = { .con3_for_sata = { 0x000c, 15, 0, 0x00, 0x4407 }, /* pipe-grf */ .pipe_con0_for_sata = { 0x0000, 15, 0, 0x00, 0x2220 }, + .pipe_sgmii_mac_sel = { 0x0040, 1, 1, 0x00, 0x01 }, .pipe_xpcs_phy_ready = { 0x0040, 2, 2, 0x00, 0x01 }, .u3otg0_port_en = { 0x0104, 15, 0, 0x0181, 0x1100 }, .u3otg1_port_en = { 0x0144, 15, 0, 0x0181, 0x1100 }, -- 2.47.3