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 B58F6CA5FFE for ; Tue, 6 Oct 2026 07:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rHUdqZdlSp35z78vLpXlPzpOw6QIuCYq4h8Ho+Mh3OM=; b=alOYmZZKAkhPBC jgpmjTjKE3RBCdLXX0+2Ctxk1MnFKjA6f/IaQtvlTf97IIMpa0aQVZHHY83o7yjUEIUoKM+VhmSj/ +woZTs9hBJyOnUYJAIdr5wm0aDhFodWqjqQwLjBZlxfdtMKRCdm7RIO3OH0/2cIy2izrtnAoOujps bfWQ7dxs5vO+R08flOVfcJGO+9pKRwwbxT/dfkzaHHkAmGWKXafRGhTwmuSOGHYfbKTWaHA1n85/D NYDrwTyviiAd+bVd2zLxG3KVMDt+cUOAN3uQmFPmoduN2Xl5HTR34bXAOM9mYzFbsNA3ytpZ0ssK3 q/MCt4pIpHEbHcmi5p3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDzv0-00000000DWA-3cet; Tue, 06 Oct 2026 07:48:58 +0000 Received: from mail-pj2-x05.google.com ([2607:f8b0:4864:39::5]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDzux-00000000DSG-49bX for linux-rockchip@lists.infradead.org; Tue, 06 Oct 2026 07:48:57 +0000 Received: by mail-pj2-x05.google.com with SMTP id d9443c01a7336-2d6fbdc8772so12151265ad.0 for ; Tue, 06 Oct 2026 00:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791272935; x=1791877735; 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=8Rz7MTGiT2Oa/TzTvQEqnIct/KOrKk64RBkMgo9sxQM=; b=q9gjrOKNL2bTH+wFuBBopQlmkDKoaPGk0IbPNoSvHqNO4bfGecaP68HySy+0+ZHB3O Qd/MkNFqNT0YXMAeb+AgN1A4PjID+/opGVxvvbP3yDGTW+6+6Lbf2rzD/upFH5e+uQwt 6tWBj2a3YxJerSqvsJAsCLMYhUlJD7TjXPQtoYxvVWQD5Dt6rE5ekCU0cY6dwDPIUVnB AK/Ad/twZQU3o2q/CXk5MXhQcdLUIxVG1Q21uG5s15EZtFujMlSvl9Vo3++hbGVRnY/M jp9kJzn/ceG/Swqp3+TmgFLwa6KlL0YGOaHEpBEf5oUvBNpnYrDAtjDtZLpi4/QG/kVU wAiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791272935; x=1791877735; 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=8Rz7MTGiT2Oa/TzTvQEqnIct/KOrKk64RBkMgo9sxQM=; b=J6rJ2TW6JE0iQdwj8d9ap+aodPQs5tk1JZRMKZN6kUjPSp+UbQ67WaLueMv6tbsakg CLMECGdlMzSvrjry6dzgajleqo9X7h2GAmJZpWHBMFusbAjtJhpihh33d+sSCKIlZIG7 OKOASG/bMMYBbtQEt12C9nBaJlewxZZ+sWH7Kb2t5vvsCg2ckG4xKanw9oSWeMra5hDs axWQ2uZK3ZLEkKAAug1upEWKqdtlS/NzK09NK2DQIh9RX0C0BucWso7a9AvZkm258GS6 +9EQ3uJ3eZhwkm30kDWkGFsZn3Y4UzUea0IqmRF1GV23pzRj7XmuuOEHXqKMcrGSrApa q3Cw== X-Forwarded-Encrypted: i=1; AKwUvBzZjQyJx5rKTleZIvHomihEJ0Qr0rOspuz6gnJJ8g1HiDJ30w8rsQ2rxvF8r4ntwWawoa+TkGOJBU0BLAtOtw==@lists.infradead.org X-Gm-Message-State: AFuF++m38fM3lt1v8zGhSb3m+9NLisR130mtO8UzARLGikr0xfGh6x7t yrT5ZpSet1mCm4NVLdYxOzAaBJeZUdJoQuP4jMBC1hnSymQ0M+AtVKrf X-Gm-Gg: AYBFou1tpoPTaCcQ01A9UnfRTlZw7FZaw4kXoGmEfO1ids1BQCptQO70wT91jIV5DaZ tGNjR/IoQ7JrgerBYTCzx7TcBk9MI2FycnIFK2KMQ4DqY5ANoSsprzXeQ9JbCqF32eokfMFUoFf Gnt4ioGfOF86yH+u4HR+Tpmxr2qL7DbFFcmSDyTB0RKAIG/AumaO9QfgPYayOH/EkjzpYCCc11p UCehAZryg1EOqftvjqMBfiwivL8v+v3FRUjOCPjn4JQiu/1cqBhl4pXmX6vQfXJphl/LymMvTaT BCJ7WrH9+JBSbIdKGwUnxFi8yvWTp1xYXHvZGE3G16CUwMzkOZOLiLMfV1x1YQGXTxAu29X0Qf3 5AFrp6QrnKvhbYcdVmKS5yg+YslChdvZ8C+qOSh27H4/IiXlPkxFCk+veyXV7+EV8yosU7aF3IC RNrTa2tWVhl+IFKmgY7bnOQRwVzQ6nzP3S9Kat0LrQI5Adcg+GxmryVFfnaDqEp6tpyvxK X-Received: by 2002:a05:6a21:6b10:b0:3dd:a195:fa24 with SMTP id adf61e73a8af0-3e0d6d83bccmr8487088637.73.1791272935144; Tue, 06 Oct 2026 00:48:55 -0700 (PDT) Received: from server.lan ([168.138.199.194]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cce6d2406b1sm1998173a12.8.2026.10.06.00.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2026 00:48:53 -0700 (PDT) From: Coia Prant To: Vinod Koul Cc: Neil Armstrong , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Coia Prant Subject: [PATCH v12 2/2] phy: rockchip: naneng-combphy: add SGMII MAC selection for RK3568 Date: Tue, 6 Oct 2026 15:47:49 +0800 Message-ID: <20261006074749.2010233-3-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261006074749.2010233-1-coiaprant@gmail.com> References: <20261006074749.2010233-1-coiaprant@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261006_004856_039738_1E976FB2 X-CRM114-Status: GOOD ( 15.49 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=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. >From the RK3568 TRM (Part1, Page 229), the PIPE_GRF_XPCS_CON0 bit 1 (pipe_sgmii_mac_sel) is defined as: 0: SGMII routed to GMAC0 1: SGMII routed to GMAC1 The hardware reset value is 1 (GMAC1). 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. Out-of-range values are rejected by dtschema, so the driver does not duplicate the range check. 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 7843356a4dd47..7b867e7520064 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 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip 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 4F18DCA5FED for ; Tue, 6 Oct 2026 07:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ltcuGmdX+nU3v20TGjdnbXQaEk/ZCxWiV/rUviX3EOw=; b=aJ8moYEmEFT2x/ yxWV5pkxQZDX+pqapGLdywhusd8m+GtvRMYmvBcGurNa+mmuOgwM7/cpyCbu1dz1Q05b0Bpf7nT+n xtPQUoI5JGythcwtvuKh6jq09AH16nIxeUHnAN1MdIuFZkuqn5+wZEOTzVwfBJCH6EDitpSiN/Fwy uulm+uBJ7T+1Y+6y1FaSz3Za1WwBsKZTNxAj1FfwFm78CVyypl6WKiNudl/ZOiiX0QW40LTjGl3gK rxMf6MlVtfiBA2iWT0cQYxX0K08qz9a6v+8t7R4KDjhZ4pjYn8U7KsbBQ0lW7l/Qp+oGQllhqn6um qUmRsSBh9y+u19RdepTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDzv1-00000000DXX-45Tp; Tue, 06 Oct 2026 07:48:59 +0000 Received: from mail-pj2-x05.google.com ([2607:f8b0:4864:39::5]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDzux-00000000DSE-49IJ for linux-phy@lists.infradead.org; Tue, 06 Oct 2026 07:48:58 +0000 Received: by mail-pj2-x05.google.com with SMTP id d9443c01a7336-2df921c1d0eso10945105ad.1 for ; Tue, 06 Oct 2026 00:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791272935; x=1791877735; 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=8Rz7MTGiT2Oa/TzTvQEqnIct/KOrKk64RBkMgo9sxQM=; b=q9gjrOKNL2bTH+wFuBBopQlmkDKoaPGk0IbPNoSvHqNO4bfGecaP68HySy+0+ZHB3O Qd/MkNFqNT0YXMAeb+AgN1A4PjID+/opGVxvvbP3yDGTW+6+6Lbf2rzD/upFH5e+uQwt 6tWBj2a3YxJerSqvsJAsCLMYhUlJD7TjXPQtoYxvVWQD5Dt6rE5ekCU0cY6dwDPIUVnB AK/Ad/twZQU3o2q/CXk5MXhQcdLUIxVG1Q21uG5s15EZtFujMlSvl9Vo3++hbGVRnY/M jp9kJzn/ceG/Swqp3+TmgFLwa6KlL0YGOaHEpBEf5oUvBNpnYrDAtjDtZLpi4/QG/kVU wAiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791272935; x=1791877735; 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=8Rz7MTGiT2Oa/TzTvQEqnIct/KOrKk64RBkMgo9sxQM=; b=uoVwnHssWmYsfFitymVpFUVy21RUxqJMMYXy3GMmdFsfp5tfVoVVx2AinCVCMC4DLb Ogrvxy+Moiuan+PnfFFBSVSRArPbuHkvFH8clj3LQlKP6CS65y3P3MOOJ9e5oph6/Rin 8gjkUi4To7TPdFe16Cj6C88iBRcj+00uPvKhEgyETIkZzJyTAECpjwvCW70C15zFL+1K d/62Ad+A6YK/0g4FL7TEbDmxVJQaNEUaPibAmUtXhh8LMiwbp41F2LQiErmXYhQcuHBd OfqH9j7wqo9ywTNHKHDr/WvUvQuLKhF8d5dbTL3PgQIrsWG740Nz7VA5DWkvQ40+v5Wf Qq5Q== X-Forwarded-Encrypted: i=1; AKwUvBxWAA89+VtKe3fw3j+6JmOursvIaFGAjkIrOLuDZDYGl+P/OuYXsfgS0lQ1xiQ5k99Bi2zQti/mpKI=@lists.infradead.org X-Gm-Message-State: AFuF++k+pDxHLZvtXg0BppL/EgfiNtrafCf3THbfNuyLoMPHCdmsrPaT kz7xZlkZccaEHJ/9pl954xrS31m0MCeECOQ9vwxj9BYwgUBnJNvuAyUd X-Gm-Gg: AYBFou0JZokR28Df6LERfnfESyxTei3kcSxV3unWYrWzd0Gw9p6qfLsgFtjt9GtyIqV H1G3sgFVDIKOh6CuXmL+lyKeVppx5Zmbk8lFdUUeB3fuGZwY732nAu+XnEBUDyHdQtn3g/u/pCT HkWXeY507gzfFAkEW8E9wQaRcQyY9jCrKRCm3OMyCpS9N/BUIXkMIJqhkJC6XHJhori2JLGnUZW nd0cUoRhM91XjF5BNUnFTbwSNzp32mbqUS2AleOkFeOwgQKtPgwKQuFWuUv/g1/ZLvcOrBrvUXW YrRaHAZFa1M4Eu4Gp1KuCgcc0gO+h+QBJMyt9j74TlAaJ40oBVMcfd0ZebbwOhRH40r0+C0pYEc g90DH+zxFYFn7ZHfD+L9mRPkdUGc9FHcj1WR9mEPvFNvl9onxCqgbgXgCE25+M8ROAVOdTdQDsi 5VwJKA7mhB1YLEdn44I8ssc/I7uaXqdc+6wFyB9VVeqTwGyJpnB2KAdfg35UwB8u9pbIcL X-Received: by 2002:a05:6a21:6b10:b0:3dd:a195:fa24 with SMTP id adf61e73a8af0-3e0d6d83bccmr8487088637.73.1791272935144; Tue, 06 Oct 2026 00:48:55 -0700 (PDT) Received: from server.lan ([168.138.199.194]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cce6d2406b1sm1998173a12.8.2026.10.06.00.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2026 00:48:53 -0700 (PDT) From: Coia Prant To: Vinod Koul Cc: Neil Armstrong , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Coia Prant Subject: [PATCH v12 2/2] phy: rockchip: naneng-combphy: add SGMII MAC selection for RK3568 Date: Tue, 6 Oct 2026 15:47:49 +0800 Message-ID: <20261006074749.2010233-3-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261006074749.2010233-1-coiaprant@gmail.com> References: <20261006074749.2010233-1-coiaprant@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261006_004856_040639_7E59A231 X-CRM114-Status: GOOD ( 15.28 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=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. >From the RK3568 TRM (Part1, Page 229), the PIPE_GRF_XPCS_CON0 bit 1 (pipe_sgmii_mac_sel) is defined as: 0: SGMII routed to GMAC0 1: SGMII routed to GMAC1 The hardware reset value is 1 (GMAC1). 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. Out-of-range values are rejected by dtschema, so the driver does not duplicate the range check. 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 7843356a4dd47..7b867e7520064 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 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f5.google.com (mail-pj2-f5.google.com [74.125.227.133]) (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 C0F6E54706D for ; Tue, 6 Oct 2026 07:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791272937; cv=none; b=SznRezviEpLN0e6yQfYVbTCsrvIoIk0B5vyitTzpHR4wudVRYAOT/gebLZ2f2W0qnLOL0WbI4LZJw97BfcjM0r869InE2tcipLC77TjoMpdalF9L93jH/fo/HwxnKpKtvhVNr8PWNeK+gg9KwZiOypPn0NhlsjCz/+1/KGloa3E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791272937; c=relaxed/simple; bh=kq0vt9SckJqy94uGlHWiGVuBk0MckU/fwsg6pcjJXHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DECrgyYW8HjTWLCYpbAq7hofbnlC9CBq7b1nFWbHcRVUZyZJpkw1XnlYrh9H+ljODbtrp27G+XU+Q5X7RvVogaEoaWFl2V/Cig8LZ0UoU++Y+JlF9+JW1NWdoQtjlHQH18VQH7jVrBvGnxsEk0CM/xpjOM0NuK6aG8UXjtjBeYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nbixYdUb; arc=none smtp.client-ip=74.125.227.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nbixYdUb" Received: by mail-pj2-f5.google.com with SMTP id d9443c01a7336-2d6fbdc8772so12151315ad.0 for ; Tue, 06 Oct 2026 00:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791272935; x=1791877735; darn=vger.kernel.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=8Rz7MTGiT2Oa/TzTvQEqnIct/KOrKk64RBkMgo9sxQM=; b=nbixYdUbXmdqfm1XJJ7y6a3WwTC5dv3Sd9CthlMF2eYmqd6WQxL6f8MMZ/j8qST+jl QzNyLnjAJOccQXFjeJ62HspLDB4D5UeC4CC3sZPlKYclLGlzmJWDj91TkdO98nfDgpXx grhuQUPvQjUdnd2+buP7D8Bo/XXcGMGJEET8wSskNQjD6bFYKR0wcKInAO2YiwRlN4iT 8gsgxH8v2U7Mii4cdAziFdSj6ylosMXxP4xUrFd+yXcQkpiYSJ6IFKoOmbtPu4ja4zyQ gtmssdAun5qlxUUL8HI5oP8FCho/7Vlj1FzGkkt/OhcV3R9A7dKK5Kmsks8a94o5MOqB L6RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791272935; x=1791877735; 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=8Rz7MTGiT2Oa/TzTvQEqnIct/KOrKk64RBkMgo9sxQM=; b=IBFccSTj9W1I4h/oS0t19+mWa+nQxte+Q5lpi7b7/YRuucEF0yaQdprdMzuTz1oZbu YEdL1NJ9XUJbTUoojdoag/E2syP6RRYCW/T1zHqOvAuRHGi0Do8znQfe/d0aCG6LJRbl dgFBfZMsNphUV2HBCUanTskZmRk9cZ3tXhu+9TXL4PdNWN+pq+IkxQYxx6Q1jUREmBV5 ZV3AzS63mGoS9D9R00sMA/PotYz+BbSqE4eK2ngLA1o5tjKPPUg1AspOIlEorN1X3n63 s8DA1ul8q/cOPaG8YQwVS9OwUhTz0o0lWfjv6y6hLqR9Z/oua+OtNeNOAFXsXsa2aypL NfWw== X-Forwarded-Encrypted: i=1; AKwUvBwspBIfeaz0B0i+AX1WL8PU8Xlv+ouQlgU+Sr0juwnx+TQWymg40yY7YOR09GhqXenky1MQy51NDA2h@vger.kernel.org X-Gm-Message-State: AFuF++kWV5Kfxbj6AyQ0B55uVPaGzUoMPe5maI7TX1yWmJaMDoiVl0Vc oqC4qpz8+0jnySUvvzpzpbDzVgX/cc5RFu3OH8E3/3FdPo/BBSpm/OUB X-Gm-Gg: AYBFou1klM005QB1tf4K6VoX5I6RpWbuVeU33J+2Hfi26/GwEYb4o3MkIN8SZlOkKVX hNx8n0jUkxZHMsNcS42nCJjpFouzkorGdCiUhJrK/Dylts3Vj/D5EIf1FHn1HwHT0mXSz0iNsrM 0ZjkbdxD4nfhuLst6PNErblbEbFX6hBhDYHYVUks0hdezriNl4JSpHMRhl5WSHxK1CdjLDthL2s 0qqZBot34uzvy+/6z7tE1OaM1d66b4RPvbjtlZwY9VHr0ZUqNmAXkx21AhTJJki37waHenwPFUF 6GVLHPD/ZhJ6n5UcbKJP0iylcjzDPMrQPYMilgbtQlrfAPRRlsM2lBcOlqWolTXJ3ryOtKAz0Br a0lbRX54qELvrHhKG9lHQRRUi5oFq8qhpBm0O4gVFoSb/PrLuMxuRG8rZk7TXU/iZwCg64Ljzi4 Mp1KvG4oRcbyvOdY1vGoB8OlU6ZOb2QuCvbAwwV4T2BLxxLELQjPFV/YhlPIyO9CO2aPKK X-Received: by 2002:a05:6a21:6b10:b0:3dd:a195:fa24 with SMTP id adf61e73a8af0-3e0d6d83bccmr8487088637.73.1791272935144; Tue, 06 Oct 2026 00:48:55 -0700 (PDT) Received: from server.lan ([168.138.199.194]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cce6d2406b1sm1998173a12.8.2026.10.06.00.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2026 00:48:53 -0700 (PDT) From: Coia Prant To: Vinod Koul Cc: Neil Armstrong , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Coia Prant Subject: [PATCH v12 2/2] phy: rockchip: naneng-combphy: add SGMII MAC selection for RK3568 Date: Tue, 6 Oct 2026 15:47:49 +0800 Message-ID: <20261006074749.2010233-3-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261006074749.2010233-1-coiaprant@gmail.com> References: <20261006074749.2010233-1-coiaprant@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. >From the RK3568 TRM (Part1, Page 229), the PIPE_GRF_XPCS_CON0 bit 1 (pipe_sgmii_mac_sel) is defined as: 0: SGMII routed to GMAC0 1: SGMII routed to GMAC1 The hardware reset value is 1 (GMAC1). 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. Out-of-range values are rejected by dtschema, so the driver does not duplicate the range check. 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 7843356a4dd47..7b867e7520064 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