From nobody Tue Feb 10 09:22:12 2026 Received: from zg8tmja2lje4os4yms4ymjma.icoremail.net (zg8tmja2lje4os4yms4ymjma.icoremail.net [206.189.21.223]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 19C4329B8E8; Mon, 9 Feb 2026 09:48:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=206.189.21.223 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770630504; cv=none; b=NBHVpWic9gOrLuX27d+0yr5Zjg8ocDEmvLQggX10IjO3L3og3ekUnUckLJlS41khEFRE1t69JdFvZBFQtTnfLFy47PzD6rbjCXMNnoycm33Mi6zrdiikMe97hc4qmcuu4L3U8CvZ7XtxycrvxboPbsTDaV0/zw9mkyeJFnWWn30= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770630504; c=relaxed/simple; bh=SI9XlgXUCFx4dxRcOF1Y7y9UScebhzmwXajJwcgA4Ks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MGKO0Svyo6FGxkQMyiRdi23nVhgQ/Go+q+TcGb+rPMzkSnU+LtNyNT2LavzUOTNAZ/0sSkeXFYkFsp7q0hqSeLWSaqN0jlVZ09hnlbocN11bVRrNSI+Wcd+HiRmn8Pq51nZv5eVHNAEc1K+xxnF4iRIBsXajlXA3VtFGv1h6dtE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com; spf=pass smtp.mailfrom=eswincomputing.com; arc=none smtp.client-ip=206.189.21.223 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=eswincomputing.com Received: from E0004057DT.eswin.cn (unknown [10.11.96.26]) by app1 (Coremail) with SMTP id TAJkCgAXZzdVrYlpDjcEAA--.19005S2; Mon, 09 Feb 2026 17:48:06 +0800 (CST) From: lizhi2@eswincomputing.com To: devicetree@vger.kernel.org, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, rmk+kernel@armlinux.org.uk, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: ningyu@eswincomputing.com, linmin@eswincomputing.com, pinkesh.vaghela@einfochips.com, weishangjuan@eswincomputing.com, Zhi Li Subject: [PATCH v2 1/2] dt-bindings: ethernet: eswin: add clock sampling control Date: Mon, 9 Feb 2026 17:48:01 +0800 Message-ID: <20260209094801.909-1-lizhi2@eswincomputing.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260209094628.886-1-lizhi2@eswincomputing.com> References: <20260209094628.886-1-lizhi2@eswincomputing.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: TAJkCgAXZzdVrYlpDjcEAA--.19005S2 X-Coremail-Antispam: 1UD129KBjvJXoW3JFW5GF43AFyUCw4DXFykAFb_yoW7uF48pF W5u3yUGFn8Xr1fJa17tF109a4fJws3WF1akrn7t3Z7Xws0qryYqr42yFyrWa4UCr4xZFy5 WFWYqay8uay0k3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBv14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2 Y2ka0xkIwI1lw4CEc2x0rVAKj4xxMxkF7I0En4kS14v26r4a6rW5MxkIecxEwVCm-wCF04 k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18 MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_GFv_WrylIxkGc2Ij64vIr4 1lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1l IxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRmZXOUUUUU= X-CM-SenderInfo: xol2xx2s6h245lqf0zpsxwx03jof0z/ Content-Type: text/plain; charset="utf-8" From: Zhi Li The second Ethernet controller (eth1) on the EIC7700 SoC may experience RX data sampling issues at high speed due to EIC7700-specific receive clock to data skew at the MAC input. On the EIC7700 SoC, the second Ethernet controller (eth1) requires inversion of the internal RGMII receive clock in order to meet RX data sampling timing at high speed. Describe this SoC-specific difference by introducing a distinct compatible string for MAC instances that require internal clock inversion, allowing the driver to select the appropriate configuration without relying on per-board vendor-specific properties. The rx-internal-delay-ps and tx-internal-delay-ps properties now use minimum and maximum constraints to reflect the actual hardware delay range (0-2400 ps) applied in 20 ps steps. This relaxes the binding validation compared to the previous enum-based definition and avoids regressions for existing DTBs while keeping the same hardware limits. In addition, the binding now includes additional background information about the HSP CSR registers accessed by the MAC. The TXD and RXD delay control registers are included so the driver can explicitly clear any residual configuration left by the bootloader. Background reference for the High-Speed Subsystem and HSP CSR block is available in Chapter 10 ("High-Speed Interface") of the EIC7700X SoC Technical Reference Manual, Part 4 (EIC7700X_SoC_Technical_Reference_Manual_Part4.pdf): https://github.com/eswincomputing/EIC7700X-SoC-Technical-Reference-Manual/r= eleases There are currently no in-tree users of the EIC7700 Ethernet driver, so these changes are safe. Fixes: 888bd0eca93c ("dt-bindings: ethernet: eswin: Document for EIC7700 So= C") Signed-off-by: Zhi Li --- .../bindings/net/eswin,eic7700-eth.yaml | 63 ++++++++++++++++--- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml b= /Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml index 91e8cd1db67b..8a7035dfd4a2 100644 --- a/Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml +++ b/Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml @@ -20,6 +20,7 @@ select: contains: enum: - eswin,eic7700-qos-eth + - eswin,eic7700-qos-eth-clk-inversion required: - compatible =20 @@ -28,9 +29,13 @@ allOf: =20 properties: compatible: - items: - - const: eswin,eic7700-qos-eth - - const: snps,dwmac-5.20 + oneOf: + - items: + - const: eswin,eic7700-qos-eth + - const: snps,dwmac-5.20 + - items: + - const: eswin,eic7700-qos-eth-clk-inversion + - const: snps,dwmac-5.20 =20 reg: maxItems: 1 @@ -63,16 +68,27 @@ properties: - const: stmmaceth =20 rx-internal-delay-ps: - enum: [0, 200, 600, 1200, 1600, 1800, 2000, 2200, 2400] + minimum: 0 + maximum: 2400 =20 tx-internal-delay-ps: - enum: [0, 200, 600, 1200, 1600, 1800, 2000, 2200, 2400] + minimum: 0 + maximum: 2400 =20 eswin,hsp-sp-csr: description: HSP CSR is to control and get status of different high-speed periphe= rals (such as Ethernet, USB, SATA, etc.) via register, which can tune board-level's parameters of PHY, etc. + + Additional background information about the High-Speed Subsystem + and the HSP CSR block is available in Chapter 10 ("High-Speed Interf= ace") + of the EIC7700X SoC Technical Reference Manual, Part 4 + (EIC7700X_SoC_Technical_Reference_Manual_Part4.pdf). The manual is + publicly available at + https://github.com/eswincomputing/EIC7700X-SoC-Technical-Reference-M= anual/releases + + This reference is provided for background information only. $ref: /schemas/types.yaml#/definitions/phandle-array items: - items: @@ -81,7 +97,9 @@ properties: or external clock selection - description: Offset of AXI clock controller Low-Power request register + - description: Offset of register controlling TXD delay - description: Offset of register controlling TX/RX clock delay + - description: Offset of register controlling RXD delay =20 required: - compatible @@ -111,17 +129,44 @@ examples: interrupts =3D <61>; interrupt-names =3D "macirq"; phy-mode =3D "rgmii-id"; - phy-handle =3D <&phy0>; + phy-handle =3D <&gmac0_phy0>; resets =3D <&reset 95>; reset-names =3D "stmmaceth"; + rx-internal-delay-ps =3D <20>; + tx-internal-delay-ps =3D <100>; + eswin,hsp-sp-csr =3D <&hsp_sp_csr 0x100 0x108 0x114 0x118 0x11c>; + snps,axi-config =3D <&stmmac_axi_setup_gmac0>; + snps,aal; + snps,fixed-burst; + snps,tso; + stmmac_axi_setup_gmac0: stmmac-axi-config { + snps,blen =3D <0 0 0 0 16 8 4>; + snps,rd_osr_lmt =3D <2>; + snps,wr_osr_lmt =3D <2>; + }; + }; + + ethernet@50410000 { + compatible =3D "eswin,eic7700-qos-eth-clk-inversion", "snps,dwmac-= 5.20"; + reg =3D <0x50410000 0x10000>; + clocks =3D <&d0_clock 186>, <&d0_clock 171>, <&d0_clock 40>, + <&d0_clock 194>; + clock-names =3D "axi", "cfg", "stmmaceth", "tx"; + interrupt-parent =3D <&plic>; + interrupts =3D <70>; + interrupt-names =3D "macirq"; + phy-mode =3D "rgmii-rxid"; + phy-handle =3D <&gmac1_phy0>; + resets =3D <&reset 94>; + reset-names =3D "stmmaceth"; rx-internal-delay-ps =3D <200>; tx-internal-delay-ps =3D <200>; - eswin,hsp-sp-csr =3D <&hsp_sp_csr 0x100 0x108 0x118>; - snps,axi-config =3D <&stmmac_axi_setup>; + eswin,hsp-sp-csr =3D <&hsp_sp_csr 0x200 0x208 0x214 0x218 0x21c>; + snps,axi-config =3D <&stmmac_axi_setup_gmac1>; snps,aal; snps,fixed-burst; snps,tso; - stmmac_axi_setup: stmmac-axi-config { + stmmac_axi_setup_gmac1: stmmac-axi-config { snps,blen =3D <0 0 0 0 16 8 4>; snps,rd_osr_lmt =3D <2>; snps,wr_osr_lmt =3D <2>; --=20 2.25.1 From nobody Tue Feb 10 09:22:12 2026 Received: from azure-sdnproxy.icoremail.net (azure-sdnproxy.icoremail.net [52.237.72.81]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 35DC33644C4; Mon, 9 Feb 2026 09:48:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.237.72.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770630533; cv=none; b=RTOkD7/LeOM/Kl9IbEQAru7SOkP4bgLGB0HdCsG/IZABT4Er7zncLODye7xvntlAA3EhjWj8BPiJ6hGrYV605LsIMoO8jMds4AT3cDAzCAdazN3r4PvGk/b7bJfFB1/iBpyTPHRHLIJiw9dZug0Yo7Xw6eeXvLAAw1rfsQXTS2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770630533; c=relaxed/simple; bh=4XeyXlshBGHaHQd92eTyhb04BrAl9n/3NA6sBJMXWVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=b8EcyyBHvDkRjz0qvK5+Zl22IB0QPcETRVZxCQY4pJHhRgraearTtgOQwfSPffGfylkNBZLMieyA8XlufxpIIQNX/224h18nCQnBf7l4U3zMVGGO7Ov5XiXrb37FZ/8ypQ0wzOtuyBj0W1Hn69O0dK+pJGdPHKRT/zPScGDAnO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com; spf=pass smtp.mailfrom=eswincomputing.com; arc=none smtp.client-ip=52.237.72.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=eswincomputing.com Received: from E0004057DT.eswin.cn (unknown [10.11.96.26]) by app1 (Coremail) with SMTP id TAJkCgBHlzdyrYlpFDcEAA--.18983S2; Mon, 09 Feb 2026 17:48:35 +0800 (CST) From: lizhi2@eswincomputing.com To: devicetree@vger.kernel.org, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, rmk+kernel@armlinux.org.uk, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: ningyu@eswincomputing.com, linmin@eswincomputing.com, pinkesh.vaghela@einfochips.com, weishangjuan@eswincomputing.com, Zhi Li Subject: [PATCH v2 2/2] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing Date: Mon, 9 Feb 2026 17:48:29 +0800 Message-ID: <20260209094832.932-1-lizhi2@eswincomputing.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260209094628.886-1-lizhi2@eswincomputing.com> References: <20260209094628.886-1-lizhi2@eswincomputing.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: TAJkCgBHlzdyrYlpFDcEAA--.18983S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKw4kKr45AF47XF15tFy7ZFb_yoWftw15pF WkAFyYqr1jqF1fG3yqyF48ta4Fyw47WF1FyrWfKFnFyF9xtr1DXayjya4xCFy5Kry7Zr13 J3yUAFyxu3W29rJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBm14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2 Y2ka0xkIwI1lw4CEc2x0rVAKj4xxMxkF7I0En4kS14v26r4a6rW5MxkIecxEwVCm-wCF04 k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18 MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_GFv_WrylIxkGc2Ij64vIr4 1lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1U MIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I 8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRNSdgDUUUU X-CM-SenderInfo: xol2xx2s6h245lqf0zpsxwx03jof0z/ From: Zhi Li The second Ethernet controller (eth1) on the Eswin EIC7700 SoC may fail to sample RX data correctly at Gigabit speed due to EIC7700-specific receive clock to data skew at the MAC input in the silicon. The existing internal delay configuration does not provide sufficient adjustment range to compensate for this condition at 1000Mbps. Update the EIC7700 DWMAC glue driver to apply EIC7700-specific clock sampling inversion only during Gigabit operation on MAC instances that require it. TXD and RXD delay registers are explicitly cleared during initialization to override any residual configuration left by the bootloader. All HSP CSR register accesses are performed only after the required clocks are enabled. Fixes: ea77dbbdbc4e ("net: stmmac: add Eswin EIC7700 glue driver") Signed-off-by: Zhi Li --- .../ethernet/stmicro/stmmac/dwmac-eic7700.c | 152 +++++++++++++----- 1 file changed, 116 insertions(+), 36 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c b/drivers/= net/ethernet/stmicro/stmmac/dwmac-eic7700.c index bcb8e000e720..f6a99784596b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c @@ -28,20 +28,37 @@ =20 /* * TX/RX Clock Delay Bit Masks: - * - TX Delay: bits [14:8] =E2=80=94 TX_CLK delay (unit: 0.1ns per bit) - * - RX Delay: bits [30:24] =E2=80=94 RX_CLK delay (unit: 0.1ns per bit) + * - TX Delay: bits [14:8] =E2=80=94 TX_CLK delay (unit: 0.02ns per bit) + * - TX Invert : bit [15] + * - RX Delay: bits [30:24] =E2=80=94 RX_CLK delay (unit: 0.02ns per bit) + * - RX Invert : bit [31] */ #define EIC7700_ETH_TX_ADJ_DELAY GENMASK(14, 8) #define EIC7700_ETH_RX_ADJ_DELAY GENMASK(30, 24) +#define EIC7700_ETH_TX_INV_DELAY BIT(15) +#define EIC7700_ETH_RX_INV_DELAY BIT(31) =20 -#define EIC7700_MAX_DELAY_UNIT 0x7F +#define EIC7700_MAX_DELAY_STEPS 0x7F =20 static const char * const eic7700_clk_names[] =3D { "tx", "axi", "cfg", }; =20 +struct eic7700_dwmac_data { + bool rgmii_rx_clk_invert; +}; + struct eic7700_qos_priv { + struct device *dev; struct plat_stmmacenet_data *plat_dat; + struct regmap *eic7700_hsp_regmap; + u32 eth_axi_lp_ctrl_offset; + u32 eth_phy_ctrl_offset; + u32 eth_txd_offset; + u32 eth_clk_offset; + u32 eth_rxd_offset; + u32 eth_clk_dly_param; + bool eth_rx_clk_inv; }; =20 static int eic7700_clks_config(void *priv, bool enabled) @@ -61,8 +78,27 @@ static int eic7700_clks_config(void *priv, bool enabled) static int eic7700_dwmac_init(struct device *dev, void *priv) { struct eic7700_qos_priv *dwc =3D priv; + u32 eth_phy_ctrl_regset; + int ret =3D 0; + + ret =3D eic7700_clks_config(dwc, true); + if (ret) + return ret; + + regmap_read(dwc->eic7700_hsp_regmap, dwc->eth_phy_ctrl_offset, + ð_phy_ctrl_regset); + eth_phy_ctrl_regset |=3D + (EIC7700_ETH_TX_CLK_SEL | EIC7700_ETH_PHY_INTF_SELI); + regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_phy_ctrl_offset, + eth_phy_ctrl_regset); + + regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_axi_lp_ctrl_offset, + EIC7700_ETH_CSYSREQ_VAL); + + regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_txd_offset, 0); + regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_rxd_offset, 0); =20 - return eic7700_clks_config(dwc, true); + return ret; } =20 static void eic7700_dwmac_exit(struct device *dev, void *priv) @@ -88,17 +124,33 @@ static int eic7700_dwmac_resume(struct device *dev, vo= id *priv) return ret; } =20 +static void eic7700_dwmac_fix_speed(void *priv, int speed, unsigned int mo= de) +{ + struct eic7700_qos_priv *dwc =3D (struct eic7700_qos_priv *)priv; + u32 dly_param =3D dwc->eth_clk_dly_param; + + switch (speed) { + case SPEED_1000: + if (dwc->eth_rx_clk_inv) + dly_param |=3D EIC7700_ETH_RX_INV_DELAY; + break; + case SPEED_100: + case SPEED_10: + break; + default: + dev_err(dwc->dev, "invalid speed %u\n", speed); + break; + } + + regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_clk_offset, dly_param); +} + static int eic7700_dwmac_probe(struct platform_device *pdev) { + const struct eic7700_dwmac_data *data; struct plat_stmmacenet_data *plat_dat; struct stmmac_resources stmmac_res; struct eic7700_qos_priv *dwc_priv; - struct regmap *eic7700_hsp_regmap; - u32 eth_axi_lp_ctrl_offset; - u32 eth_phy_ctrl_offset; - u32 eth_phy_ctrl_regset; - u32 eth_rxd_dly_offset; - u32 eth_dly_param =3D 0; u32 delay_ps; int i, ret; =20 @@ -116,13 +168,23 @@ static int eic7700_dwmac_probe(struct platform_device= *pdev) if (!dwc_priv) return -ENOMEM; =20 + dwc_priv->dev =3D &pdev->dev; + + data =3D device_get_match_data(&pdev->dev); + if (!data) + return dev_err_probe(&pdev->dev, + -EINVAL, "no match data found\n"); + + dwc_priv->eth_rx_clk_inv =3D data->rgmii_rx_clk_invert; + /* Read rx-internal-delay-ps and update rx_clk delay */ if (!of_property_read_u32(pdev->dev.of_node, "rx-internal-delay-ps", &delay_ps)) { - u32 val =3D min(delay_ps / 100, EIC7700_MAX_DELAY_UNIT); + u32 val =3D min(delay_ps / 20, EIC7700_MAX_DELAY_STEPS); =20 - eth_dly_param &=3D ~EIC7700_ETH_RX_ADJ_DELAY; - eth_dly_param |=3D FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val); + dwc_priv->eth_clk_dly_param &=3D ~EIC7700_ETH_RX_ADJ_DELAY; + dwc_priv->eth_clk_dly_param |=3D + FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val); } else { return dev_err_probe(&pdev->dev, -EINVAL, "missing required property rx-internal-delay-ps\n"); @@ -131,55 +193,58 @@ static int eic7700_dwmac_probe(struct platform_device= *pdev) /* Read tx-internal-delay-ps and update tx_clk delay */ if (!of_property_read_u32(pdev->dev.of_node, "tx-internal-delay-ps", &delay_ps)) { - u32 val =3D min(delay_ps / 100, EIC7700_MAX_DELAY_UNIT); + u32 val =3D min(delay_ps / 20, EIC7700_MAX_DELAY_STEPS); =20 - eth_dly_param &=3D ~EIC7700_ETH_TX_ADJ_DELAY; - eth_dly_param |=3D FIELD_PREP(EIC7700_ETH_TX_ADJ_DELAY, val); + dwc_priv->eth_clk_dly_param &=3D ~EIC7700_ETH_TX_ADJ_DELAY; + dwc_priv->eth_clk_dly_param |=3D + FIELD_PREP(EIC7700_ETH_TX_ADJ_DELAY, val); } else { return dev_err_probe(&pdev->dev, -EINVAL, "missing required property tx-internal-delay-ps\n"); } =20 - eic7700_hsp_regmap =3D syscon_regmap_lookup_by_phandle(pdev->dev.of_node, - "eswin,hsp-sp-csr"); - if (IS_ERR(eic7700_hsp_regmap)) + dwc_priv->eic7700_hsp_regmap =3D + syscon_regmap_lookup_by_phandle(pdev->dev.of_node, + "eswin,hsp-sp-csr"); + if (IS_ERR(dwc_priv->eic7700_hsp_regmap)) return dev_err_probe(&pdev->dev, - PTR_ERR(eic7700_hsp_regmap), + PTR_ERR(dwc_priv->eic7700_hsp_regmap), "Failed to get hsp-sp-csr regmap\n"); =20 ret =3D of_property_read_u32_index(pdev->dev.of_node, "eswin,hsp-sp-csr", - 1, ð_phy_ctrl_offset); + 1, &dwc_priv->eth_phy_ctrl_offset); if (ret) return dev_err_probe(&pdev->dev, ret, "can't get eth_phy_ctrl_offset\n"); =20 - regmap_read(eic7700_hsp_regmap, eth_phy_ctrl_offset, - ð_phy_ctrl_regset); - eth_phy_ctrl_regset |=3D - (EIC7700_ETH_TX_CLK_SEL | EIC7700_ETH_PHY_INTF_SELI); - regmap_write(eic7700_hsp_regmap, eth_phy_ctrl_offset, - eth_phy_ctrl_regset); - ret =3D of_property_read_u32_index(pdev->dev.of_node, "eswin,hsp-sp-csr", - 2, ð_axi_lp_ctrl_offset); + 2, &dwc_priv->eth_axi_lp_ctrl_offset); if (ret) return dev_err_probe(&pdev->dev, ret, "can't get eth_axi_lp_ctrl_offset\n"); =20 - regmap_write(eic7700_hsp_regmap, eth_axi_lp_ctrl_offset, - EIC7700_ETH_CSYSREQ_VAL); + ret =3D of_property_read_u32_index(pdev->dev.of_node, + "eswin,hsp-sp-csr", + 3, &dwc_priv->eth_txd_offset); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "can't get eth_txd_offset\n"); =20 ret =3D of_property_read_u32_index(pdev->dev.of_node, "eswin,hsp-sp-csr", - 3, ð_rxd_dly_offset); + 4, &dwc_priv->eth_clk_offset); if (ret) return dev_err_probe(&pdev->dev, ret, - "can't get eth_rxd_dly_offset\n"); + "can't get eth_clk_offset\n"); =20 - regmap_write(eic7700_hsp_regmap, eth_rxd_dly_offset, - eth_dly_param); + ret =3D of_property_read_u32_index(pdev->dev.of_node, + "eswin,hsp-sp-csr", + 5, &dwc_priv->eth_rxd_offset); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "can't get eth_rxd_offset\n"); =20 plat_dat->num_clks =3D ARRAY_SIZE(eic7700_clk_names); plat_dat->clks =3D devm_kcalloc(&pdev->dev, @@ -208,12 +273,27 @@ static int eic7700_dwmac_probe(struct platform_device= *pdev) plat_dat->exit =3D eic7700_dwmac_exit; plat_dat->suspend =3D eic7700_dwmac_suspend; plat_dat->resume =3D eic7700_dwmac_resume; + plat_dat->fix_mac_speed =3D eic7700_dwmac_fix_speed; =20 return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res); } =20 +static const struct eic7700_dwmac_data eic7700_dwmac_data =3D { + .rgmii_rx_clk_invert =3D false, +}; + +static const struct eic7700_dwmac_data eic7700_dwmac_data_clk_inversion = =3D { + .rgmii_rx_clk_invert =3D true, +}; + static const struct of_device_id eic7700_dwmac_match[] =3D { - { .compatible =3D "eswin,eic7700-qos-eth" }, + { .compatible =3D "eswin,eic7700-qos-eth", + .data =3D &eic7700_dwmac_data, + }, + { + .compatible =3D "eswin,eic7700-qos-eth-clk-inversion", + .data =3D &eic7700_dwmac_data_clk_inversion, + }, { } }; MODULE_DEVICE_TABLE(of, eic7700_dwmac_match); --=20 2.25.1