From patchwork Fri Apr 7 13:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= X-Patchwork-Id: 13204951 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 A58F7C6FD1D for ; Fri, 7 Apr 2023 14:48:53 +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=YHCG5eIyRfJA7ygnxjynxRv/zTtiwJHkA6J9uAJubQw=; b=bvqyGWJayPpQsp CDD6asE7ikJdTzhRoaOz3T1VIoF/6RYYy+JBkGdDkZLiB8mUROqj98vTQiYWW8CRvrZU+gM2h8FnR so/NUVQktK7fWfw0Bkl0TuEJKPmV8C4GMAuAbwbT3gvdVTZswbQR63rqtwco9WkfB9Zm+wkV8U8dP KQpX3q5di7guOMYZmHtz7HbAFyUxt80xeba0ScZSLwfXbEa9JCcjrsnRPFU/WC+j5agqEGi08/cOE nJT2UlbzCDjAoK2ZCbG2GHSR9keYq1+tmvcpO9wg8eePzsFF9X9d3NBu4IZmIMW9/0ELAT1t1yY/E SR8ZCM7Rfu5ORHvAcgSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pknNm-00AX8c-2j; Fri, 07 Apr 2023 14:48:06 +0000 Received: from mail-yw1-f175.google.com ([209.85.128.175]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pkmQx-00ANkv-0g; Fri, 07 Apr 2023 13:47:25 +0000 Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-54c17fa9ae8so76368937b3.5; Fri, 07 Apr 2023 06:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680875236; 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; bh=Jsn0NQ9CmWAx6uQ/GpiFpZY13AUB836GqLn0lOzSnMY=; b=dbhdUjb5Kx495YHbuaMUJ+xjTzf9UozTmMvu4Fpv2sLSGROC6B3CmnhQ2dGKQV0jCc 8lvm1MEqANTyT3HXeuYMQdyMZYAxfnxgpc7n1e5VjMGNX8DFTJxfshel9hE45/A0mhGO 1k4Oa/2WSb39LGib8igtf7MnAGRFXYzEWhQfHz4niOl6j1SZ3ZKTo/Q5XjcNJqc4LSYk SDRdgBcw7OJfMnwctk3/Z5y3ckC+lqqOnQ5ztpBm+68gWQo3Zb/MCdFHxg6fLXb0NigI cFGz/fzC8XyoDR+m2qJHQsQd5QwLW93/neCy2XUuNF2KPPFpuVqayNvihMZw9AgDswgL 1GwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680875236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jsn0NQ9CmWAx6uQ/GpiFpZY13AUB836GqLn0lOzSnMY=; b=BldohPqZSGxoh3wFAPSvbrvxPfjCK8ZJQxHCrTUppncp6NopzCmFkdOmrvoq3l9bTz cmFzxBjRvgQLfybaK7SxK7kTL1AcQK9EjByEeLb2BQ7wlBpwA8R8hK/P4gzNZB62XaDY a874+2SmutDU7V4gfxKM12kbweFb5L9cY51Cq6Zk1iDChjiR/VxY+qWJcjKH7DfR7mqv GgbJvSGc6wYTFkBFyqNunVrTVNpxhQGiVjqczQGJi5bd6CuLR2/By57ros/OdwwdA8q7 Z9pZYkBxZqFD6HDcusUiOG5y96O7a1G0a+SJIXb9zEQblFsj9dQjFlzgPIzRCI0Il6Pz LrSA== X-Gm-Message-State: AAQBX9e6Grk7kJbGxoIc3wWmLcclZIvYGObeiH3jho/S+UZ1CUCA19S0 6OEBXjywdxyZ3Wzl7OOn+7Y= X-Google-Smtp-Source: AKy350ZJABInmffON1tk4bbyZjkiUG1rYtVMdfnNMubLerKmw5V+zmQ0sucFY+D6OMcTnmtsevZGvg== X-Received: by 2002:a81:484d:0:b0:541:9671:3169 with SMTP id v74-20020a81484d000000b0054196713169mr1867341ywa.39.1680875236297; Fri, 07 Apr 2023 06:47:16 -0700 (PDT) Received: from arinc9-PC.lan ([149.91.1.15]) by smtp.gmail.com with ESMTPSA id 139-20020a810e91000000b00545a0818473sm1034317ywo.3.2023.04.07.06.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 06:47:15 -0700 (PDT) From: arinc9.unal@gmail.com X-Google-Original-From: arinc.unal@arinc9.com To: Sean Wang , Landen Chao , DENG Qingfang , Daniel Golle , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Russell King Cc: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= , Richard van Schagen , Richard van Schagen , Frank Wunderlich , erkin.bozoglu@xeront.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [RFC PATCH v2 net-next 09/14] net: dsa: mt7530: move enabling port 6 to mt7530_setup_port6() Date: Fri, 7 Apr 2023 16:46:21 +0300 Message-Id: <20230407134626.47928-10-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230407134626.47928-1-arinc.unal@arinc9.com> References: <20230407134626.47928-1-arinc.unal@arinc9.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230407_064719_368306_12F4DCF8 X-CRM114-Status: GOOD ( 12.93 ) 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 From: Arınç ÜNAL Enable port 6 only when port 6 is being used. Read the HWTRAP_XTAL_MASK value from val now that val is equal to the value of MT7530_MHWTRAP. Update the comment on mt7530_setup() with a better explanation. Tested-by: Arınç ÜNAL Signed-off-by: Arınç ÜNAL --- drivers/net/dsa/mt7530.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 0a6d1c0872be..70a673347cf9 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -404,9 +404,13 @@ static int mt7530_setup_port6(struct dsa_switch *ds, phy_interface_t interface) { struct mt7530_priv *priv = ds->priv; - u32 ncpo1, ssc_delta, trgint, xtal; + u32 ncpo1, ssc_delta, trgint, xtal, val; - xtal = mt7530_read(priv, MT7530_MHWTRAP) & HWTRAP_XTAL_MASK; + val = mt7530_read(priv, MT7530_MHWTRAP); + val &= ~MHWTRAP_P6_DIS; + mt7530_write(priv, MT7530_MHWTRAP, val); + + xtal = val & HWTRAP_XTAL_MASK; if (xtal == HWTRAP_XTAL_20MHZ) { dev_err(priv->dev, @@ -2235,9 +2239,9 @@ mt7530_setup(struct dsa_switch *ds) mt7530_rmw(priv, MT7530_TRGMII_RD(i), RD_TAP_MASK, RD_TAP(16)); - /* Enable port 6 */ + /* Enable PHY access and operate in manual mode */ val = mt7530_read(priv, MT7530_MHWTRAP); - val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS; + val &= ~MHWTRAP_PHY_ACCESS; val |= MHWTRAP_MANUAL; mt7530_write(priv, MT7530_MHWTRAP, val);