Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp2291220rwl; Thu, 30 Mar 2023 08:24:17 -0700 (PDT) X-Google-Smtp-Source: AKy350awYwqieyDjNPLWd6IA4ee1oJdiX3yTtxim0rMN5RtKVBd50YSz6PxA9ysx/CIDKO+UCi3k X-Received: by 2002:a17:906:190:b0:8eb:fb1a:6970 with SMTP id 16-20020a170906019000b008ebfb1a6970mr1591078ejb.1.1680189857127; Thu, 30 Mar 2023 08:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680189857; cv=none; d=google.com; s=arc-20160816; b=RytngrKFlwtSLEWQMn0TOkJlly6vU7IKjlFPDnL+XmF4bMii7Gxjh1rwTKpTF8yI0F 9WVfVGPPGi3fo9PtQWhpB3+IsEod98CQs+6dTLcVvL4AVa8hrQMm6HGQTaBmL3SArS3u hFcstzm06vIB1f2Ff7nUcBcA6UME3djuT6VpQjd6xrRItHglrZKBiS4Qrz0G6YJMnOW6 aBzZXa6z0pbiN/FnCsU8hjYiNp+qMxsykSB8j8IUuVPIn2m5QnkTsxRoCwEvWzeOiWP5 bHlbVVd2Sv5/UAtuDt8gC2ME9/hdWUqeqOhS7E9poKeN9BxAa+CTy1kAzY01/6arjsx3 L12g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=Iy33FGUyvUlXPpRSwsaMr76qb2t9aDuQIWD29E70e7U=; b=aQteFb3MGiHr/wIRJPeL4eWS6aFcnL864jX2TeX8aa+XW+j1KBM7OZToFTUAtkstuT PP65ANI8vz7kzEz4ihfVuGI8jvhroaCc7HKIQlhqtgYwYIshH0VB9UQMavpzbCLAAVG6 oRV3K58aCS8SxXePpkinXomH6Y+XcDd5PuAsjTBQDCsUyfmn8KYBqavFDyTOHmZQR+Xe bwox7HDmFm+PVHBIUpDmEV9qXJOJfKDm8nmi07h5ftdlbDe6BdczKNgVwvapImBavlAM U8MXWkqyG8cGPqUyhZQDrUjMIu9DAyKG7MLazF2CJg9x7rPrFNVNJvplZZJeNEAKeCrs hV3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h9-20020a17090619c900b00920964e7219si31761335ejd.544.2023.03.30.08.23.41; Thu, 30 Mar 2023 08:24:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232935AbjC3PW5 (ORCPT + 99 others); Thu, 30 Mar 2023 11:22:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232920AbjC3PWx (ORCPT ); Thu, 30 Mar 2023 11:22:53 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1510B3C3D; Thu, 30 Mar 2023 08:22:07 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1phu5R-0006dD-2W; Thu, 30 Mar 2023 17:21:13 +0200 Date: Thu, 30 Mar 2023 16:21:09 +0100 From: Daniel Golle To: netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, linux-kernel@vger.kernel.org, Andrew Lunn , =?utf-8?B?QXLEsW7DpyDDnG5hbA==?= , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Sean Wang , Landen Chao , DENG Qingfang , Philipp Zabel Cc: Sam Shih , Lorenzo Bianconi , John Crispin , Felix Fietkau Subject: [PATCH net-next 05/15] net: dsa: mt7530: move SGMII PCS creation to mt7530_probe function Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move creating the SGMII PCS from mt753x_setup() to the more appropriate mt7530_probe() function. This is done also in preparation of moving all functions related to MDIO-connected MT753x switches to a separate module. Signed-off-by: Daniel Golle --- drivers/net/dsa/mt7530.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index e27a0e551cec0..803809b430c85 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -3012,12 +3012,6 @@ mt753x_setup(struct dsa_switch *ds) if (ret && priv->irq) mt7530_free_irq_common(priv); - if (priv->id == ID_MT7531) { - ret = mt7531_create_sgmii(priv); - if (ret && priv->irq) - mt7530_free_irq_common(priv); - } - return ret; } @@ -3140,6 +3134,7 @@ mt7530_probe(struct mdio_device *mdiodev) static struct regmap_config *regmap_config; struct mt7530_priv *priv; struct device_node *dn; + int ret; dn = mdiodev->dev.of_node; @@ -3232,6 +3227,12 @@ mt7530_probe(struct mdio_device *mdiodev) if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); + if (priv->id == ID_MT7531) { + ret = mt7531_create_sgmii(priv); + if (ret) + return ret; + } + return dsa_register_switch(priv->ds); } -- 2.39.2