From patchwork Tue May 14 12:22:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "A. Sverdlin" X-Patchwork-Id: 13664177 X-Patchwork-Delegate: kuba@kernel.org Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85EB96D1A7 for ; Tue, 14 May 2024 14:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.136.64.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715695392; cv=none; b=MbPV35nqcwpnw+MoUGC14XWz1GiaAKuxrsMfe403PqlQdOvvSwnJavHu11d1G5obDJm27kn26ikcrbHj5R/luoTx/WWfhiYFIVf6+O/+63xxvew8XWk7aU2c5kcoutG8gHhA5Xea/ptNc82S4HL75tz1bSqt1ahw28dzebc5FWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715695392; c=relaxed/simple; bh=Q23/aKu4i2YT/OD5u00bUgJ9yeUU9RQBAFAnB9R9z+Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rYjpLeL7YHRrPM+BsL8NFamdYc7iKsbaZqivN0BAqe4g/qEiYzvoKk1NSAUZmuncfjQHWvvgknzvFXbm4ewFPt0KkJCNG8zG0NApXWugNNrAooM5idPZG89RWk3i/PgCEMQ3IBa8Wzp1CT4w2KNFCKmtGeUF8MUXjbCkTaTLKdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com; dkim=pass (1024-bit key) header.d=siemens.com header.i=alexander.sverdlin@siemens.com header.b=UEHyJnzM; arc=none smtp.client-ip=185.136.64.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=siemens.com header.i=alexander.sverdlin@siemens.com header.b="UEHyJnzM" Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024051412223846ff346061121c8d94 for ; Tue, 14 May 2024 14:22:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=alexander.sverdlin@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=LPGohqmOK72ipupZwALJmvxGKmEGysxO6IJocO3bJug=; b=UEHyJnzMnUHg0NTgKmLyzHqjMEC2o/Y6RjFsNOzoEepXQEmFcfEJXtn6R1cpUURcwC3HEc oqX33ppk7jlMmIpz+bVMkmLWiy+9aBrX6q7P53FoYy7BiSmDUt0rokBkLArcdP5Sme7XQnYI mrH9YcqduzgDzvdiKI7g+wo0smlWw=; From: "A. Sverdlin" To: netdev@vger.kernel.org Cc: Alexander Sverdlin , Roger Quadros , Grygorii Strashko , Chintan Vankar Subject: [PATCH 1/2] net: ethernet: ti: am65-cpsw-nuss: rename phy_node -> port_np Date: Tue, 14 May 2024 14:22:27 +0200 Message-ID: <20240514122232.662060-1-alexander.sverdlin@siemens.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-456497:519-21489:flowmailer X-Patchwork-Delegate: kuba@kernel.org From: Alexander Sverdlin Rename phy_node to port_np to better reflect what it actually is, because the new phylink API takes netdev node (or DSA port node), and resolves the phandle internally. Signed-off-by: Alexander Sverdlin --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 +++--- drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 4e50b37928885..eaadf8f09c401 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -896,7 +896,7 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) /* mac_sl should be configured via phy-link interface */ am65_cpsw_sl_ctl_reset(port); - ret = phylink_of_phy_connect(port->slave.phylink, port->slave.phy_node, 0); + ret = phylink_of_phy_connect(port->slave.phylink, port->slave.port_np, 0); if (ret) goto error_cleanup; @@ -2611,7 +2611,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) of_property_read_bool(port_np, "ti,mac-only"); /* get phy/link info */ - port->slave.phy_node = port_np; + port->slave.port_np = port_np; ret = of_get_phy_mode(port_np, &port->slave.phy_if); if (ret) { dev_err(dev, "%pOF read phy-mode err %d\n", @@ -2760,7 +2760,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) } phylink = phylink_create(&port->slave.phylink_config, - of_node_to_fwnode(port->slave.phy_node), + of_node_to_fwnode(port->slave.port_np), port->slave.phy_if, &am65_cpsw_phylink_mac_ops); if (IS_ERR(phylink)) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h index d8ce88dc9c89a..e2ce2be320bd6 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h @@ -30,7 +30,7 @@ struct am65_cpts; struct am65_cpsw_slave_data { bool mac_only; struct cpsw_sl *mac_sl; - struct device_node *phy_node; + struct device_node *port_np; phy_interface_t phy_if; struct phy *ifphy; struct phy *serdes_phy; From patchwork Tue May 14 12:22:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "A. Sverdlin" X-Patchwork-Id: 13664178 X-Patchwork-Delegate: kuba@kernel.org Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 612341448C0 for ; Tue, 14 May 2024 14:03:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.136.64.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715695394; cv=none; b=TKqTG0qQxXBP8ssxLkoQ1fh8DSozTff74883gZOXR711YyB0c61Y8GvufBYvclVHmuRy5dIfsj0Z5YzyLb8rjkL47Gs+Ha+3zXGonH7t4eZccFRn1GShncHMGdx0m1Axqeuk5vn1J4up7p7RqXY9DzuBSWk2LJ/eeBgK9b8SayA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715695394; c=relaxed/simple; bh=rJ1bEBTgSxSquKgwJJiKhvgfHb2b9Isu5iXQlP8lCYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=imLOxKW+VKrQzb9I8GbnFkdacB7O/hFB1zcNN43y1aYZBFyIarrBE59P0lZ9ELjygvBOpvUtgZXtSfCfiY4bCqWM2/IwjfWaCmNDnsvGzCArRMo+RjlNrL4Iku7mCF4YEl4x6qwGqlNA+ffqo9oUDDmRAeRNMiOhTZIrNkhj93g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com; dkim=pass (1024-bit key) header.d=siemens.com header.i=alexander.sverdlin@siemens.com header.b=YXefpqV4; arc=none smtp.client-ip=185.136.64.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=siemens.com header.i=alexander.sverdlin@siemens.com header.b="YXefpqV4" Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202405141222383a10f55a3263344500 for ; Tue, 14 May 2024 14:22:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=alexander.sverdlin@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=tsaZAj3Jx2EVatXqxBgzLIi1v9yYsiVqwyTwHBhftSA=; b=YXefpqV4Agi268CpNi4MsSWtVTARJapJQuFGnZm2fmbD4BfupF/yA2HVv6AT2/nrLJ5XMg 2Z39VHrPrfk3WaRxIc/ZKRwhlHIFu5uXNId/hTKHS5Ec7LrbPWRH608EaIzQGrPlEr7icgsa YNdZcVdEVapD4+tGt7z80Fj5VJABQ=; From: "A. Sverdlin" To: netdev@vger.kernel.org Cc: Alexander Sverdlin , Roger Quadros , Grygorii Strashko , Chintan Vankar Subject: [PATCH 2/2] net: ethernet: ti: am65-cpsw-nuss: populate netdev of_node Date: Tue, 14 May 2024 14:22:28 +0200 Message-ID: <20240514122232.662060-2-alexander.sverdlin@siemens.com> In-Reply-To: <20240514122232.662060-1-alexander.sverdlin@siemens.com> References: <20240514122232.662060-1-alexander.sverdlin@siemens.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-456497:519-21489:flowmailer X-Patchwork-Delegate: kuba@kernel.org From: Alexander Sverdlin So that of_find_net_device_by_node() can find cpsw-nuss ports and other DSA switches can be stacked downstream. Signed-off-by: Alexander Sverdlin --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index eaadf8f09c401..e6f87ac394fe6 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -2703,6 +2703,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) mutex_init(&ndev_priv->mm_lock); port->qos.link_speed = SPEED_UNKNOWN; SET_NETDEV_DEV(port->ndev, dev); + port->ndev->dev.of_node = port->slave.port_np; eth_hw_addr_set(port->ndev, port->slave.mac_addr);