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 X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_SBL,URIBL_SBL_A,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A32F8C4740A for ; Mon, 9 Sep 2019 17:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78148218DE for ; Mon, 9 Sep 2019 17:19:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudbear.ru header.i=@cloudbear.ru header.b="UJLQ8NG4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728778AbfIIRTl (ORCPT ); Mon, 9 Sep 2019 13:19:41 -0400 Received: from forward103j.mail.yandex.net ([5.45.198.246]:55118 "EHLO forward103j.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726931AbfIIRTl (ORCPT ); Mon, 9 Sep 2019 13:19:41 -0400 Received: from mxback17g.mail.yandex.net (mxback17g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:317]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 862596741162; Mon, 9 Sep 2019 20:19:35 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback17g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id VG426gUt4L-JYwa7EmW; Mon, 09 Sep 2019 20:19:35 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudbear.ru; s=mail; t=1568049575; bh=AwxsyEGDehcquIuiRTow6P2yBfFaC4ijyHy2rTy1NzI=; h=In-Reply-To:Subject:To:From:Cc:References:Date:Message-Id; b=UJLQ8NG4qpyrtLgoglVVGuVCmtJ56n0b7gPO2xGoAFjbpPkq9RA2ydWqZama7iW0k rvfFmY3q2KnpZZOcBRXNA096aE5Qv5j4xKw2awe66bRHlygON0jDGMnBYN7zbpm65s f45gSvuOHAuX7gsQDDfcay/6U5za9wG9b3ERQKf4= Authentication-Results: mxback17g.mail.yandex.net; dkim=pass header.i=@cloudbear.ru Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id rCsZlLVxqi-JXTSsDoi; Mon, 09 Sep 2019 20:19:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Vitaly Gaiduk To: davem@davemloft.net, robh+dt@kernel.org, f.fainelli@gmail.com Cc: Vitaly Gaiduk , Mark Rutland , Andrew Lunn , Heiner Kallweit , Trent Piepho , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/2] net: phy: dp83867: Add SGMII mode type switching Date: Mon, 9 Sep 2019 20:19:24 +0300 Message-Id: <1568049566-16708-1-git-send-email-vitaly.gaiduk@cloudbear.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1568047940-14490-2-git-send-email-vitaly.gaiduk@cloudbear.ru> References: <1568047940-14490-2-git-send-email-vitaly.gaiduk@cloudbear.ru> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds ability to switch beetween two PHY SGMII modes. Some hardware, for example, FPGA IP designs may use 6-wire mode which enables differential SGMII clock to MAC. Signed-off-by: Vitaly Gaiduk --- drivers/net/phy/dp83867.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index 1f1ecee..37fceaf 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -37,6 +37,7 @@ #define DP83867_STRAP_STS2 0x006f #define DP83867_RGMIIDCTL 0x0086 #define DP83867_IO_MUX_CFG 0x0170 +#define DP83867_SGMIICTL 0x00D3 #define DP83867_10M_SGMII_CFG 0x016F #define DP83867_10M_SGMII_RATE_ADAPT_MASK BIT(7) @@ -61,6 +62,9 @@ #define DP83867_RGMII_TX_CLK_DELAY_EN BIT(1) #define DP83867_RGMII_RX_CLK_DELAY_EN BIT(0) +/* SGMIICTL bits */ +#define DP83867_SGMII_TYPE BIT(14) + /* STRAP_STS1 bits */ #define DP83867_STRAP_STS1_RESERVED BIT(11) @@ -109,6 +113,7 @@ struct dp83867_private { bool rxctrl_strap_quirk; bool set_clk_output; u32 clk_output_sel; + bool sgmii_ref_clk_en; }; static int dp83867_ack_interrupt(struct phy_device *phydev) @@ -197,6 +202,9 @@ static int dp83867_of_init(struct phy_device *phydev) dp83867->rxctrl_strap_quirk = of_property_read_bool(of_node, "ti,dp83867-rxctrl-strap-quirk"); + dp83867->sgmii_ref_clk_en = of_property_read_bool(of_node, + "ti,sgmii-ref-clock-output-enable"); + /* Existing behavior was to use default pin strapping delay in rgmii * mode, but rgmii should have meant no delay. Warn existing users. */ @@ -389,6 +397,17 @@ static int dp83867_config_init(struct phy_device *phydev) if (ret) return ret; + + val = phy_read_mmd(phydev, DP83867_DEVADDR, DP83867_SGMIICTL); + /* SGMII type is set to 4-wire mode by default. + * If we place appropriate property in dts (see above) + * switch on 6-wire mode. + */ + if (dp83867->sgmii_ref_clk_en) + val |= DP83867_SGMII_TYPE; + else + val &= ~DP83867_SGMII_TYPE; + phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_SGMIICTL, val); } /* Enable Interrupt output INT_OE in CFG3 register */ -- 2.7.4