From patchwork Tue Mar 14 10:15:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 13174690 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 A9AA7C6FD1C for ; Tue, 14 Mar 2023 16:18:19 +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:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RYLfsmQ/xRPUUdM5q7nNeYaZsKr4m2rzA06oDphDbBk=; b=KbOfbHrkz3Th9C 3JXmttCKDR5ZkOw1f606TopW8Wm2mdZnYJQnwrcQxHRKMqivtyWGJ9t1wHG4l3IUcPhm/p8Nl49c3 T/joJXTKI+nYMnQQT6Nshei8pOP9FmgGVpLLJGmzbvv77U3wBQJPnJ1hEWOXCQ0WU6SwbGq/6iEEg h6qWbYigzb2S1XeNw1annhHFtkxuxwGNALPGKnVX3qy00aMpq0UzLU3Sy7pmp1GzJOH90/dBYGwtk h/QAnCs8sxyJR06FoeZPBzelFc58r0ljx8tdGgDCCS2td8HZMDzxPTxFLQD8gZ8apvLDuBVU3lRna rnFT2FsENHSCbWbCd6LA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pc7L6-00AmKD-0D; Tue, 14 Mar 2023 16:17:28 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pc7L2-00AmIo-0Z for linux-arm-kernel@lists.infradead.org; Tue, 14 Mar 2023 16:17:25 +0000 Received: by mail-wr1-x42d.google.com with SMTP id o7so5496549wrg.5 for ; Tue, 14 Mar 2023 09:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678810642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ymG14CaAzsom/NpfgXxdIjVcFWXkyKWBzQS1t9W8TsU=; b=jhqmQLzk8XgfMOVo0VrOhrak6hNyCjDYqJS+nh2iMI5nCaiUabFM8PlWOcWdsjgkpx E+efhn43fHd8GZxwQHyz3ZPIalFZ6JFkzXuKxzR0AswbhUYjQdm5K75IAFWSgPoaOsRq RpS4cz3Y+hOyVXqwA6u4SDUzCbvxIM0XFWVxlCbrhlFBN8Fp5DwYcNOv89tJSg+PF5JX s7lLj6jyDwHz41QZXrf+tb6MJVGXMJIp8s414V0EJVvt9DvJZ8+RPT9OkHuK90EeOqT/ YZwkAaW5F1e6gMFDK2jRqiu1DStsVmub2e6ZvJpSCgLmMO0RUUzBVw3Th7Stlwa9oCcq zM+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678810642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ymG14CaAzsom/NpfgXxdIjVcFWXkyKWBzQS1t9W8TsU=; b=Ivt+VFmwKjVQtnh+aPvVMtNFYJQdX9soE2/A+6NceaiUEErCTg5VQ75e4tbjI4OM+e 86v0QyPAktpo48eOXqNLS7n1ApN+XHJQ060wzVwOsCh7xYp8zRimkW9UZ7/9qcwIUBjM Cdw85yIc1kFji1vTYoSG0DDjbjpcf/zux+uKvTriLIIk9cQHNfTzxY6b3nUrXI+dA3/j iBCzwOQbDb3vJaAzaVrR24GTzQP6ks5FAA1u9MwB9nwtNJr0ja1Lm0I1QqldqSNaA+JI ecmX5OZyjEo9tjtO8FItk4rCxz5Z0zXgjc3uW3XbP/tQMqfBwJ/89u9G0g94HRB/RDiG dzDg== X-Gm-Message-State: AO0yUKXvSGTg2HuHw3nkVB7MHMkMSlWli+cEHthBl5Bd2z+EvT9nIgvf neoN8J1oFai3B6qiyK1WfVY= X-Google-Smtp-Source: AK7set/ubSTHM5CNA+4Cklo4/839WmzTD5hrc1qf2XFeVIUZ7BG4H4slUU9mJ3JLVM+us57yoIxhXg== X-Received: by 2002:adf:f78a:0:b0:2ce:a7f2:d0b with SMTP id q10-20020adff78a000000b002cea7f20d0bmr7119794wrp.64.1678810642217; Tue, 14 Mar 2023 09:17:22 -0700 (PDT) Received: from localhost.localdomain (93-34-89-197.ip49.fastwebnet.it. [93.34.89.197]) by smtp.googlemail.com with ESMTPSA id a16-20020a5d4570000000b002c5539171d1sm2426821wrc.41.2023.03.14.09.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 09:17:21 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Heiner Kallweit , Russell King , Gregory Clement , Sebastian Hesselbarth , Andy Gross , Bjorn Andersson , Konrad Dybcio , Christian Marangi , John Crispin , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Lee Jones , linux-leds@vger.kernel.org Subject: [net-next PATCH v3 01/14] net: dsa: qca8k: move qca8k_port_to_phy() to header Date: Tue, 14 Mar 2023 11:15:03 +0100 Message-Id: <20230314101516.20427-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314101516.20427-1-ansuelsmth@gmail.com> References: <20230314101516.20427-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230314_091724_215318_9E308A66 X-CRM114-Status: GOOD ( 13.81 ) 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 Move qca8k_port_to_phy() to qca8k header as it's useful for future reference in Switch LEDs module since the same logic is applied to get the right index of the switch port. Make it inline as it's simple function that just decrease the port. Signed-off-by: Christian Marangi Reviewed-by: Andrew Lunn --- drivers/net/dsa/qca/qca8k-8xxx.c | 15 --------------- drivers/net/dsa/qca/qca8k.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c index 2f224b166bbb..8dfc5db84700 100644 --- a/drivers/net/dsa/qca/qca8k-8xxx.c +++ b/drivers/net/dsa/qca/qca8k-8xxx.c @@ -716,21 +716,6 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy, return ret; } -static u32 -qca8k_port_to_phy(int port) -{ - /* From Andrew Lunn: - * Port 0 has no internal phy. - * Port 1 has an internal PHY at MDIO address 0. - * Port 2 has an internal PHY at MDIO address 1. - * ... - * Port 5 has an internal PHY at MDIO address 4. - * Port 6 has no internal PHY. - */ - - return port - 1; -} - static int qca8k_mdio_busy_wait(struct mii_bus *bus, u32 reg, u32 mask) { diff --git a/drivers/net/dsa/qca/qca8k.h b/drivers/net/dsa/qca/qca8k.h index 03514f7a20be..4e48e4dd8b0f 100644 --- a/drivers/net/dsa/qca/qca8k.h +++ b/drivers/net/dsa/qca/qca8k.h @@ -422,6 +422,20 @@ struct qca8k_fdb { u8 mac[6]; }; +static inline u32 qca8k_port_to_phy(int port) +{ + /* From Andrew Lunn: + * Port 0 has no internal phy. + * Port 1 has an internal PHY at MDIO address 0. + * Port 2 has an internal PHY at MDIO address 1. + * ... + * Port 5 has an internal PHY at MDIO address 4. + * Port 6 has no internal PHY. + */ + + return port - 1; +} + /* Common setup function */ extern const struct qca8k_mib_desc ar8327_mib[]; extern const struct regmap_access_table qca8k_readable_table;