From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f4.google.com (mail-pj2-f4.google.com [74.125.227.132]) (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 31D1E199947 for ; Mon, 5 Oct 2026 23:00:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.132 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791241208; cv=none; b=MhCHzL3RU9cjvQl4hcuHaKWitb4sv4CB18tNXJdw43TQR4e6zVX3AZBrt19mYL3QEZJgGZrqQX9ntpCTluLOp7KsGhYxJfG6v2i7WJv4MdqYVnPkwfJUUBlHWQ+EBwJ9a9MHmQ50U730Cc7mvRD45QgEEhs8xMZJ0hlSngh96ik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791241208; c=relaxed/simple; bh=kq0vt9SckJqy94uGlHWiGVuBk0MckU/fwsg6pcjJXHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Br+1qJVgmqpiqc3ri6vSvUv6EQlhA42VMI/SGLhFszGEI0FL+/bq/HY3HkH+ScL2phqPysSmCctz0LvLxULhqbaC03pOQeEtwLmm01AmffR2e0qIYTXV2PMfzk7T9xEYuurnFZ3H09JizrwsHC+Ew9/jNw+L6v0RY/MfG5DcAQU= 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=a24bmXl2; arc=none smtp.client-ip=74.125.227.132 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="a24bmXl2" Received: by mail-pj2-f4.google.com with SMTP id 98e67ed59e1d1-3a81335d55aso588522a91.0 for ; Mon, 05 Oct 2026 16:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791241206; x=1791846006; 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=a24bmXl2yfh1/56F9b8Afi9uNxCjCw/fvFQyoOBKDZMSlCCwlEGKK8mvCHgQJ3Yiud hZoahhgtOqXt+D9J4Xy82iuVx0dtcyZ7n6Pt8DaFkdrYRGryssFCacUE1QyBI4cw7zEz K9YV6b3AvsvOdJWMTLzIiFqO1eNKmMoAYsb17qB0rVBAORufCU38K4Je58fY+uB7MX15 Ya3vkS0KRgmRHsmRefirDxkbg76pymuqlWoydgoPZVC2UO/7VTK120cf7sXC9X+rHq4+ WHeXbUGJyH0rYshNPc+QOz469xbtGBERyTCv5WIFu4NtHVXzqm6vDsdUJIhxmnoOVv0U 5ILA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791241206; x=1791846006; 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=gJbxbTe+fKdKOD9exWfHkYvpm2L3bwPsctZumKdrG2VPB6oAVAjy6m0TJIAx6axERk zLhBMc0lxKB+SWOrmbDlrZuqzh9e0/ng/mBOEM6yQg21wwOWF135jh8Lle3dGucvUtxj GXsuQWA2k/iCSyXwFCNQDtTye5cRkRplEodsq+du/elMs1ZwpImiw+Y8qEmUwn3IPQ1W bRnosUvTjx8gZ04QinxuZYWLb0FwF6sAUlGzCuxK3wyEgPqkge+KW0rzol4sz61FC9V+ 7Cq0uLac00rDIFrowNlNGtlfVfdQMRCLd2TmDDHBGxGOAK9klEF3iAnXCNdMpXtAPZDv 2eCg== X-Forwarded-Encrypted: i=1; AKwUvByoOOP1LSdaJq7hxwtGdJd3T+jCcv7FCDoDoOCgC8wehz9DO+tFnaVu3FXF+juobdkj3fmonSK/rIdV9WE=@vger.kernel.org X-Gm-Message-State: AFuF++mAnFghGkvZBh3RXDkssq5UO2CHzMxRaHSvEMkWFm68O5pVrA0c lIQQATn/2ylTPmtKQXl/93+yyYwelwDQOGhjQPG0XLTKZ/QfWQ6Hkmop X-Gm-Gg: AYBFou0M1Vx5ehjry7DCBITzE+OjPveHe7Ax7hlG0rVp3Vek3cngKCMwmJGzDrXowSi 9dNxbPJQx6zLYMDX4ID6rWVQjxGyYPqSnwMTGbYupLLob8ur4Xbs/8PygvUZO7vo7llNAINZ+9s Mf5W8ptYmcqlA1tYsiv4j3lIai/1qQqyQurZlMVnZSpD8fW6+MrSmKTuIuHew6nRaS6wA73npf6 UheisNXyJeRfmHxcnI1OVy0A+1DqfsfthVmhg6nTpEveNzwQ6ev0UHtvxXZHBWwEGAxwfuC0nmY QKv/RTgkFZO053pzXN26UrJjr3lEi6AM1G7UJGsXfP0+IRhdMM2PxHkltTKRQudhDbefyMF3FGm oKmDoL6AjWtvecCqfw1SQCGNQM4Ds0Zq/0xeIAUkm662zQXXEaLwQZeNVVQxlugoKDlayoQhq2w BLYGZSIkXlLBu4bSEJFj3w7qOBXzwBDSM8OgSnfFCFtJ31Y+kAmMbd9g+QGenF7W+58gr6 X-Received: by 2002:a05:6a00:1ca8:b0:87c:e1a0:139e with SMTP id d2e1a72fcca58-88af73eaf5amr9796306b3a.20.1791241206300; Mon, 05 Oct 2026 16:00:06 -0700 (PDT) Received: from server.lan ([168.138.199.194]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-88b0b8f5b79sm4183327b3a.15.2026.10.05.16.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 16:00:05 -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 v11 2/2] phy: rockchip: naneng-combphy: add SGMII MAC selection for RK3568 Date: Tue, 6 Oct 2026 06:59:44 +0800 Message-ID: <20261005225944.1171574-3-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261005225944.1171574-1-coiaprant@gmail.com> References: <20261005225944.1171574-1-coiaprant@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@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