From patchwork Sun Mar 19 17:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758697 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=Czm5PCmA; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=nove2OYH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkjl6hLpz246f for ; Mon, 20 Mar 2023 04:04:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B1D3484EC7; Sun, 19 Mar 2023 18:04:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="Czm5PCmA"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="nove2OYH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24D65854D8; Sun, 19 Mar 2023 18:03:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9656484EC7 for ; Sun, 19 Mar 2023 18:03:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PfkjN1Mxmz9sbl; Sun, 19 Mar 2023 18:03:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SuonYyfAY4GZEOcdaPce5x9MNW6PzZk+i0dS8xqAOeM=; b=Czm5PCmAOs0DuRmBWzjyGq2TPpHIrJUhhbfH4v8O0xKc5V2Coyz2wGPv6IuJ4HVBbb8IeS lPiIgheI+CQ8izkE5+v6KMKSgtfBBne80ZM35zcQLNC0k9j2DDi8NqrRgz30hqrXKshvBX pGpubyJEqakEGXdnzK9tfPr0tW9QShM1kEyCfyR0Ts/dVyYTbFiTT71I3DAXZAIR7zm8+B Jmw2es4bEOmkUp27xrX5uHG4KuygB6ISXoWxCyq465CujjXqzyPUtwZyoYwMAgGb5r6t9V EqrUgpMMEtvwjqsog8DT6yCapfnTkdp+LQdTxaGlkUZeS5P1ZQp56tWHp1FJ+g== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SuonYyfAY4GZEOcdaPce5x9MNW6PzZk+i0dS8xqAOeM=; b=nove2OYHVPPcW2llkpAwTTrDEiVZHVULEe0+IPTLJdaMZ0bMYhYIgaG7jI8iAsNvv0vISG U1MJVwsnLdi7kSPYhFsvBAYLFd1Qdm+qKUN7oF2TYW4MGs+UB62KcoKLf5IlKxSHBheXlX Nmm5DXMursbnFbzWHaAzAJijfiBAlOsbEiv61Yb75fihdjbjQIvrmM+GAsOILydLSeg2hQ 8lgs6jSP7IyXnitB5Bql1Rp7DM9NSSiETnVQwmLY/zfxUALqu49t7eKklD7CgtT17ZKJmw hhCte4QXkC3/EjEusM31JCGZjMScYdphAPVadYb9+T0uVufpManTmT8s5+OGBQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 01/41] net: phy: aquantia: Staticize PHY driver entries Date: Sun, 19 Mar 2023 18:02:37 +0100 Message-Id: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 5f85cbc38099671783c X-MBO-RS-META: 8y8oopsqhfp8x5xibp3ncingnr7bazm3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean These struct phy_driver ... instances are local to this source code file, staticize them. No functional change. Signed-off-by: Marek Vasut Acked-by: Michal Simek Tested-by: Michal Simek #microblaze (MANUAL_RELOC) Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/aquantia.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 8eb6024829d..fa887ade0c2 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -598,7 +598,7 @@ int aquantia_startup(struct phy_device *phydev) return 0; } -struct phy_driver aq1202_driver = { +static struct phy_driver aq1202_driver = { .name = "Aquantia AQ1202", .uid = 0x3a1b445, .mask = 0xfffffff0, @@ -611,7 +611,7 @@ struct phy_driver aq1202_driver = { .shutdown = &gen10g_shutdown, }; -struct phy_driver aq2104_driver = { +static struct phy_driver aq2104_driver = { .name = "Aquantia AQ2104", .uid = 0x3a1b460, .mask = 0xfffffff0, @@ -624,7 +624,7 @@ struct phy_driver aq2104_driver = { .shutdown = &gen10g_shutdown, }; -struct phy_driver aqr105_driver = { +static struct phy_driver aqr105_driver = { .name = "Aquantia AQR105", .uid = 0x3a1b4a2, .mask = 0xfffffff0, @@ -638,7 +638,7 @@ struct phy_driver aqr105_driver = { .data = AQUANTIA_GEN1, }; -struct phy_driver aqr106_driver = { +static struct phy_driver aqr106_driver = { .name = "Aquantia AQR106", .uid = 0x3a1b4d0, .mask = 0xfffffff0, @@ -651,7 +651,7 @@ struct phy_driver aqr106_driver = { .shutdown = &gen10g_shutdown, }; -struct phy_driver aqr107_driver = { +static struct phy_driver aqr107_driver = { .name = "Aquantia AQR107", .uid = 0x3a1b4e0, .mask = 0xfffffff0, @@ -665,7 +665,7 @@ struct phy_driver aqr107_driver = { .data = AQUANTIA_GEN2, }; -struct phy_driver aqr112_driver = { +static struct phy_driver aqr112_driver = { .name = "Aquantia AQR112", .uid = 0x3a1b660, .mask = 0xfffffff0, @@ -679,7 +679,7 @@ struct phy_driver aqr112_driver = { .data = AQUANTIA_GEN3, }; -struct phy_driver aqr113c_driver = { +static struct phy_driver aqr113c_driver = { .name = "Aquantia AQR113C", .uid = 0x31c31c12, .mask = 0xfffffff0, @@ -693,7 +693,7 @@ struct phy_driver aqr113c_driver = { .data = AQUANTIA_GEN3, }; -struct phy_driver aqr405_driver = { +static struct phy_driver aqr405_driver = { .name = "Aquantia AQR405", .uid = 0x3a1b4b2, .mask = 0xfffffff0, @@ -707,7 +707,7 @@ struct phy_driver aqr405_driver = { .data = AQUANTIA_GEN1, }; -struct phy_driver aqr412_driver = { +static struct phy_driver aqr412_driver = { .name = "Aquantia AQR412", .uid = 0x3a1b710, .mask = 0xfffffff0, From patchwork Sun Mar 19 17:02:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758698 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=ZEmzvNj7; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=gFSH/BvA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkjy4dSJz246f for ; Mon, 20 Mar 2023 04:04:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 186AA85A26; Sun, 19 Mar 2023 18:04:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="ZEmzvNj7"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="gFSH/BvA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97209855A8; Sun, 19 Mar 2023 18:04:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 22E7D855BA for ; Sun, 19 Mar 2023 18:04:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkjf5zthz9sHR; Sun, 19 Mar 2023 18:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QaUTZhBqUzHJsWL4TYyJBN3VMkKy20W7m+jrZi3g6A8=; b=ZEmzvNj73Wv0nwetpsboyv8gTGnGDuBXtFP7VuQVZLqMcJckI/LNBk+GOwyKKpIk3NjbZA 5ippVny6/OrivybVqwBeN19/dLzuhcDSvsA9eUUfKfFHgdVDAXFRSDEozw8OmIJJZ4fs6Y RVeALpnIJAxgzjpMn2k45saBJ+OUb9dB1It9Pfy2677vuCZ2vhpQt21EpDGfW6JpBRvoTF mDpsbTN+VywTX+vvc3cZoORpLKm/FNTG1i7Sz1y2HFBlcI42fK6mn7nfK9eCEkK5tVjdEs G0auqo6bam8jjYEj93trdt2LvFKdCPCGnMJ3PnZrZTcrpLyY6yRJLLDxE0gF/g== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QaUTZhBqUzHJsWL4TYyJBN3VMkKy20W7m+jrZi3g6A8=; b=gFSH/BvAvevVw0xx2dxpbEftANda4ufILErhnUxLIlBwDerYLiJ7UZKCBiWqU3Vg0q8+Mf KouNRwPConhi5SNX74OgP8PTTyqiE+r5XRWVlA8CqPaLSmzY0c/d8N3XdjjwuPp5d8vY1f +QiHznZXh0+vltmgXP6x4sf2bNxP484GbpqzjIKlLbuo/iGAMmQEWj5z7UzO7+btUpfhax Ckb9C71ldyNYjxIVdQmHVlXaUoRLeNhql1H5KR+RjdYvle6+0BndZM+ZSwbPHaQRsqWJLg nv4pgzAD3QqcWL3PN4S0Z86vTRW9bik6mPMV4X+pdylDmZLK3w1tNNGCDx3oxg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 02/41] net: phy: ca_phy: Staticize PHY driver entries Date: Sun, 19 Mar 2023 18:02:38 +0100 Message-Id: <20230319170317.27711-2-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: g1c8r896qoqz78u5r1x1bq7em6kw9b8s X-MBO-RS-ID: 134902cdb2aa6f42a33 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean These struct phy_driver ... instances are local to this source code file, staticize them. No functional change. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/ca_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/ca_phy.c b/drivers/net/phy/ca_phy.c index 16851a6820f..9180a41111c 100644 --- a/drivers/net/phy/ca_phy.c +++ b/drivers/net/phy/ca_phy.c @@ -104,7 +104,7 @@ static int rtl8211_probe(struct phy_device *phydev) } /* Support for RTL8211 External PHY */ -struct phy_driver rtl8211_external_driver = { +static struct phy_driver rtl8211_external_driver = { .name = "Cortina RTL8211 External", .uid = PHY_ID_RTL8211_EXT, .mask = PHY_ID_MASK, @@ -115,7 +115,7 @@ struct phy_driver rtl8211_external_driver = { }; /* Support for RTL8211 Internal PHY */ -struct phy_driver rtl8211_internal_driver = { +static struct phy_driver rtl8211_internal_driver = { .name = "Cortina RTL8211 Inrernal", .uid = PHY_ID_RTL8211_INT, .mask = PHY_ID_MASK, From patchwork Sun Mar 19 17:02:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758699 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=JGruEuTN; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=eD/Thf8H; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkkB0lKzz246f for ; Mon, 20 Mar 2023 04:04:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 300CE859B6; Sun, 19 Mar 2023 18:04:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="JGruEuTN"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="eD/Thf8H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CACB885623; Sun, 19 Mar 2023 18:04:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050:0:465::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ADD9E858FF for ; Sun, 19 Mar 2023 18:04:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Pfkjk2YZyz9sW6; Sun, 19 Mar 2023 18:04:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KfN+L8S424MBjOAEOoUJwQ+EkeFaIsDYW1FIdTpMY5I=; b=JGruEuTNE9HpFrUv+abanRrQtn/EG5VaNGNRYRNOvwyJJk2L0atT1pRlpdwp9Q7LRYgt8h BReVpeXfQ9d5SCmRkyEZSCeclpqq0w01nqCfD56WffJvHgARg4GCvXIe/xBkCh7Hh+Upoi 8sYE+AtQQLFjl8GUH/m10dc1XzptVXw3+j+LXeEm0jUkkH/zOhIKtOZ8Y+caL1gTUtK554 E8HK4EW9gpuYiAhMKginJaxuzjie92u8tSeUyZwCUW7oZlzCRyEIkJESC2TqatBULCT2EJ zR4iITp+IGjac6tfx6xWpmEnC0D0mxeR5q/uVfiRhYSEY2xKP2Ag+JUCKzhCdg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KfN+L8S424MBjOAEOoUJwQ+EkeFaIsDYW1FIdTpMY5I=; b=eD/Thf8HGRqvFvzYbcFL9DH2sXdFtv4tz5L1InHckMuTdRILq3l9qUxmwaF2/L6wSEjXFp B4YOdxWoxWN7srJ3/mEACwNrLluFMDGOwPN0VzJUIxuNZbwIKw8fBFci/Vz5CDB5jpe7Cq wTdUVb8ApxtV7RVMPUFyuteufSof2iq1xyuwkp2/dWIt7k9EQCrKZwytFrfzDCU4L6FU/M 2bRvzIotGVGIOKdW9GZO1i78Gud/ppyU83883aVmAlUffkxY5KGlj2eUngkwG5XClV/8fz Gmbkx8uwinjqtq0BjwZ7AfLCtuy65dEhSVAT3NqtOnLaBJh7H4HzOCS4s1nLeg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 03/41] net: phy: cortina: Staticize PHY driver entries Date: Sun, 19 Mar 2023 18:02:39 +0100 Message-Id: <20230319170317.27711-3-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 1jtswcnk7fpg87scnszj56zd5uc3hu1s X-MBO-RS-ID: 698b63152d57ddda166 X-Rspamd-Queue-Id: 4Pfkjk2YZyz9sW6 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean These struct phy_driver ... instances are local to this source code file, staticize them. No functional change. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/cortina.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index 778d93e609c..df5a73d6112 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -382,7 +382,7 @@ int cs4223_startup(struct phy_device *phydev) return 0; } -struct phy_driver cs4340_driver = { +static struct phy_driver cs4340_driver = { .name = "Cortina CS4315/CS4340", .uid = PHY_UID_CS4340, .mask = 0xfffffff0, @@ -396,7 +396,7 @@ struct phy_driver cs4340_driver = { .shutdown = &gen10g_shutdown, }; -struct phy_driver cs4223_driver = { +static struct phy_driver cs4223_driver = { .name = "Cortina CS4223", .uid = PHY_UID_CS4223, .mask = 0x0ffff00f, From patchwork Sun Mar 19 17:02:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758700 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=s4MRI5hr; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=RkjlitGh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkkQ6rk1z246f for ; Mon, 20 Mar 2023 04:04:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A553855A8; Sun, 19 Mar 2023 18:04:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="s4MRI5hr"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="RkjlitGh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 32DF38594F; Sun, 19 Mar 2023 18:04:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E96E384E3A for ; Sun, 19 Mar 2023 18:04:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pfkjn1H8vz9sYf; Sun, 19 Mar 2023 18:04:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0dutRxJrY3pIRDEn8Vsej7etzs9Nglz5FeMUvHdzq3w=; b=s4MRI5hr8TUzK+JWJskFn6U/PhrdHRfKHUB1qE5Ev0zg5VMLsKTrCQgWIaVlEsI/zTOf8n GL0gT3Fs91qEPs9hTHCGRbQpJMCf+uFGn64Ej490YFM4gqzNsEqNynW0Q4ENPPNkvoISsd PtvAJikxObfFH03RMhxY0tsJhBoVHwW8ojZJKvpMv+clS8puv0EcEq0oP7148J88mdY091 XZJTUsYU0vPcSq70nVPROyxS8gSsjBL0qZa68T2RLIdPlgLxk++Gvle0OTDc881ic3GcYS MB+Yf4E5jHWrGl3xvT9zQvQsav+US841FQiYvfqTSQ2cN+T9oU/5YgZQc+hA+w== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0dutRxJrY3pIRDEn8Vsej7etzs9Nglz5FeMUvHdzq3w=; b=RkjlitGhSMEIAQDXmJ0t5FKbbyI2O9MUJJrBI2WNQSUhMaAnBZWaA3/igXokED3vExci2U R9r4RCwmhVKGVzuzsUCa0rqDFLMDzHR9k1splA/JYrcG8YvkQfwZrTIDmCjSu3mjbosu/B vaeQpOOuB8xVQQsqJI9ZrMVLkJAPIlj+TQfdtRDMQjXkpiuPMit3h5dUr1m2OJDq9vzRGR v32tpL1dhXugPTnkaGIvnKwAttaSuMCsk9O7pZJ0yqa1NGq4xCkFP3wVM3SImVTyfBapew ocuG9nTvjKRHHwG45ye9aenHsTjOXryksD01z3IxLjnK0k4oElN4DhlwLihEEQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 04/41] net: phy: teranetics: Staticize PHY driver entries Date: Sun, 19 Mar 2023 18:02:40 +0100 Message-Id: <20230319170317.27711-4-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 0a95e7ef5e250443dcd X-MBO-RS-META: eug7qbtezbwakn6u46hy99wc7fgwech9 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean These struct phy_driver ... instances are local to this source code file, staticize them. No functional change. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/teranetics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c index 60049c2074f..c402bad88c6 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -90,7 +90,7 @@ int tn2020_startup(struct phy_device *phydev) return 0; } -struct phy_driver tn2020_driver = { +static struct phy_driver tn2020_driver = { .name = "Teranetics TN2020", .uid = PHY_UID_TN2020, .mask = 0xfffffff0, From patchwork Sun Mar 19 17:02:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758703 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=Nl2jMM+I; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=fLl9Dogk; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfklM1pLZz1yWs for ; Mon, 20 Mar 2023 04:05:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A7C285B6E; Sun, 19 Mar 2023 18:05:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="Nl2jMM+I"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="fLl9Dogk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D31685B0C; Sun, 19 Mar 2023 18:04:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [IPv6:2001:67c:2050:0:465::103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DFC5385AB1 for ; Sun, 19 Mar 2023 18:04:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Pfkjq55lmz9sTV; Sun, 19 Mar 2023 18:04:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7PEHBOKAzcrpbT2GCl735MpxDiuf+z8uRNozu01lfA0=; b=Nl2jMM+IoWPMoN07ZosqcXy6FJFU7slvQZGEMatnAC7yfA7L7c4loXgNb1qPmVEwOhmoLG P+rukJ+/lgPfijyPTrfIgSy/M/vp7t6maWiMzTJUsCFxoeG5vplHI35OKjJ/vM4Izh7VjG 4TJCKutB7E7pLnxcqapmfCgTjWc1vNwbIqlxVdtU3+R/o/r1U3CtoGUXBb/WRPFBzgifq6 0vgbvQ07ZHWlbUhRCYapsgP6fxLMPxbCaPMfAKkhQviURK3w9uYvaKR5il/eczZq/q1H9a nclGBQ+6QJrOcQtpJSyabkvmLyKXMO9e4usSDOgbcgF28JIpVCDE6wqcI62E6w== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7PEHBOKAzcrpbT2GCl735MpxDiuf+z8uRNozu01lfA0=; b=fLl9Dogk+FPsntbYqMRZbzR3eFfvZYZT+QK270NkANawyiX8Ve4RAzp4nOK8QNM+R4GXzh JMGsX9K/Bw11tMsildtkcY8/NGXiFg9/bW4STxaavtOGE9aiQZZVu8bBZcjbyk+8ijVtw3 zUcCG5jv9tmxA373PPrIhm/wYu3pWd5dluiWGs6rW6dlt4Ed2/MaUKzux2mIDTyuZ8bf2E RhmTZYa55LRYFvp7LULlBxgGU4cBOVtk34pwhvQRMStTxREEJW+qaYuKJxpl41Mi8Zhr98 TYhoPmJxbMw5HIxsBO5E6WJZYy3NfIUHtwa01jC871WV86vQP4CBcAovu8M99w== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 05/41] net: phy: Factor manual relocation into separate function Date: Sun, 19 Mar 2023 18:02:41 +0100 Message-Id: <20230319170317.27711-5-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: yd691w9qmxs8epx6onwzkfkzjgity6z3 X-MBO-RS-ID: f3b9b718aa8301a0b0a X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Create separate function to implement manual relocation of PHY driver functions and make use of that function. This is a preparatory patch for introduction of PHY driver definition using linker lists. No functional change. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 80230b907c1..5097c32b829 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -470,6 +470,28 @@ static int genphy_init(void) static LIST_HEAD(phy_drivers); +#ifdef CONFIG_NEEDS_MANUAL_RELOC +static void phy_drv_reloc(struct phy_driver *drv) +{ + if (drv->probe) + drv->probe += gd->reloc_off; + if (drv->config) + drv->config += gd->reloc_off; + if (drv->startup) + drv->startup += gd->reloc_off; + if (drv->shutdown) + drv->shutdown += gd->reloc_off; + if (drv->readext) + drv->readext += gd->reloc_off; + if (drv->writeext) + drv->writeext += gd->reloc_off; + if (drv->read_mmd) + drv->read_mmd += gd->reloc_off; + if (drv->write_mmd) + drv->write_mmd += gd->reloc_off; +} +#endif + int phy_init(void) { #ifdef CONFIG_NEEDS_MANUAL_RELOC @@ -582,22 +604,7 @@ int phy_register(struct phy_driver *drv) list_add_tail(&drv->list, &phy_drivers); #ifdef CONFIG_NEEDS_MANUAL_RELOC - if (drv->probe) - drv->probe += gd->reloc_off; - if (drv->config) - drv->config += gd->reloc_off; - if (drv->startup) - drv->startup += gd->reloc_off; - if (drv->shutdown) - drv->shutdown += gd->reloc_off; - if (drv->readext) - drv->readext += gd->reloc_off; - if (drv->writeext) - drv->writeext += gd->reloc_off; - if (drv->read_mmd) - drv->read_mmd += gd->reloc_off; - if (drv->write_mmd) - drv->write_mmd += gd->reloc_off; + phy_drv_reloc(drv); #endif return 0; } From patchwork Sun Mar 19 17:02:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758702 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=naoa9NzR; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=HnjfMOTj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkkz3Cnqz1yWs for ; Mon, 20 Mar 2023 04:05:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C34CC858ED; Sun, 19 Mar 2023 18:04:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="naoa9NzR"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="HnjfMOTj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 677FC85ABB; Sun, 19 Mar 2023 18:04:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D7DD1858FF for ; Sun, 19 Mar 2023 18:04:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Pfkjt3NLTz9sbw; Sun, 19 Mar 2023 18:04:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ulnwCWu8dDCieVkPx0QiaRFitV2IxticRnu1CvUvDBE=; b=naoa9NzRDlfYJnoRy42s2dU8dOsIjzM2nEaJXwlwXgMilb79ypyGHtiMD1A1Nkgn+jkkxe nvTgxTZIONQAesq3PoJ7QfufnWn74pHs8y015XHv996PHD6J6cnOLkrL7L+Pzyc4uHogM8 +1Rl0xG8sS6QLevsAw9tKKQQRHDC9Vn9hOER1Jr++Zuey+HG75SBg/yjfj1rn2YJDgTFZb 5CFq4GzPLaI9ZxpUg30kWjyT47ue9AbAoD0TgCHI+3oEylrO6VPA3fXVUwDaxRKGaQ92HN m3XVjKwH0BfacpwhRf5PioUZeXQDd5A24oAUT7OrG+758U9ZSy8fb1jn/7JawA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ulnwCWu8dDCieVkPx0QiaRFitV2IxticRnu1CvUvDBE=; b=HnjfMOTjCeWMGbo4tXtXGuSr7WOEcX16VJ/cVe5MhZFNXA/rm9+oa9nFugakP7TLkc3n4z VAaLD4NjOjJDyzHmxWju6SEEAg6Gng+1CODugGqctKIt25wzqlDXqBpNvxqgo5r+W63074 wYZUzyfYg3V5PmVP1jPoHyTG1mya0luHXBwKq7jSZOvPop+Mh6K8Xyu/2TVYbjltAkF4L2 XzpX2LV6sIFKhziP87MVReSA05T28l6Ua+CZ/4+m6NMBAOWniP1WjRa1mAEdolC66ESyze 9VcsMZZIkVjzuCrdSF8k0xMDoEMcBjl3Ov4jE3/D4UlH4Dig4y/Ba/iXmJk+oQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 06/41] net: phy: Iterate over both registered PHYs and struct phy_driver linker list Date: Sun, 19 Mar 2023 18:02:42 +0100 Message-Id: <20230319170317.27711-6-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: d6c634fb2bb49ba60f1 X-MBO-RS-META: rpwnfgtd9g16toocnjadx8hg9u7ogbbi X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Introduce U_BOOT_PHY_DRIVER() macro which is used to add struct phy_driver into a new linker list section containing all compiled in struct phy_driver drivers. This is so far empty until PHY drivers are converted over to this macro. Iterate over both drivers registered using soon to be legacy phy_register() as well as drivers in the new linker list when looking up a suitable PHY driver. This way, PHY drivers can be converted over to the new macro one driver at a time. The relocation of callbacks for linker list based drivers now happens in phy_init() call as the drivers are available at that point in time, and phy_register() is not called for those drivers. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 15 +++++++++++++++ include/phy.h | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 5097c32b829..50bfabbb765 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -495,6 +495,9 @@ static void phy_drv_reloc(struct phy_driver *drv) int phy_init(void) { #ifdef CONFIG_NEEDS_MANUAL_RELOC + const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver); + struct phy_driver *drv, *ll_entry; + /* * The pointers inside phy_drivers also needs to be updated incase of * manual reloc, without which these points to some invalid @@ -504,6 +507,11 @@ int phy_init(void) head->next = (void *)head->next + gd->reloc_off; head->prev = (void *)head->prev + gd->reloc_off; + + /* Perform manual relocation on linker list based PHY drivers */ + ll_entry = ll_entry_start(struct phy_driver, phy_driver); + for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) + phy_drv_reloc(drv); #endif #ifdef CONFIG_B53_SWITCH @@ -660,6 +668,8 @@ static struct phy_driver *generic_for_phy(struct phy_device *phydev) static struct phy_driver *get_phy_driver(struct phy_device *phydev) { + const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver); + struct phy_driver *ll_entry; struct list_head *entry; int phy_id = phydev->phy_id; struct phy_driver *drv = NULL; @@ -670,6 +680,11 @@ static struct phy_driver *get_phy_driver(struct phy_device *phydev) return drv; } + ll_entry = ll_entry_start(struct phy_driver, phy_driver); + for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) + if ((drv->uid & drv->mask) == (phy_id & drv->mask)) + return drv; + /* If we made it here, there's no driver for this PHY */ return generic_for_phy(phydev); } diff --git a/include/phy.h b/include/phy.h index 87aa86c2e78..1eccfacec68 100644 --- a/include/phy.h +++ b/include/phy.h @@ -345,6 +345,13 @@ int phy_fixed_init(void); int phy_ncsi_init(void); int phy_xilinx_gmii2rgmii_init(void); +/** + * U_BOOT_PHY_DRIVER() - Declare a new U-Boot driver + * @__name: name of the driver + */ +#define U_BOOT_PHY_DRIVER(__name) \ + ll_entry_declare(struct phy_driver, __name, phy_driver) + int board_phy_config(struct phy_device *phydev); int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id); From patchwork Sun Mar 19 17:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758701 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=VWpfUqGY; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=xjDvHKfq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkkg3y5Dz246f for ; Mon, 20 Mar 2023 04:04:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2B85885BAC; Sun, 19 Mar 2023 18:04:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="VWpfUqGY"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="xjDvHKfq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9F8D84EC7; Sun, 19 Mar 2023 18:04:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9CF8185B0C for ; Sun, 19 Mar 2023 18:04:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Pfkjx0zQjz9sdQ; Sun, 19 Mar 2023 18:04:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rKZ4z8w0M3CFeezqiDNtGYKv5JQPNk+kXwn75uIVbYs=; b=VWpfUqGYK55mSViY1TAgmkOL1p7gBLUDUXiznxtT1Ho1N+ETWb6Us1h4I6g1LtD2s/5U2J rIOAORtdpC/J5KVAz8+ygpIBxodJZcPy/qr6hEfAEHgEyAd4LKBvYQ+kRMFif07YE4lVSW cGlbqiyTHUQASsFQNqGelGIr/bphy7HlI/hfO1y3KOg+RMd7eQnOeMlvYLhbXGIQXzXvNg fkAB5uhLbf3mW70mXX91KEk+ULwFWamsuskVGERwZrwiSFjWFS6OE8luvc+rUHS9GzlAD1 7wFLOOV4tne7DUlzpGbrG/qe0GiN1WafoWQC7aXJdt0iLyk/KrlhX/0N6h+TFw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rKZ4z8w0M3CFeezqiDNtGYKv5JQPNk+kXwn75uIVbYs=; b=xjDvHKfq4xWOisQQQymbm/dfqUQe+WoJFERNiAGNemIluIH/WsN54cgtVCBfeK3hK9VJQU dUChVZcx9TSll8GwpeT2eyQnuse+HVfdBHDQ4tvND8HVJbFhzHrhqGz3xDUonUlWXkHRFp LkSLVWtoaRSWuqLYGqzt1RQUHaXU8k47pqga3DYybA1xv5GaDSiEg0bMnVL4fBxsSkAtwW 3QjPEiGmqMD2JL5n3kZQ45DpCJgCA34d9HQnzPlSKJi94on75rHljUNgR7WRqpkjzZsyd2 bNkurRygp3YaycUZHrqypldGwQTVq3eWSEOCUsalWMsR35s4qxRoeyD1kFBKRg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 07/41] net: phy: adin: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:43 +0100 Message-Id: <20230319170317.27711-7-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 8b7945d80c0fddd153f X-MBO-RS-META: ag745b5hy77z3p4odj8bf8qkqt36cghf X-Rspamd-Queue-Id: 4Pfkjx0zQjz9sdQ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/adin.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index a5bfd960d9c..fb9f1e4c70d 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -252,7 +252,7 @@ static int adin1300_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver ADIN1300_driver = { +U_BOOT_PHY_DRIVER(ADIN1300) = { .name = "ADIN1300", .uid = PHY_ID_ADIN1300, .mask = 0xffffffff, @@ -261,10 +261,3 @@ static struct phy_driver ADIN1300_driver = { .startup = genphy_startup, .shutdown = genphy_shutdown, }; - -int phy_adin_init(void) -{ - phy_register(&ADIN1300_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 50bfabbb765..ecb4b72ed10 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -520,9 +520,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_ADIN - phy_adin_init(); -#endif #ifdef CONFIG_PHY_AQUANTIA phy_aquantia_init(); #endif diff --git a/include/phy.h b/include/phy.h index 1eccfacec68..dbc0da7e084 100644 --- a/include/phy.h +++ b/include/phy.h @@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev); int phy_b53_init(void); int phy_mv88e61xx_init(void); -int phy_adin_init(void); int phy_aquantia_init(void); int phy_atheros_init(void); int phy_broadcom_init(void); From patchwork Sun Mar 19 17:02:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758704 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=ixLWfNq6; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=in4MwosS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfklc30M5z1yWs for ; Mon, 20 Mar 2023 04:05:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8BCC585AA2; Sun, 19 Mar 2023 18:05:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="ixLWfNq6"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="in4MwosS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9C8B859FF; Sun, 19 Mar 2023 18:04:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3818B85B1E for ; Sun, 19 Mar 2023 18:04:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkjz75RMz9sT2; Sun, 19 Mar 2023 18:04:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mBkryMdHGNFQ6VmhR8M4BS263iHU/gpC4MFGpMkxyLs=; b=ixLWfNq6OlA+KlpQ/2SnPUmoL9DuiqGP6OhKXvF78r3nNIraSQozcsnyDyHU67gdCiZD27 SJcYSBF/hCSYJuJVCLmzfY+zVbLg8JQRilRpEnjQlVqZuO07dpQmgFDHHz3y888STHKmun f4ODJdItxiNKxvWZjnx6tMPXKwdD0sZsh63lhpfYM4fqp+O8ehHSgtMUV1Tt6fKgv1QCEl 4B0VVEGH7BC5R3DyfiuGqAw/8vZnuKXdg7f7rY16cTp4i+GTqXgE+2uYcd74mShzOwjy6L 45ENBnBXB1c8sJCWKKdAwtalGDafSh4FFiqiHBtOpT/mBHomUoPHt8kkP2dYjg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mBkryMdHGNFQ6VmhR8M4BS263iHU/gpC4MFGpMkxyLs=; b=in4MwosSV2DiqYKD0KweNN9Dip87ick1jGD7EtDTTYUH4htflnIBUJYch/nHCRwrDhqGGs XTCfutboJlWTIdqSNhYeSIqAUDIUlh4TmRsANbd8oKkt/XXaWHSSH58AVeXYua7nC03IKs GgQN42vuE8r+EVQz0OZPF8wfAIA4hv1/NV67WtqPRgoexDX+lhwkLwFsws+WtPWq/ZfgHE CS5m4fELGo162U0ndhi9xkLaO+Y5sSkrIj1Fdpxgly985szmRSPePrTbwaUI7uXubptKSG 3iwsu8HQWmNWwYiZ9K5gMFfJohHhvX/ZwKB5PPZxPIvh4feOZTnkIvGWKj4t1g== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 08/41] net: phy: aquantia: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:44 +0100 Message-Id: <20230319170317.27711-8-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: gbdpsw4yjysp3nhui5dg4fphfut8438w X-MBO-RS-ID: 3007b9c6e4e13cbb9b3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/aquantia.c | 33 +++++++++------------------------ drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index fa887ade0c2..a958e88d44f 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -598,7 +598,7 @@ int aquantia_startup(struct phy_device *phydev) return 0; } -static struct phy_driver aq1202_driver = { +U_BOOT_PHY_DRIVER(aq1202) = { .name = "Aquantia AQ1202", .uid = 0x3a1b445, .mask = 0xfffffff0, @@ -611,7 +611,7 @@ static struct phy_driver aq1202_driver = { .shutdown = &gen10g_shutdown, }; -static struct phy_driver aq2104_driver = { +U_BOOT_PHY_DRIVER(aq2104) = { .name = "Aquantia AQ2104", .uid = 0x3a1b460, .mask = 0xfffffff0, @@ -624,7 +624,7 @@ static struct phy_driver aq2104_driver = { .shutdown = &gen10g_shutdown, }; -static struct phy_driver aqr105_driver = { +U_BOOT_PHY_DRIVER(aqr105) = { .name = "Aquantia AQR105", .uid = 0x3a1b4a2, .mask = 0xfffffff0, @@ -638,7 +638,7 @@ static struct phy_driver aqr105_driver = { .data = AQUANTIA_GEN1, }; -static struct phy_driver aqr106_driver = { +U_BOOT_PHY_DRIVER(aqr106) = { .name = "Aquantia AQR106", .uid = 0x3a1b4d0, .mask = 0xfffffff0, @@ -651,7 +651,7 @@ static struct phy_driver aqr106_driver = { .shutdown = &gen10g_shutdown, }; -static struct phy_driver aqr107_driver = { +U_BOOT_PHY_DRIVER(aqr107) = { .name = "Aquantia AQR107", .uid = 0x3a1b4e0, .mask = 0xfffffff0, @@ -665,7 +665,7 @@ static struct phy_driver aqr107_driver = { .data = AQUANTIA_GEN2, }; -static struct phy_driver aqr112_driver = { +U_BOOT_PHY_DRIVER(aqr112) = { .name = "Aquantia AQR112", .uid = 0x3a1b660, .mask = 0xfffffff0, @@ -679,7 +679,7 @@ static struct phy_driver aqr112_driver = { .data = AQUANTIA_GEN3, }; -static struct phy_driver aqr113c_driver = { +U_BOOT_PHY_DRIVER(aqr113c) = { .name = "Aquantia AQR113C", .uid = 0x31c31c12, .mask = 0xfffffff0, @@ -693,7 +693,7 @@ static struct phy_driver aqr113c_driver = { .data = AQUANTIA_GEN3, }; -static struct phy_driver aqr405_driver = { +U_BOOT_PHY_DRIVER(aqr405) = { .name = "Aquantia AQR405", .uid = 0x3a1b4b2, .mask = 0xfffffff0, @@ -707,7 +707,7 @@ static struct phy_driver aqr405_driver = { .data = AQUANTIA_GEN1, }; -static struct phy_driver aqr412_driver = { +U_BOOT_PHY_DRIVER(aqr412) = { .name = "Aquantia AQR412", .uid = 0x3a1b710, .mask = 0xfffffff0, @@ -720,18 +720,3 @@ static struct phy_driver aqr412_driver = { .shutdown = &gen10g_shutdown, .data = AQUANTIA_GEN3, }; - -int phy_aquantia_init(void) -{ - phy_register(&aq1202_driver); - phy_register(&aq2104_driver); - phy_register(&aqr105_driver); - phy_register(&aqr106_driver); - phy_register(&aqr107_driver); - phy_register(&aqr112_driver); - phy_register(&aqr113c_driver); - phy_register(&aqr405_driver); - phy_register(&aqr412_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ecb4b72ed10..4f17f98876e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -520,9 +520,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_AQUANTIA - phy_aquantia_init(); -#endif #ifdef CONFIG_PHY_ATHEROS phy_atheros_init(); #endif diff --git a/include/phy.h b/include/phy.h index dbc0da7e084..a0060cd19ea 100644 --- a/include/phy.h +++ b/include/phy.h @@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev); int phy_b53_init(void); int phy_mv88e61xx_init(void); -int phy_aquantia_init(void); int phy_atheros_init(void); int phy_broadcom_init(void); int phy_cortina_init(void); From patchwork Sun Mar 19 17:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758705 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=veTzP7gf; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=wovZM3SF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkls1G0Yz1yWs for ; Mon, 20 Mar 2023 04:06:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 766DC85CB1; Sun, 19 Mar 2023 18:05:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="veTzP7gf"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="wovZM3SF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB58484EC7; Sun, 19 Mar 2023 18:04:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D182585B31 for ; Sun, 19 Mar 2023 18:04:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkk24c44z9sbP; Sun, 19 Mar 2023 18:04:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=64b8q/fcJlUlBRDn6Ull1+Py589VdYNDKEU91EOsWeA=; b=veTzP7gfQMgXQDwiNaR4srJ74qUxq389kqVN0cH8UqXgYuuvnhOpaXPTSJx2m2Ol1U/SbX ocKEL9vpEsSuiGZGwA0hR5I6a1JZ53NJbMtp+lrO+P0tfhD8kXLIAn1fLkgAdEG0B/AMzo nNaZHtOLHq2bnR2E48/VNb1spl63Vczln+k9t+bNNQfiJLYRte823Rd+fpDyQUqiRImSik L239T2cJFssNSU7RXe4W3E9YTsYUvSyT5Ton5OJg+CQBK7KasOA8wiyzcXVqpOV+qeVyY7 jd/B7Ccu+ajwDHs4tPPljDv1NfYKL2XUgmWersQ3tXx/YRjo6LKSd2+2vrum3Q== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=64b8q/fcJlUlBRDn6Ull1+Py589VdYNDKEU91EOsWeA=; b=wovZM3SFI2CaVy4kKsUH0SKBjVlUAjqRCj3WFY4cAhPqqWqvBu5JQx4rPV+Gf8LeqPq1Zr COK+NWEZanYBYpk4RU2s0qbOxE0Olh2OvCoaMQTOPT0cJeyoN1Wu4YkeNzQ7Th0CgVbKJ9 f0wFNkzQSIyK+XmxNwET4COqx/gNELGlIg/9ni+5DMSiqZ7ZZidbOSSJZKDEql+wc9R07O EfX8KzmJnCSoTJHk0rjl0G0YdHNd0Gty2oBYiD4WWLjlQ8bfRr1P/VELFnT6sSmU1ls+3v zPmP9q4gG4TbV1qZjEYWf+B2JH1YK0R47nwPbeCoUwYxdNDtwaL3H4VjjGXGrg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 09/41] net: phy: atheros: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:45 +0100 Message-Id: <20230319170317.27711-9-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 27fe06fc59a04fcc981 X-MBO-RS-META: tu4pi7hubn1qtzxzm9zm4rpgkcnxzswi X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/atheros.c | 15 +++------------ drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index c6f9f916459..abb7bdf537c 100644 --- a/drivers/net/phy/atheros.c +++ b/drivers/net/phy/atheros.c @@ -333,7 +333,7 @@ static int ar803x_config(struct phy_device *phydev) return 0; } -static struct phy_driver AR8021_driver = { +U_BOOT_PHY_DRIVER(AR8021) = { .name = "AR8021", .uid = AR8021_PHY_ID, .mask = 0xfffffff0, @@ -343,7 +343,7 @@ static struct phy_driver AR8021_driver = { .shutdown = genphy_shutdown, }; -static struct phy_driver AR8031_driver = { +U_BOOT_PHY_DRIVER(AR8031) = { .name = "AR8031/AR8033", .uid = AR8031_PHY_ID, .mask = 0xffffffef, @@ -353,7 +353,7 @@ static struct phy_driver AR8031_driver = { .shutdown = genphy_shutdown, }; -static struct phy_driver AR8035_driver = { +U_BOOT_PHY_DRIVER(AR8035) = { .name = "AR8035", .uid = AR8035_PHY_ID, .mask = 0xffffffef, @@ -362,12 +362,3 @@ static struct phy_driver AR8035_driver = { .startup = genphy_startup, .shutdown = genphy_shutdown, }; - -int phy_atheros_init(void) -{ - phy_register(&AR8021_driver); - phy_register(&AR8031_driver); - phy_register(&AR8035_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 4f17f98876e..853302cf974 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -520,9 +520,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_ATHEROS - phy_atheros_init(); -#endif #ifdef CONFIG_PHY_BROADCOM phy_broadcom_init(); #endif diff --git a/include/phy.h b/include/phy.h index a0060cd19ea..a1be1fbe1a1 100644 --- a/include/phy.h +++ b/include/phy.h @@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev); int phy_b53_init(void); int phy_mv88e61xx_init(void); -int phy_atheros_init(void); int phy_broadcom_init(void); int phy_cortina_init(void); int phy_cortina_access_init(void); From patchwork Sun Mar 19 17:02:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758706 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=jdbSS+QZ; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=gSHItQ4q; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkm75HjKz1yWs for ; Mon, 20 Mar 2023 04:06:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DA3385CE9; Sun, 19 Mar 2023 18:05:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="jdbSS+QZ"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="gSHItQ4q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 102A28568E; Sun, 19 Mar 2023 18:05:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 751308568E for ; Sun, 19 Mar 2023 18:04:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Pfkk51fkMz9sjR; Sun, 19 Mar 2023 18:04:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RQ+/j+mBowqySqXCPSivz4YM9rHkOsR7tkWdFsT5koA=; b=jdbSS+QZWJU+yb9Hgg1/X7PhdPv9RAMZIB9WufWcJ0nNBQJZQq+gPZ5BJgCEdDwrdksU+W LGJL4ek3Uij3A9v7Mqk3P2SBVmLl1pHJfVcJOH5/9C5H3OtidhSTXloEqBWzea2lBFYuXq 4yb+//xW7lzKriR9T7nt/MpOx5OEQi1sRcZC2tkLnveCRC+wjvyKGJfbfzcJ0U+5xR3rXL QL5NkSa3k+a94U61e2ykmBvsihfwOG69g84R65HNWPVnwtlMNphtnRPKxiZfipqIR7UEX5 lvGB07iLUFBDZs2J8+SQri51CcJTlu1zl2I+R/IfMUbbB4QPrzSn1Ovc6ZsI1Q== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RQ+/j+mBowqySqXCPSivz4YM9rHkOsR7tkWdFsT5koA=; b=gSHItQ4qZQnBEQhbKhBUQNwFwyaD+3+iMpFPdht7EgtzQD+I7bS0GvuMXUjHLdLWdAIvuw OxuUEGndFTXmHm+O+xinCYgFFT6MhEBkdAKETiMImCWDACgXiT7m7nwnKWj57BBp6EWEGI JyrsfWFuRUmbPBHk9P6BbkGdIeexvWg9ZK+ZPMrdcpr29ArGX6tUJn/e52sTTWtQC6e7pK gF+iF6ICOV6M9xzTBn/3/USC9tvJ0zAp8D5pEyRXXqAVHFJ6FOAV66of7vwkyggRlyKGBJ fzSrjkGi5P45fSBalL0TeJz52lexL31NeCU2cGCCmrDHDf0q8RPu2belpVnVbA== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 10/41] net: phy: b53: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:46 +0100 Message-Id: <20230319170317.27711-10-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 74fqwh75gn7qgtwajjxh3rjbcf5bi4rj X-MBO-RS-ID: 3df23c214b4aee14526 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/b53.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c index c706e2b9bde..26e8e2fe64f 100644 --- a/drivers/net/phy/b53.c +++ b/drivers/net/phy/b53.c @@ -612,7 +612,7 @@ static int b53_phy_startup(struct phy_device *phydev) return 0; } -static struct phy_driver b53_driver = { +U_BOOT_PHY_DRIVER(b53) = { .name = "Broadcom BCM53125", .uid = 0x03625c00, .mask = 0xfffffc00, @@ -623,13 +623,6 @@ static struct phy_driver b53_driver = { .shutdown = &genphy_shutdown, }; -int phy_b53_init(void) -{ - phy_register(&b53_driver); - - return 0; -} - int do_b53_reg_read(const char *name, int argc, char *const argv[]) { u8 page, offset, width; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 853302cf974..7a7762377b6 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_B53_SWITCH - phy_b53_init(); -#endif #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif diff --git a/include/phy.h b/include/phy.h index a1be1fbe1a1..88c9013f1f8 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_b53_init(void); int phy_mv88e61xx_init(void); int phy_broadcom_init(void); int phy_cortina_init(void); From patchwork Sun Mar 19 17:02:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758707 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=xLHklSS1; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=mEzWvphQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkmL2q5Cz1yWs for ; Mon, 20 Mar 2023 04:06:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7CE9585D19; Sun, 19 Mar 2023 18:05:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="xLHklSS1"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="mEzWvphQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9E3ED85C86; Sun, 19 Mar 2023 18:05:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4AFA385AA2 for ; Sun, 19 Mar 2023 18:04:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkk76ry1z9sbw; Sun, 19 Mar 2023 18:04:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F/g6fytIaAiqx06zSk5hva4z1hyDtxLednGctuVUSbs=; b=xLHklSS1QWe9kghuc3GY04IJqGCVvV1T7mKuBnNavWRNe11Pc2s3hO3wp0UhufDNvjGIt2 p00HlHZJ9pqd4VWwumHAzbf7zgSP75yuzzmq+DtOtVYqEGb0SgjFkOSTSb+VYEyPRbP2dQ 8hR7AA/ZHTgyUM6i0g5mLMbuItawjWOwNfRW6tcYDhlmK5EqlTy8l52W+gDeMAaMVKuzW1 vomzXGhkDYzJ0w2z9/g1UUnMs2uG6565EQjIoTzBhglEG8/sub3278VkICB5Z5hoLz3zq6 fzHTTwQffN7mO2O3OyVyoV+Xk+ReDuJxoQore2l7v4xr113aeEByPOUgtOhtfw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F/g6fytIaAiqx06zSk5hva4z1hyDtxLednGctuVUSbs=; b=mEzWvphQl3xwy+PJA82FwvPLvb2lj/cABoL/8nH7HJAnQLavWP+CYqhnjALV6RUN2vHmNU L0WhdmFFh+BeDqBUrrmAwgtIi62Q8y5o+IYkd2RFCJwkARs+lwyOV3ZKCtM4El3jGlimej lsInjQSEQxPv9jXVXjd0BJnBN9051BSUg6EOIYNXvOKNMENIwA5udGvuLkgbKik4+FWDPX zLVeyPkD4U7bbMWTxqzm8sx97jr/4T2/HhPKFBlygcR1qe9efgUq7NgQ5CcazB0EBdKORI OpL2LGt7SfPDhhS36UWj6QOgVgDyVRUZEjHR38h0jFXJ9wjycNUIxYrk6pCvbg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 11/41] net: phy: broadcom: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:47 +0100 Message-Id: <20230319170317.27711-11-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 0473ca41015e3f14b1b X-MBO-RS-META: uo3z1xd7g9aau959npn9j9snuus67h3y X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/broadcom.c | 18 ++++-------------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 566fcb8de73..ea98cfcc1b5 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -323,7 +323,7 @@ static int bcm5482_startup(struct phy_device *phydev) return bcm54xx_parse_status(phydev); } -static struct phy_driver BCM5461S_driver = { +U_BOOT_PHY_DRIVER(bcm5461s) = { .name = "Broadcom BCM5461S", .uid = 0x2060c0, .mask = 0xfffff0, @@ -333,7 +333,7 @@ static struct phy_driver BCM5461S_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver BCM5464S_driver = { +U_BOOT_PHY_DRIVER(bcm5464s) = { .name = "Broadcom BCM5464S", .uid = 0x2060b0, .mask = 0xfffff0, @@ -343,7 +343,7 @@ static struct phy_driver BCM5464S_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver BCM5482S_driver = { +U_BOOT_PHY_DRIVER(bcm5482s) = { .name = "Broadcom BCM5482S", .uid = 0x143bcb0, .mask = 0xffffff0, @@ -353,7 +353,7 @@ static struct phy_driver BCM5482S_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver BCM_CYGNUS_driver = { +U_BOOT_PHY_DRIVER(bcm_cygnus) = { .name = "Broadcom CYGNUS GPHY", .uid = 0xae025200, .mask = 0xfffff0, @@ -362,13 +362,3 @@ static struct phy_driver BCM_CYGNUS_driver = { .startup = &bcm_cygnus_startup, .shutdown = &genphy_shutdown, }; - -int phy_broadcom_init(void) -{ - phy_register(&BCM5482S_driver); - phy_register(&BCM5464S_driver); - phy_register(&BCM5461S_driver); - phy_register(&BCM_CYGNUS_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 7a7762377b6..4b1fed1ff6f 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -517,9 +517,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_BROADCOM - phy_broadcom_init(); -#endif #ifdef CONFIG_PHY_CORTINA phy_cortina_init(); #endif diff --git a/include/phy.h b/include/phy.h index 88c9013f1f8..cecfbe6968f 100644 --- a/include/phy.h +++ b/include/phy.h @@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); int phy_mv88e61xx_init(void); -int phy_broadcom_init(void); int phy_cortina_init(void); int phy_cortina_access_init(void); int phy_davicom_init(void); From patchwork Sun Mar 19 17:02:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758708 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=AwqKiXFg; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=eXMgG5QL; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkmb1l1rz1yWs for ; Mon, 20 Mar 2023 04:06:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D567D85D23; Sun, 19 Mar 2023 18:06:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="AwqKiXFg"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="eXMgG5QL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6238785B66; Sun, 19 Mar 2023 18:05:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E664585B6E for ; Sun, 19 Mar 2023 18:04:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4PfkkB4W8mz9sc0; Sun, 19 Mar 2023 18:04:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3dsCrBqWbtMbthUNGbLjq013Sdx5XjIlrpTS0AbRoVQ=; b=AwqKiXFg5LCnSAJNviNjSLu+/35A1cHIfX8d/bzasC7W4cLEkhISY2guwec4c5D01wOwDl 9UVlOoR3fpGfld4UuT6iYHa+Ksxs7SZvu4CZe7AiiS7CpqZo/UAoH+AJMTONe90TRxTey/ UyksQOjUy//w1WZQTqp/qwPs7P+zocJ7HcAc+rwSw0yrxdgrW9tQeizCRAqHEAPe1dcOXV Y3sRWKkXlXqE2luKdmbQWOtIoRqduA5Ujmgs9BNzIzFif9HPUtRJCIKM9ozCCRvrONAg5R DlZe4vEzRKrof/Uh7vcz4o8RGlU1wzdDxBDUOi28iBALoTQimUyaY82R+/YbGQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3dsCrBqWbtMbthUNGbLjq013Sdx5XjIlrpTS0AbRoVQ=; b=eXMgG5QLbufy7J0Sa0RPwMXKYEre280gx/Q/YYsQ5innUvKlja1l/ejfvjSLU7r3XX2EJk vvKhWjEwa9dXiV+S8IRP1InzsgtaD8CW/FTJQY+c9OqCtx5LCHQNKwLwq+eAlC3pQpQVsL Qw31/CAdON/1eGjxGiY4wcnd6eIo/dQ87Y4WwEVDKPts/OjKD7L96oYkXSGse1vAEv5YDe D5R9ch1vuZwWfCM6twwwfiKaW5gtLySYIG404xyisjio0Hk+huWPU4bdMAVwQJEEBdhf3U CV8wgqWG3l36Xo/SoObES9K5qfS9hopjmfhA6SnuxmSseDE3SOOaut8PlFSekA== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 12/41] net: phy: ca_phy: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:48 +0100 Message-Id: <20230319170317.27711-12-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 4fbf997b4cf9c607b9a X-MBO-RS-META: 4z4gp8sreiwjzqa199drexshicnoria9 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/ca_phy.c | 11 ++--------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/net/phy/ca_phy.c b/drivers/net/phy/ca_phy.c index 9180a41111c..edef21867b0 100644 --- a/drivers/net/phy/ca_phy.c +++ b/drivers/net/phy/ca_phy.c @@ -104,7 +104,7 @@ static int rtl8211_probe(struct phy_device *phydev) } /* Support for RTL8211 External PHY */ -static struct phy_driver rtl8211_external_driver = { +U_BOOT_PHY_DRIVER(rtl8211_external) = { .name = "Cortina RTL8211 External", .uid = PHY_ID_RTL8211_EXT, .mask = PHY_ID_MASK, @@ -115,7 +115,7 @@ static struct phy_driver rtl8211_external_driver = { }; /* Support for RTL8211 Internal PHY */ -static struct phy_driver rtl8211_internal_driver = { +U_BOOT_PHY_DRIVER(rtl8211_internal) = { .name = "Cortina RTL8211 Inrernal", .uid = PHY_ID_RTL8211_INT, .mask = PHY_ID_MASK, @@ -124,10 +124,3 @@ static struct phy_driver rtl8211_internal_driver = { .probe = &rtl8211_probe, .startup = &genphy_startup, }; - -int phy_cortina_access_init(void) -{ - phy_register(&rtl8211_external_driver); - phy_register(&rtl8211_internal_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 4b1fed1ff6f..4446902ab63 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -520,9 +520,6 @@ int phy_init(void) #ifdef CONFIG_PHY_CORTINA phy_cortina_init(); #endif -#ifdef CONFIG_PHY_CORTINA_ACCESS - phy_cortina_access_init(); -#endif #ifdef CONFIG_PHY_DAVICOM phy_davicom_init(); #endif diff --git a/include/phy.h b/include/phy.h index cecfbe6968f..50a53982810 100644 --- a/include/phy.h +++ b/include/phy.h @@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev); int phy_mv88e61xx_init(void); int phy_cortina_init(void); -int phy_cortina_access_init(void); int phy_davicom_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); From patchwork Sun Mar 19 17:02:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758717 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=FDjkrQ7b; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=MQ8g23NA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkqq6fyrz1yWs for ; Mon, 20 Mar 2023 04:09:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 50FBB85B59; Sun, 19 Mar 2023 18:08:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="FDjkrQ7b"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="MQ8g23NA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7989D85B1B; Sun, 19 Mar 2023 18:05:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9AADB8594F for ; Sun, 19 Mar 2023 18:04:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PfkkF2gY1z9sc9; Sun, 19 Mar 2023 18:04:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U8qmhM1Mqbd5uo56l0UeXUrwCEcEZCLDHE0ApoO03cM=; b=FDjkrQ7bcpZrdma/kMGuiOAHzeYa07HOxQQUUpmsh3hNsXCdLfm/3VI5zPyk+a66fPWK8f +vtNYX+S9T2gtbWYzO+qpa3qELMQDzeLM8aRrONEgF5fD32gMC3ojrRcSsk/6pZdFGuZ3o 1K2RrqoiXEnslPW7SZE7kuetwe4QvqbFIzfs+9KE21lsrpVQcE8FGgU5pYsLm04F4+nYcC N4dRgchWeNXWxJQKLzvuHYMwkAOCHObL3hSNFnElKl1AU0e1LiNAyDfD9rvQLYmmKgq3on od9tSfsTyT/TZMe3wYD3c4e3NQk3zc9BLormsOUeArNerL1cx4bDqv/IPJsKJQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U8qmhM1Mqbd5uo56l0UeXUrwCEcEZCLDHE0ApoO03cM=; b=MQ8g23NA3QWF2boViL7kDVOE75EDvCOXh4HfikH1VuHHrp+KUSJAf/ah7tQtXkjP6rJFKP IRGuvNky/PFAFur4AnAJ0NKmzXkjl+Z8hcWN2pKuyik3WZhCKcJlewklsVdpXwg52WtBYB /TdqqWppMGnnahITeKpsfeAj+igPN+ygQRFyg5UrseyFBdLw23Ui6wnHulLgrJvKk6mQIO 9ET1uYVajHozCsO1K2HNFS6HW1rSKteDvJTlnKBm8daDpeSwoRExY2/H7OJ1TI400Zy6fE hE0z6KS/1rt2OW7N1dbb9AbOGbiCFyf0QLcj1ACWs9DT3NIFbJTK5SVv/qtYHQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 13/41] net: phy: cortina: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:49 +0100 Message-Id: <20230319170317.27711-13-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 7d9b9c6565fd555531f X-MBO-RS-META: 958p4xudsx18x98myxrfs3xet9gj1j1m X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/cortina.c | 11 ++--------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index df5a73d6112..1cf8b28f582 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -382,7 +382,7 @@ int cs4223_startup(struct phy_device *phydev) return 0; } -static struct phy_driver cs4340_driver = { +U_BOOT_PHY_DRIVER(cs4340) = { .name = "Cortina CS4315/CS4340", .uid = PHY_UID_CS4340, .mask = 0xfffffff0, @@ -396,7 +396,7 @@ static struct phy_driver cs4340_driver = { .shutdown = &gen10g_shutdown, }; -static struct phy_driver cs4223_driver = { +U_BOOT_PHY_DRIVER(cs4223) = { .name = "Cortina CS4223", .uid = PHY_UID_CS4223, .mask = 0x0ffff00f, @@ -409,13 +409,6 @@ static struct phy_driver cs4223_driver = { .shutdown = &gen10g_shutdown, }; -int phy_cortina_init(void) -{ - phy_register(&cs4340_driver); - phy_register(&cs4223_driver); - return 0; -} - int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id) { int phy_reg; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 4446902ab63..d595290dd4b 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -517,9 +517,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_CORTINA - phy_cortina_init(); -#endif #ifdef CONFIG_PHY_DAVICOM phy_davicom_init(); #endif diff --git a/include/phy.h b/include/phy.h index 50a53982810..797139bf681 100644 --- a/include/phy.h +++ b/include/phy.h @@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); int phy_mv88e61xx_init(void); -int phy_cortina_init(void); int phy_davicom_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); From patchwork Sun Mar 19 17:02:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758740 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=eHyezeJO; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=TEE1lL4c; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkwy3WXsz2476 for ; Mon, 20 Mar 2023 04:13:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A1A685D34; Sun, 19 Mar 2023 18:11:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="eHyezeJO"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="TEE1lL4c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 30A98859E3; Sun, 19 Mar 2023 18:05:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A6D68858FF for ; Sun, 19 Mar 2023 18:04:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4PfkkJ0NW5z9scT; Sun, 19 Mar 2023 18:04:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=291kacJ8PiryGugJA/ULO0LCrx7UCLfPJkOSv4BCZ7M=; b=eHyezeJOgwJU+fQUogjBajUeH7s5rSL/kBVA4zzZ7SYzLAgPdjeBs5S9E8UNKT0N79bCL7 l/pxMa1je9vr6O/BS30tLsW0Q7hALzPSb0YLLheRuRVNkvrOBAJ/DflgAUoLp3t7PIKd4B csf8piKCdGdQ+x7GAXyVDMETdfdoGO4l3USyXKEilR9SLNJr6JrgPVYxyNuUTXV1OPBTjf ILJva6IkEwlXbRCtb8AgVzbC0l5lX5Xraj/wgqz76m8x6tE2NQz6uq9f+5tkAv2pvfIA9+ cJ4ze2ICswSf70UsD4MxbAlR7YquLj95vwtXNvWDA9l9gYh771+L6soAlLVTUQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=291kacJ8PiryGugJA/ULO0LCrx7UCLfPJkOSv4BCZ7M=; b=TEE1lL4ceS/2UiAnOp1uwfaKVe9Rr1QAJFn41j5r7w43X/cWRoUBPx50aM6QNqBn/k3w21 VuZgPpxE4EEH3UzMvrYu6pLpYVVnk4iBhUDEVOpipRoo0MiImekoo12XRDMnRiLA4hp9li IkvDDE7hLdOOJ6KHPHkC+2IVzU9ovSesC8SBTIZLAmf7+rDBjIEiZWT+/D8TXqdHP9hXhM vpkxugQGWFTiRYDxHwDrGx9WCFSIFdjK/wZZ6b0HMBzqV8M5MpdRgTLzrqGtuP9HCviut3 b1txaiSHh8tPxqK2m+FuWcoY1PeaVCdPi2PCajODAMk9OX2EN8pKPmM11fR8lw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 14/41] net: phy: davicom: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:50 +0100 Message-Id: <20230319170317.27711-14-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 5iuskfdeogjtm57ufiwo7s7bqo6jt4y7 X-MBO-RS-ID: dd991dfa28ece3b295d X-Rspamd-Queue-Id: 4PfkkJ0NW5z9scT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/davicom.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 4666497d44f..31ffa1ac7a9 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -69,7 +69,7 @@ static int dm9161_startup(struct phy_device *phydev) return dm9161_parse_status(phydev); } -static struct phy_driver DM9161_driver = { +U_BOOT_PHY_DRIVER(dm9161) = { .name = "Davicom DM9161E", .uid = 0x181b880, .mask = 0xffffff0, @@ -78,10 +78,3 @@ static struct phy_driver DM9161_driver = { .startup = &dm9161_startup, .shutdown = &genphy_shutdown, }; - -int phy_davicom_init(void) -{ - phy_register(&DM9161_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index d595290dd4b..6d7e07c25a5 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -517,9 +517,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_DAVICOM - phy_davicom_init(); -#endif #ifdef CONFIG_PHY_ET1011C phy_et1011c_init(); #endif diff --git a/include/phy.h b/include/phy.h index 797139bf681..51c2ddb7e4e 100644 --- a/include/phy.h +++ b/include/phy.h @@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); int phy_mv88e61xx_init(void); -int phy_davicom_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); int phy_marvell_init(void); From patchwork Sun Mar 19 17:02:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758712 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=uPboXUTT; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=XYK9BeB4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkpb4hsbz2477 for ; Mon, 20 Mar 2023 04:08:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BD3F085283; Sun, 19 Mar 2023 18:08:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="uPboXUTT"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="XYK9BeB4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 629D885B21; Sun, 19 Mar 2023 18:05:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8C294855F5 for ; Sun, 19 Mar 2023 18:04:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4PfkkL5S3Jz9sZj; Sun, 19 Mar 2023 18:04:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DBgTpaVdCzE0r853JuaNtyo/kjvIigGzmOEpCCtqpxk=; b=uPboXUTTY2VVqGVjMDunxdhlKcsXeDLjifUx/fyc8rSe/Uc++QAhChxK/hkm4H3RFMMUMg 2cwdv9Oyj2sNcGYbreoiugKBDECFmH0419kP8NjbTUpgIJbpZ3NudXIhEJS/AOYgGLwg35 tEkjoeiLecV78VOeuUvYSOroRaSIFZc3Km4nq6hmUjYtWhH/X739vCjOwEIOXgYkrmEDQJ 8jlJ+H+XOS5K6OO7yFpK9uwb+DoxQeHwJN6dB7JgNQmQ6WpLo7mE/Mk59LbNwgsCag+OU3 hjkG8jxEeevGNSuBfvBvaoGoJtg3RSNfRjurCbMGGUlvBzS9z7DizUrpd4j/sg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DBgTpaVdCzE0r853JuaNtyo/kjvIigGzmOEpCCtqpxk=; b=XYK9BeB4TXSwaZsSJ7VVT+RdsMlfTNp2xM777YUcCtdFW1y0vEzoMMYsByE+3s+F2HFnu2 DFhyaREZGtGcOo/SVtY3ebME3MpygX+9/iZiKeYNbtJLo6W7MgUK6vIhrqTevVt8MLe0oT D/RtbqUmVAM7ct6zNMxePJM0AFSe8pyWSmRCU4OR97uDidN9uz0F9tX+sl+HmEoxLIKQco REqPVzMSy5u4zL6k7WfFd06mIfpcM0OuMsdiqdDb2lE8cjiv0YxwlJL1Uk+9DFFOyY1J6n jbf8tnqgviFWs2D+onIYy53CAqU8473wSSPs5JlZOhZKAvGd1AxNCIeWyl2vaw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 15/41] net: phy: mv88e61xx: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:51 +0100 Message-Id: <20230319170317.27711-15-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: oe5dwys3458xc1tz8fsh3mkm86qc19m7 X-MBO-RS-ID: f68659721dda2f4b851 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/mv88e61xx.c | 15 +++------------ drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index 7ab60164c77..85778106edd 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -1127,7 +1127,7 @@ static int mv88e61xx_phy_startup(struct phy_device *phydev) return 0; } -static struct phy_driver mv88e61xx_driver = { +U_BOOT_PHY_DRIVER(mv88e61xx) = { .name = "Marvell MV88E61xx", .uid = 0x01410eb1, .mask = 0xfffffff0, @@ -1138,7 +1138,7 @@ static struct phy_driver mv88e61xx_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver mv88e609x_driver = { +U_BOOT_PHY_DRIVER(mv88e609x) = { .name = "Marvell MV88E609x", .uid = 0x1410c89, .mask = 0xfffffff0, @@ -1149,7 +1149,7 @@ static struct phy_driver mv88e609x_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver mv88e6071_driver = { +U_BOOT_PHY_DRIVER(mv88e6071) = { .name = "Marvell MV88E6071", .uid = 0x1410db0, .mask = 0xfffffff0, @@ -1160,15 +1160,6 @@ static struct phy_driver mv88e6071_driver = { .shutdown = &genphy_shutdown, }; -int phy_mv88e61xx_init(void) -{ - phy_register(&mv88e61xx_driver); - phy_register(&mv88e609x_driver); - phy_register(&mv88e6071_driver); - - return 0; -} - /* * Overload weak get_phy_id definition since we need non-standard functions * to read PHY registers diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 6d7e07c25a5..7312719cdbb 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_MV88E61XX_SWITCH - phy_mv88e61xx_init(); -#endif #ifdef CONFIG_PHY_ET1011C phy_et1011c_init(); #endif diff --git a/include/phy.h b/include/phy.h index 51c2ddb7e4e..9e5a9196cbd 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_mv88e61xx_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); int phy_marvell_init(void); From patchwork Sun Mar 19 17:02:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758720 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=AIITD9oJ; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=xA0gd77w; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkrW1fDPz1yWs for ; Mon, 20 Mar 2023 04:10:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59B5C85C5E; Sun, 19 Mar 2023 18:08:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="AIITD9oJ"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="xA0gd77w"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 91E6D85CF9; Sun, 19 Mar 2023 18:05:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BF7B485ABB for ; Sun, 19 Mar 2023 18:04:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PfkkP3YfDz9sjJ; Sun, 19 Mar 2023 18:04:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WrHaWUO9DQWqnPhRo292uD14rJJj7UQUYONajsB3sko=; b=AIITD9oJZJWv1xCm6zpdZCclxu5AaZ3Ze6WG9oyGqxOuCHa4GDd7yq61v+lSQyRoQOAGcx FPuyXmQtjpphGCZ41R+KUvYKo6kgA/0BWNaXySG3ym3FTyvnE5J+qixxUkW9WRV75+4XIU kEHib+sfPwCZPpWw8OrGo4tEXtDCu+d/AwmnkYFRpXsiGJ4C3xttD5ypw7WVI1SRLMFlOA 3EO3KYDIsl+GcDAzt0wvVUrtR5pTTji5z+bm7szTh4gfFyzcRQgen05PTVwMTHw6jnjWJv 1/jPaYU1fhHtQGjG8tXXveDzreKv+p+SSM3+pkv8MNVPSNNJ5Zc6cHujJdA/Yw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WrHaWUO9DQWqnPhRo292uD14rJJj7UQUYONajsB3sko=; b=xA0gd77wjJPbYYnZpY1e6uP0+fzxC7beGTWR9wHDDxot/OmMzoKwSE8SQD2SCDxLVN65sX 0ZcJGcWXGtrDT7WI1ffZRXXSV2p4xiTuKdI35k3fBs/9w0PPaIyOMZSkLC06R7p2owlLoX lVrK35R5vGFd+qqC17VPpaT40IpasDMVYvF+Zl4p5dQkcJxNom3AzQGjQUBgJFtq3Yl7lb wBBhNuhJYvj9onUUmYdNKpUpvyfKbxbUyXdpBiqfhAL6fqKniNvGY9M7+Y6YPKsp/wgSIr 5gtdaW6NBywYE5sC54Sl1qSrE+hGiKyX4/eVfFq1gD+/Vz5dE5zyhoZhgplNoQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 16/41] net: phy: et1011c: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:52 +0100 Message-Id: <20230319170317.27711-16-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: uxiwwr47mbjwjoqzopch7iq8kpzu4c15 X-MBO-RS-ID: 4f9153b23715637b34e X-Rspamd-Queue-Id: 4PfkkP3YfDz9sjJ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/et1011c.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c index 7eff5ec7cac..fa4831427d5 100644 --- a/drivers/net/phy/et1011c.c +++ b/drivers/net/phy/et1011c.c @@ -87,7 +87,7 @@ static int et1011c_startup(struct phy_device *phydev) return et1011c_parse_status(phydev); } -static struct phy_driver et1011c_driver = { +U_BOOT_PHY_DRIVER(et1011c) = { .name = "ET1011C", .uid = 0x0282f014, .mask = 0xfffffff0, @@ -95,10 +95,3 @@ static struct phy_driver et1011c_driver = { .config = &et1011c_config, .startup = &et1011c_startup, }; - -int phy_et1011c_init(void) -{ - phy_register(&et1011c_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 7312719cdbb..5b6e6294377 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_ET1011C - phy_et1011c_init(); -#endif #ifdef CONFIG_PHY_LXT phy_lxt_init(); #endif diff --git a/include/phy.h b/include/phy.h index 9e5a9196cbd..3bc4a0de724 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_et1011c_init(void); int phy_lxt_init(void); int phy_marvell_init(void); int phy_micrel_ksz8xxx_init(void); From patchwork Sun Mar 19 17:02:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758725 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=rYuBrP1e; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=WHggA2YG; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfksf27bXz2476 for ; Mon, 20 Mar 2023 04:11:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A83CD85CB9; Sun, 19 Mar 2023 18:08:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="rYuBrP1e"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="WHggA2YG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1D7285480; Sun, 19 Mar 2023 18:06:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 08A7E85BD0 for ; Sun, 19 Mar 2023 18:04:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PfkkS1H7Pz9sc1; Sun, 19 Mar 2023 18:04:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5E7ien80ie/hP4mOXwvaD2xCsT3HupKLOgs1I0m062E=; b=rYuBrP1epxr7YlfiwMySipVZPRqrzYfEkhtVVBJM24suUrzJTgvk2RP4azoqCxGQAfgp9h sD5RINICRQnEn/zhOHHsymp8rgj34YQoCrFaAbEQvfeZE7SFVJ5rJ2oDMfTrzMdbpfhgiG ie+/jAADBCERulfntDdX3I6JGUIXxbCgtM8+uvGVyaHGbFq7uO0vge2NWbCfHepE2HO6f5 gxj4jpt1N6k5NCKP+o0J4zFXKfEPgdXZQNqy5JTpgat7UUrM3ZBLWV1yT0oS6FWq8G1T5I pDQZaSW2c9egGsI+f5ESYDeAofT7w2w51IYaBv0NHi5zCno65V/PW5T6v4fRpA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5E7ien80ie/hP4mOXwvaD2xCsT3HupKLOgs1I0m062E=; b=WHggA2YGa0TcoRboEP9DRgOjeeA6qTLvjhMySxCYGiFL7bQDsnFehgDjYwYyuRikyw+ALH mhNhDfn8LsgT4eZNK/00eAO5G8nEd5kmqW+OXUixJfmrO1RaX82MQgfwy+SwHzo2Zi5nyt QX5NvWljpLUIKnDtikSGmN0S/vzMwYACzmZjws2oeqCpdNMAVIT05q5Mz/K+/Axmj0zIKZ JgsdzdQpTJy3HLhavOkDDwCeLWMkNm83SQ/HX0w5FSFWAjXn9aq55YGOr0zO+U/kVTrIv2 spnUjF9rwjqUuNv6RT3qMHMjLXcdjf7y4SdDo7qIejjqsEiwHcNmp704FdXLGg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 17/41] net: phy: lxt: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:53 +0100 Message-Id: <20230319170317.27711-17-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: cqndoctzg1b57exgn6314d75s8c999oj X-MBO-RS-ID: d74b08ac791c40e17a8 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/lxt.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 2618deb0096..20940033a38 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -58,7 +58,7 @@ static int lxt971_startup(struct phy_device *phydev) return lxt971_parse_status(phydev); } -static struct phy_driver LXT971_driver = { +U_BOOT_PHY_DRIVER(lxt971) = { .name = "LXT971", .uid = 0x1378e0, .mask = 0xfffff0, @@ -67,10 +67,3 @@ static struct phy_driver LXT971_driver = { .startup = &lxt971_startup, .shutdown = &genphy_shutdown, }; - -int phy_lxt_init(void) -{ - phy_register(&LXT971_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 5b6e6294377..e2e31773f6a 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_LXT - phy_lxt_init(); -#endif #ifdef CONFIG_PHY_MARVELL phy_marvell_init(); #endif diff --git a/include/phy.h b/include/phy.h index 3bc4a0de724..a309056ce77 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_lxt_init(void); int phy_marvell_init(void); int phy_micrel_ksz8xxx_init(void); int phy_micrel_ksz90x1_init(void); From patchwork Sun Mar 19 17:02:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758711 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=l9j8xVEZ; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=JGHcE77h; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkpM61K4z1yWs for ; Mon, 20 Mar 2023 04:08:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 533DF85548; Sun, 19 Mar 2023 18:07:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="l9j8xVEZ"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="JGHcE77h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3B98985B3F; Sun, 19 Mar 2023 18:06:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9AF0584EC7 for ; Sun, 19 Mar 2023 18:04:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PfkkV6ZJSz9scQ; Sun, 19 Mar 2023 18:04:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ex8qlmEOiee+xAjQL9CfY0uLzeuWdrlY3r1aQPk/aOs=; b=l9j8xVEZV2a6SlZj8iCx76vHG1HPKc9v0NqWuoR3bnLvynk3aw8YHScVIrdIlJL99gJCsh RhiI2fDFo83fvyExWa6qg/PTNWLx21azf/pxRXkIt2y+7Jv/ndmWjvh5JOnfi9+GBeEh2h R5zLOY3GkvZWdv7nMLSNi4blcqI7odhU915PGcNN8PgAAyQEA2quc4vV//SUB8hjz8GDfS 9exrJisBFU9n1reBLHBt0WxKNXfzluQD4AkFYhVH76Q7LxMbokNA9ChXyOWLjP5MrM6jcM 7eA7PBxQXGPo9CkBbRwUE43/1DlnAmuLVbMZhmRArmm/NLwE+LqjwPPTcIU+/A== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ex8qlmEOiee+xAjQL9CfY0uLzeuWdrlY3r1aQPk/aOs=; b=JGHcE77houHW8EiCXNCG8O/nCV5aaqJ04DIhzGJnrAp43GpOS0jTr639yiD65KCwkl2p/s h2y1j6H8gizd6yJcFNyWFdUDJPc1ZP9UCf28apQdd6E4eM2VxAOggnghrzutvFQUJg4iNu E/CPp+fPdVHwrYKI/siGM0i5hucKzEJsApy9N3Wd5KtDVsv+i2fcDS7svfUj43YS7goSB+ QjfYYe5/9It5kinzl2+N3nSMBz2aArFfM3drqr2HOYQgpF73LooNbiKJJqgK9tkY8aogV7 qzJDMkTVSilLibJMxI+T0NrHdda1U+RGojwWZUmXZnpzOOaFBSDWUv6VaHuweA== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 18/41] net: phy: marvell: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:54 +0100 Message-Id: <20230319170317.27711-18-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 84tyh79roiciz8xagmifbqeejp9djqz8 X-MBO-RS-ID: 17bcfa3b3ee4f1ebc8f X-Rspamd-Queue-Id: 4PfkkV6ZJSz9scQ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/marvell.c | 39 +++++++++++---------------------------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 1a25775eee6..8992be6e89e 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -693,7 +693,7 @@ static int m88e1680_config(struct phy_device *phydev) return 0; } -static struct phy_driver M88E1011S_driver = { +U_BOOT_PHY_DRIVER(m88e1011s) = { .name = "Marvell 88E1011S", .uid = 0x1410c60, .mask = 0xffffff0, @@ -703,7 +703,7 @@ static struct phy_driver M88E1011S_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1111S_driver = { +U_BOOT_PHY_DRIVER(m88e1111s) = { .name = "Marvell 88E1111S", .uid = 0x1410cc0, .mask = 0xffffff0, @@ -713,7 +713,7 @@ static struct phy_driver M88E1111S_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1118_driver = { +U_BOOT_PHY_DRIVER(m88e1118) = { .name = "Marvell 88E1118", .uid = 0x1410e10, .mask = 0xffffff0, @@ -723,7 +723,7 @@ static struct phy_driver M88E1118_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1118R_driver = { +U_BOOT_PHY_DRIVER(m88e1118r) = { .name = "Marvell 88E1118R", .uid = 0x1410e40, .mask = 0xffffff0, @@ -733,7 +733,7 @@ static struct phy_driver M88E1118R_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1121R_driver = { +U_BOOT_PHY_DRIVER(m88e1121r) = { .name = "Marvell 88E1121R", .uid = 0x1410cb0, .mask = 0xffffff0, @@ -743,7 +743,7 @@ static struct phy_driver M88E1121R_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1145_driver = { +U_BOOT_PHY_DRIVER(m88e1145) = { .name = "Marvell 88E1145", .uid = 0x1410cd0, .mask = 0xffffff0, @@ -753,7 +753,7 @@ static struct phy_driver M88E1145_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1149S_driver = { +U_BOOT_PHY_DRIVER(m88e1149s) = { .name = "Marvell 88E1149S", .uid = 0x1410ca0, .mask = 0xffffff0, @@ -763,7 +763,7 @@ static struct phy_driver M88E1149S_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1240_driver = { +U_BOOT_PHY_DRIVER(m88e1240) = { .name = "Marvell 88E1240", .uid = 0x1410e30, .mask = 0xffffff0, @@ -773,7 +773,7 @@ static struct phy_driver M88E1240_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E151x_driver = { +U_BOOT_PHY_DRIVER(m88e151x) = { .name = "Marvell 88E151x", .uid = 0x1410dd0, .mask = 0xffffff0, @@ -785,7 +785,7 @@ static struct phy_driver M88E151x_driver = { .writeext = &m88e1xxx_phy_extwrite, }; -static struct phy_driver M88E1310_driver = { +U_BOOT_PHY_DRIVER(m88e1310) = { .name = "Marvell 88E1310", .uid = 0x01410e90, .mask = 0xffffff0, @@ -795,7 +795,7 @@ static struct phy_driver M88E1310_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver M88E1680_driver = { +U_BOOT_PHY_DRIVER(m88e1680) = { .name = "Marvell 88E1680", .uid = 0x1410ed0, .mask = 0xffffff0, @@ -804,20 +804,3 @@ static struct phy_driver M88E1680_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_marvell_init(void) -{ - phy_register(&M88E1310_driver); - phy_register(&M88E1149S_driver); - phy_register(&M88E1145_driver); - phy_register(&M88E1121R_driver); - phy_register(&M88E1118_driver); - phy_register(&M88E1118R_driver); - phy_register(&M88E1111S_driver); - phy_register(&M88E1011S_driver); - phy_register(&M88E1240_driver); - phy_register(&M88E151x_driver); - phy_register(&M88E1680_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e2e31773f6a..efc75808ead 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_MARVELL - phy_marvell_init(); -#endif #ifdef CONFIG_PHY_MICREL_KSZ8XXX phy_micrel_ksz8xxx_init(); #endif diff --git a/include/phy.h b/include/phy.h index a309056ce77..77e46ebac83 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_marvell_init(void); int phy_micrel_ksz8xxx_init(void); int phy_micrel_ksz90x1_init(void); int phy_meson_gxl_init(void); From patchwork Sun Mar 19 17:02:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758722 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=shCMfuSU; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=IjnxpeR0; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkry6Qm6z2476 for ; Mon, 20 Mar 2023 04:10:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6A1085BD0; Sun, 19 Mar 2023 18:08:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="shCMfuSU"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="IjnxpeR0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5B9385BFA; Sun, 19 Mar 2023 18:06:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 17929859FF for ; Sun, 19 Mar 2023 18:04:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PfkkY3xymz9sk7; Sun, 19 Mar 2023 18:04:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xg7v6rOrWShdLt5WeXJr39ZOxemC9D4ctKGdE+B81Uw=; b=shCMfuSUM+iSAAK48F+QzzxzJQJep/5llvNkatbB5/gegHLKK2MgfdFsk0nmlfuPHZtICs F1SIW6xgTwjwMHrnIOrB+Wr6VEBUkDlMz/HDHuogBx8CxuxFjXhYKBg1DVP9pJb5ChRKP/ kCTh0z0QHGi+UQGmMvOhCiB0YxZ/nj7gLwInaDP2fH2nC5PR+Rz1wEILw8VXkiGQ9t0eBu eN4n09QkW013Z/YSQuq9DHmc/giYx5RIcvqrRXIaLoNDGdIv1jG41ORwf1xp3Uw3ekA11o F4Iagzyty9irlds7Cg1bjPiLxeix8emHAmBneqN6MjUiTIJAoKsOIeMEM4DCZw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xg7v6rOrWShdLt5WeXJr39ZOxemC9D4ctKGdE+B81Uw=; b=IjnxpeR0wJvaXpVyu3f1keV7eUtRE8c8TzQH9CrDWIDiZ+eWgZA+11Gvvuxw8GitRr8Y2Q BQ9AO6WbMhR5R3s1L/3TW4mYK8RP6/yIUJRkKKexqu10eO83YhJpIZLoLOx0yq994R3ORU AXWRFuBBxr01XF2XAbyBHPaz3bggoGWtwBIVyHun58MyJj7fbnU3NCNFgPpyClAyv8ev0o ZGhR0bVIDzpWLpo3L0bsiSnEBgFzV04W8ErlEusZ37Qchbs43uoJWt6noIg9gEMMacS4ku tM1qQXnd+CS61IqqWHgHG+plsjBpWiSJmkYuiQHm08tqJ5OtNDSD0v+b9SsZVw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 19/41] net: phy: ksz8xxx: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:55 +0100 Message-Id: <20230319170317.27711-19-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: b598bd96f049b8ebb70 X-MBO-RS-META: a9wp1sab7afrdz6xgycus8in3z3pofzt X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/micrel_ksz8xxx.c | 29 ++++++++--------------------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/net/phy/micrel_ksz8xxx.c b/drivers/net/phy/micrel_ksz8xxx.c index 60d42fe9840..b0f3abcb037 100644 --- a/drivers/net/phy/micrel_ksz8xxx.c +++ b/drivers/net/phy/micrel_ksz8xxx.c @@ -14,7 +14,7 @@ #include #include -static struct phy_driver KSZ804_driver = { +U_BOOT_PHY_DRIVER(ksz804) = { .name = "Micrel KSZ804", .uid = 0x221510, .mask = 0xfffff0, @@ -44,7 +44,7 @@ static int ksz_genconfig_bcastoff(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver KSZ8031_driver = { +U_BOOT_PHY_DRIVER(ksz8031) = { .name = "Micrel KSZ8021/KSZ8031", .uid = 0x221550, .mask = 0xfffff0, @@ -72,7 +72,7 @@ static int ksz8051_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver KSZ8051_driver = { +U_BOOT_PHY_DRIVER(ksz8051) = { .name = "Micrel KSZ8051", .uid = 0x221550, .mask = 0xfffff0, @@ -87,7 +87,7 @@ static int ksz8061_config(struct phy_device *phydev) return phy_write(phydev, MDIO_MMD_PMAPMD, MDIO_DEVID1, 0xB61A); } -static struct phy_driver KSZ8061_driver = { +U_BOOT_PHY_DRIVER(ksz8061) = { .name = "Micrel KSZ8061", .uid = 0x00221570, .mask = 0xfffff0, @@ -115,7 +115,7 @@ static int ksz8081_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver KSZ8081_driver = { +U_BOOT_PHY_DRIVER(ksz8081) = { .name = "Micrel KSZ8081", .uid = 0x221560, .mask = 0xfffff0, @@ -172,7 +172,7 @@ static int ksz8895_startup(struct phy_device *phydev) return 0; } -static struct phy_driver ksz8895_driver = { +U_BOOT_PHY_DRIVER(ksz8895) = { .name = "Micrel KSZ8895/KSZ8864", .uid = 0x221450, .mask = 0xffffe1, @@ -185,7 +185,7 @@ static struct phy_driver ksz8895_driver = { /* Micrel used the exact same model number for the KSZ9021, * so the revision number is used to distinguish them. */ -static struct phy_driver KS8721_driver = { +U_BOOT_PHY_DRIVER(ks8721) = { .name = "Micrel KS8721BL", .uid = 0x221618, .mask = 0xfffffc, @@ -210,7 +210,7 @@ static int ksz886x_startup(struct phy_device *phydev) return 0; } -static struct phy_driver ksz886x_driver = { +U_BOOT_PHY_DRIVER(ksz886x) = { .name = "Micrel KSZ886x Switch", .uid = 0x00221430, .mask = 0xfffff0, @@ -219,16 +219,3 @@ static struct phy_driver ksz886x_driver = { .startup = &ksz886x_startup, .shutdown = &genphy_shutdown, }; - -int phy_micrel_ksz8xxx_init(void) -{ - phy_register(&KSZ804_driver); - phy_register(&KSZ8031_driver); - phy_register(&KSZ8051_driver); - phy_register(&KSZ8061_driver); - phy_register(&KSZ8081_driver); - phy_register(&KS8721_driver); - phy_register(&ksz8895_driver); - phy_register(&ksz886x_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index efc75808ead..b2b2d6edfa7 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_MICREL_KSZ8XXX - phy_micrel_ksz8xxx_init(); -#endif #ifdef CONFIG_PHY_MICREL_KSZ90X1 phy_micrel_ksz90x1_init(); #endif diff --git a/include/phy.h b/include/phy.h index 77e46ebac83..27d9742c6c4 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_micrel_ksz8xxx_init(void); int phy_micrel_ksz90x1_init(void); int phy_meson_gxl_init(void); int phy_natsemi_init(void); From patchwork Sun Mar 19 17:02:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758713 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=UzWFwvxT; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=fG8ivzuF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkpr433gz1yWs for ; Mon, 20 Mar 2023 04:08:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7ECB385A57; Sun, 19 Mar 2023 18:08:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="UzWFwvxT"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="fG8ivzuF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5BFE885CAD; Sun, 19 Mar 2023 18:06:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CDF8A85C2B for ; Sun, 19 Mar 2023 18:04:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pfkkc0q6zz9sb6; Sun, 19 Mar 2023 18:04:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pAF6+EGJ3XlrLyeJjoshq6rHLOwbFgsbfh6cveuGMz8=; b=UzWFwvxTwV+uQwRZDC+dU4N3uVJJI+ykD+Bo7DDBPuM8P9GPzGlyuD/slXB0eTjsg4ADBB 2CxIPrg+qr1efEQJYtY0+lP95GIE2QdjNKAolRvSQXH+sd2UwxRgJaE/0cQkfRy1faGbxF mjh78aj3IoRRV+U+6vvbiaDUQ+rK5srk76Z89gkRii7ThhF0t9iI9yI5t+g71V/j0Xou0V MeYJOq2vH9lialGvS3m9z5mQtQwimytF4J3hVBtZeyASORG61yq4XknsweunJFkwwZ2imR p77erBJXoam3cHGd31C1nhAsCJ7munnQWm5KoSj0bhhqXq/A17YN0I/X16e6mg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pAF6+EGJ3XlrLyeJjoshq6rHLOwbFgsbfh6cveuGMz8=; b=fG8ivzuFSYD/pTP+kOh+6wJVjg/Hkn9wXzKMwekUuf9vIyl+kxoQPyrKKTkN0uSYAFDxRw IORXnEI0MOjq3QFdBfxoN3Ct9+jVAtBi8r9iP85qx7geAaYJFyUkeS9hzBu09SgygPJop+ v5bCSO82t9sxm7O+dh3jF719N25+6OGuOjSH4EhA8smQso4bpHzpJa6od23uxC/fdVBDNd c7/bePhY3XvPTmAx2eif2IhCdIvd1H2yvN2y+nG75hrGHugGPMLP8p53Utsh5GZyLpu8bW ZjJGwkjaNNcxuTo3+te80iFFRGvJEr1VDwCFlDL1onnBFrWWLP7fbYouQuMROg== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 20/41] net: phy: ksz90x1: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:56 +0100 Message-Id: <20230319170317.27711-20-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 7niksq5n9ega7ukdfj3976ug5ahqdemx X-MBO-RS-ID: 0849c4680d33b25209e X-Rspamd-Queue-Id: 4Pfkkc0q6zz9sb6 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/micrel_ksz90x1.c | 14 +++----------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c index 79ebdb5e82a..ffc3c987eaa 100644 --- a/drivers/net/phy/micrel_ksz90x1.c +++ b/drivers/net/phy/micrel_ksz90x1.c @@ -270,7 +270,7 @@ static int ksz9021_config(struct phy_device *phydev) return 0; } -static struct phy_driver ksz9021_driver = { +U_BOOT_PHY_DRIVER(ksz9021) = { .name = "Micrel ksz9021", .uid = 0x221610, .mask = 0xfffffe, @@ -368,7 +368,7 @@ static int ksz9031_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver ksz9031_driver = { +U_BOOT_PHY_DRIVER(ksz9031) = { .name = "Micrel ksz9031", .uid = PHY_ID_KSZ9031, .mask = MII_KSZ9x31_SILICON_REV_MASK, @@ -477,7 +477,7 @@ static int ksz9131_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver ksz9131_driver = { +U_BOOT_PHY_DRIVER(ksz9131) = { .name = "Micrel ksz9131", .uid = PHY_ID_KSZ9131, .mask = MII_KSZ9x31_SILICON_REV_MASK, @@ -497,11 +497,3 @@ int ksz9xx1_phy_get_id(struct phy_device *phydev) return phyid; } - -int phy_micrel_ksz90x1_init(void) -{ - phy_register(&ksz9021_driver); - phy_register(&ksz9031_driver); - phy_register(&ksz9131_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index b2b2d6edfa7..4747011cda2 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_MICREL_KSZ90X1 - phy_micrel_ksz90x1_init(); -#endif #ifdef CONFIG_PHY_MESON_GXL phy_meson_gxl_init(); #endif diff --git a/include/phy.h b/include/phy.h index 27d9742c6c4..570524a21f5 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_micrel_ksz90x1_init(void); int phy_meson_gxl_init(void); int phy_natsemi_init(void); int phy_nxp_c45_tja11xx_init(void); From patchwork Sun Mar 19 17:02:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758724 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=NFHNoF84; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=n0EL2p2H; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfksQ3ystz2476 for ; Mon, 20 Mar 2023 04:10:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 402CE85CB0; Sun, 19 Mar 2023 18:08:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="NFHNoF84"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="n0EL2p2H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF9B585AB1; Sun, 19 Mar 2023 18:06:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6788B85936 for ; Sun, 19 Mar 2023 18:05:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Pfkkf60fdz9sf2; Sun, 19 Mar 2023 18:04:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xJNnQv9/9o+pIuM1g0OhgGd6L0LomFxhM58TzInaCSQ=; b=NFHNoF841ajEonGFcclydWKbyeA6pcnai8nmZMjoevwtlG1Rmt9IW5HakH/qV7zvnLL3Ir bB+Rze8+PnnFe2XTocYF1+u4J2diw4V/HnN0U5ZO5G6ASF9ePeoo/wOl5H9Gp838Cqp6bw Kqp/fUW8Mbg9w2bWiDBhreKSQdLnA60kjtDfYjZKohz6rohFWN7BA73dYGhGnBLzT1RfvM G6mdSHW1cyZgSLMJ7RLyMt4o5Bz50DCCqDYxud/g4zkCNKVL/y0WfBaE70FEscSjxzwe2n l9o9b20qMSlYNtSydL9UjY5PCE+bZS7imFj5+/peGO1uMJjFPq79gUuPxnoXdw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xJNnQv9/9o+pIuM1g0OhgGd6L0LomFxhM58TzInaCSQ=; b=n0EL2p2HABeGGSG1hjM/hLLO7NrRyEMUMKh09mbwnxyuEoOWMmF7nd33rWEUTlxCQXrQ5P LLQuV7UpfUlmeZxQvBiJrNz5eH5XXtRVJ6fYR8gZsqnMA5nqzddru3f6rcefhOp/sHE152 ucTSge5QmnozAXsg0q1Wej3GZVbMUFSuTlYN3jeef972tMi1Rj5OvfaQT+c2s10jNDg4nX 2SRVZNtKLFlGVIla54O0J4L2SL2nddI9zXNC5WUCin2BfI80PdIiHKGlGNQQJk06p2GvKn kiTM00492qrBfhjf8TzmbvKuk9uD69+f/xw9NyzAmpmlbahT9m+92OcdA8JlaA== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 21/41] net: phy: meson-gxl: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:57 +0100 Message-Id: <20230319170317.27711-21-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: d35769880ca53d24c69 X-MBO-RS-META: sjyaitd159wb43q3e99ykspdx8woiju4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/meson-gxl.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 753ca727686..b49c9b5f495 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -124,7 +124,7 @@ static int meson_gxl_phy_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver meson_gxl_phy_driver = { +U_BOOT_PHY_DRIVER(meson_gxl_phy) = { .name = "Meson GXL Internal PHY", .uid = 0x01814400, .mask = 0xfffffff0, @@ -133,10 +133,3 @@ static struct phy_driver meson_gxl_phy_driver = { .startup = &meson_gxl_startup, .shutdown = &genphy_shutdown, }; - -int phy_meson_gxl_init(void) -{ - phy_register(&meson_gxl_phy_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 4747011cda2..27cc9f5ec60 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_MESON_GXL - phy_meson_gxl_init(); -#endif #ifdef CONFIG_PHY_NATSEMI phy_natsemi_init(); #endif diff --git a/include/phy.h b/include/phy.h index 570524a21f5..f69f379fc2b 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_meson_gxl_init(void); int phy_natsemi_init(void); int phy_nxp_c45_tja11xx_init(void); int phy_nxp_tja11xx_init(void); From patchwork Sun Mar 19 17:02:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758718 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=qlQqCPuZ; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=ZW7qydQ8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkr360yyz1yWs for ; Mon, 20 Mar 2023 04:09:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F8E085B05; Sun, 19 Mar 2023 18:08:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="qlQqCPuZ"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="ZW7qydQ8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3DB78855F5; Sun, 19 Mar 2023 18:06:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0425085AB9 for ; Sun, 19 Mar 2023 18:05:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Pfkkj4P2Lz9scl; Sun, 19 Mar 2023 18:05:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6QK1HM6IwkRKQq4HaTeV91A9H/3KpmCX9BvW/WaJ8E=; b=qlQqCPuZcrrLUahYqcVkAvn8u5hQLGTMJxOfJW6upWfTLRo46KNOgKeDefUYHPMv75CbWc UBAp9UXQtXz7Efs+3f9tY+moX1pjSW2/8cML4L4s6r85ThFLsPg98IC0PgGyBi7YXzVyvw v5S/nkeYcsXnlWgpHpwiBF3DyWb+qrJ3pz4T0s2USw6+zuJ4I+HYp0nW8UzYlYm4Q/7bj1 4XqhGQEOugNvraGY21qsyyimzZ+nushaU5s2+3HD26gCveMi8EfUhaxTGTBEt0I700dT8U xlH1OwszfV/IckYFcX4+pY/t1qK2kHfzLw6tn0pmcFATHgSdk1L1RPfGB4nvqQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6QK1HM6IwkRKQq4HaTeV91A9H/3KpmCX9BvW/WaJ8E=; b=ZW7qydQ8A4+pS+2qYigHgGhNDh6WsJRbzYeW1YK39k+cZLW03FXjUfy569o8laPui/33F1 gtBaWhY0R9kcQl8hVQZXbAhrv02CzR+FQz6JuJ6oZDLX+kIS3b0f665aZxRxWwPs4229Xf 835qnHdGxHGzveNlTthpBcyz0mbcAocAK6XD7Mt19JoZ09UlR3SVaQQLF8fhBrFgmDMtZs GLV05FLmBAM4eUh8p/1mbqNOKGF64lW8EH6epDvcm1VGTubkk4ZLAx7Gu2G8NKen9dDo+d JBL4IW6GF7lJ4z/u3UlUvoGRPjaYsbl6hl2oC+rYx7pWmA37kych7hDbGv6STQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 22/41] net: phy: natsemi: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:58 +0100 Message-Id: <20230319170317.27711-22-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 299800c8c32224e68b9 X-MBO-RS-META: tgbmeejiamd1m5af7mx1y19ndouk57qb X-Rspamd-Queue-Id: 4Pfkkj4P2Lz9scl X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/natsemi.c | 15 +++------------ drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c index efde4574deb..6b9e99ea115 100644 --- a/drivers/net/phy/natsemi.c +++ b/drivers/net/phy/natsemi.c @@ -33,7 +33,7 @@ static int dp83630_config(struct phy_device *phydev) return 0; } -static struct phy_driver DP83630_driver = { +U_BOOT_PHY_DRIVER(dp83630) = { .name = "NatSemi DP83630", .uid = 0x20005ce1, .mask = 0xfffffff0, @@ -103,7 +103,7 @@ static int dp83865_startup(struct phy_device *phydev) } -static struct phy_driver DP83865_driver = { +U_BOOT_PHY_DRIVER(dp83865) = { .name = "NatSemi DP83865", .uid = 0x20005c70, .mask = 0xfffffff0, @@ -146,7 +146,7 @@ static int dp83848_startup(struct phy_device *phydev) return dp83848_parse_status(phydev); } -static struct phy_driver DP83848_driver = { +U_BOOT_PHY_DRIVER(dp83848) = { .name = "NatSemi DP83848", .uid = 0x20005c90, .mask = 0x2000ff90, @@ -155,12 +155,3 @@ static struct phy_driver DP83848_driver = { .startup = &dp83848_startup, .shutdown = &genphy_shutdown, }; - -int phy_natsemi_init(void) -{ - phy_register(&DP83630_driver); - phy_register(&DP83865_driver); - phy_register(&DP83848_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 27cc9f5ec60..3d6fc8080e5 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_NATSEMI - phy_natsemi_init(); -#endif #ifdef CONFIG_NXP_C45_TJA11XX_PHY phy_nxp_c45_tja11xx_init(); #endif diff --git a/include/phy.h b/include/phy.h index f69f379fc2b..647d23595d1 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_natsemi_init(void); int phy_nxp_c45_tja11xx_init(void); int phy_nxp_tja11xx_init(void); int phy_realtek_init(void); From patchwork Sun Mar 19 17:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758734 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=kn7B5fB9; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=QRNrqDoE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkvk5SHRz2476 for ; Mon, 20 Mar 2023 04:12:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6951185C5E; Sun, 19 Mar 2023 18:10:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="kn7B5fB9"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="QRNrqDoE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A7CD85D03; Sun, 19 Mar 2023 18:06:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 09EB185C5E for ; Sun, 19 Mar 2023 18:05:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Pfkkm3f2Hz9skD; Sun, 19 Mar 2023 18:05:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/2MmiQfuugLRYTYFtceYxZ4yzAxB4Zf/HHCN0eBogCE=; b=kn7B5fB9+f1dNTVUj8IyESygSFfmOlcuDXAj/b7FHwpDKZWzia5cAV4bYpBmK+mrzFpQlr sgEh/KlE34fDAG+QQrZxIq6HumP8gn53fnnR2fu2hqRZLLTzAAOaV5At2+o0Fzzwltg0se ewgPTyZGkGDC+EyGQchXULwk59mVE128QBdpFGT6f/7ATMulTH1PsEGyAohUoexYb7lAKb qJ9bb5eh37JN2LvMeNY50jqHet0x3x/01qu7Qno7W/lm2fe0yUFstMW93aZy7ME08TtW01 8ixzsOMOb7+RuWirmIy4sXzRje7P108SBxxAb3GJ3gfbqSbt6/XX6wov94ef1g== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/2MmiQfuugLRYTYFtceYxZ4yzAxB4Zf/HHCN0eBogCE=; b=QRNrqDoEVBCObLt/9SoH3v7POArXcNZRZV1VfOrL8BjkTSSJ9rWcvb+rgSSAfOAAhsqgF3 GhwMXozMgKjRuaWIenwu7VhRTUfmwkx47T4+68A449KsspzKLlDprVfh2501GY9CHmT7Ye eZ5osMfYPk94LZq9XWUys18pnl0YcCQJDPkx00lyTlGnvPcFG7BYMietOg0J4jyskEymav gfrbYDJeAjedceyPZifNIY7nNpL4cz5U4jakYddOSt0gMQFZN4hXEFcb9h2dUX1ydfFdf0 vqFFl1AXBTNo4EV1/IxiXK8zRfPB783k9yHagFrSdCvHJHlp1+UpAA7FYhWIVw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 23/41] net: phy: nxp-c45-tja11xx: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:02:59 +0100 Message-Id: <20230319170317.27711-23-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: ae805cee85c856033ef X-MBO-RS-META: znjdtjrf6aspjjc1gdjummass4cz9a7y X-Rspamd-Queue-Id: 4Pfkkm3f2Hz9skD X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/nxp-c45-tja11xx.c | 8 +------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index a0f41fab698..f701790194c 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -330,7 +330,7 @@ static int nxp_c45_probe(struct phy_device *phydev) return 0; } -static struct phy_driver nxp_c45_tja11xx = { +U_BOOT_PHY_DRIVER(nxp_c45_tja11xx) = { .name = "NXP C45 TJA1103", .uid = PHY_ID_TJA_1103, .mask = 0xfffff0, @@ -340,9 +340,3 @@ static struct phy_driver nxp_c45_tja11xx = { .startup = &nxp_c45_startup, .shutdown = &genphy_shutdown, }; - -int phy_nxp_c45_tja11xx_init(void) -{ - phy_register(&nxp_c45_tja11xx); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 3d6fc8080e5..706b9505d6e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_NXP_C45_TJA11XX_PHY - phy_nxp_c45_tja11xx_init(); -#endif #ifdef CONFIG_PHY_NXP_TJA11XX phy_nxp_tja11xx_init(); #endif diff --git a/include/phy.h b/include/phy.h index 647d23595d1..aa65ae16f68 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_nxp_c45_tja11xx_init(void); int phy_nxp_tja11xx_init(void); int phy_realtek_init(void); int phy_smsc_init(void); From patchwork Sun Mar 19 17:03:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758731 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=qWG0zlQ0; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=S22t4TdQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkv53lkmz2476 for ; Mon, 20 Mar 2023 04:12:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8914C85D08; Sun, 19 Mar 2023 18:09:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="qWG0zlQ0"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="S22t4TdQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27A1B85C77; Sun, 19 Mar 2023 18:06:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2242A85C61 for ; Sun, 19 Mar 2023 18:05:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Pfkkq2xkWz9sW7; Sun, 19 Mar 2023 18:05:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UH5+e+ddTXG1FW/R0GJZAqkqFn7c8qvoV1G8VlowmVg=; b=qWG0zlQ0fRUsJO9bjx9Yh96s0Jyv26/NzG5eqy7opB5VbeCwRdSr1uP54nI2U/bxo8zgyZ JL9Ep0tUzXVQZJ3VvfLyYqccry+1P0lT9ielO3yj+WyRG67cLfknZhpxYDlAU/fUnIN3+Q 1evrRKN1bCEaR3f1YIDP0se0vv60rSaS7m4PaOhnR2+cXCEJYmvFBMwxmji7gQJuoYg1/+ OQodsYz8upPEIF4K2r1EHPzVrDZmo9PNP/2CBx6gVhh2crnxcQLktI7GCe0Zj8SMKixG/u nc0Pv7tcC5jKfOqykAbtOemhsaEZb8UmpXJU7Zz0wJe5CJsiLiIxhMOk5/KNKA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UH5+e+ddTXG1FW/R0GJZAqkqFn7c8qvoV1G8VlowmVg=; b=S22t4TdQtjn7QI+flzMWWBr8rH/YpzNyVPnTLPy/T5/ZT4JdyJFz5BPphP5J6dovFPz/s1 KjA4lpnMPJml2loqLj38fqgmcXKM6bezZCT7lADRo52XX50VacdEALl9R/2eG5rTqRAoEo t2YzmPsJSMQYfDvhJIVDgm3DV1Rs0W4mgrOkcXNYtllwAfStYMTdS8QG2Qbt1r6g3suGCT 5u9kHWMZJ5taQ6vc/9s0KejjQKCFKXG0xfZRkD+TPInBXExHzxDpCJN/WcssbY2Ar6NF+x NLCQuDvJ/kGnzKu96P/loZjDiulrMpQT9ElG5gyWvPr0eLw+ave2jb3VxaJBtA== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 24/41] net: phy: nxp-tja11xx: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:00 +0100 Message-Id: <20230319170317.27711-24-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: s7bbxn4q1a5r6ubbante48qsg9wabskk X-MBO-RS-ID: 7e566283e3aef232fda X-Rspamd-Queue-Id: 4Pfkkq2xkWz9sW7 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/nxp-tja11xx.c | 12 ++---------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c index 30dec5e605b..471b0e322b5 100644 --- a/drivers/net/phy/nxp-tja11xx.c +++ b/drivers/net/phy/nxp-tja11xx.c @@ -248,7 +248,7 @@ static int tja11xx_startup(struct phy_device *phydev) return 0; } -static struct phy_driver TJA1100_driver = { +U_BOOT_PHY_DRIVER(tja1100) = { .name = "NXP TJA1100", .uid = PHY_ID_TJA1100, .mask = PHY_ID_MASK, @@ -258,7 +258,7 @@ static struct phy_driver TJA1100_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver TJA1101_driver = { +U_BOOT_PHY_DRIVER(tja1101) = { .name = "NXP TJA1101", .uid = PHY_ID_TJA1101, .mask = PHY_ID_MASK, @@ -267,11 +267,3 @@ static struct phy_driver TJA1101_driver = { .startup = &tja11xx_startup, .shutdown = &genphy_shutdown, }; - -int phy_nxp_tja11xx_init(void) -{ - phy_register(&TJA1100_driver); - phy_register(&TJA1101_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 706b9505d6e..03d221f216d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_NXP_TJA11XX - phy_nxp_tja11xx_init(); -#endif #ifdef CONFIG_PHY_REALTEK phy_realtek_init(); #endif diff --git a/include/phy.h b/include/phy.h index aa65ae16f68..bc42a522ea6 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_nxp_tja11xx_init(void); int phy_realtek_init(void); int phy_smsc_init(void); int phy_teranetics_init(void); From patchwork Sun Mar 19 17:03:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758727 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=p23ERLQu; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=jRXSLZT4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkt64yntz2476 for ; Mon, 20 Mar 2023 04:11:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A285C85CCA; Sun, 19 Mar 2023 18:09:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="p23ERLQu"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="jRXSLZT4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C3EE85B1E; Sun, 19 Mar 2023 18:06:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050:0:465::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 94B5D85B92 for ; Sun, 19 Mar 2023 18:05:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Pfkkt1mgWz9scl; Sun, 19 Mar 2023 18:05:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=INpe9DvGpe4FTOHEvQ1GTi+g78m9uL5dEWVTh3OkzdM=; b=p23ERLQuH3JhoRcedzH/et5Y1GG2MPsGW7/qegaYH8ZwMYDwAkjPRkH8utI3lNQtUJahLE T9RNcdT8fpuG2++v+VlRgkHD5cHtn22LTcbo6aiRLIYX0LYhYmp70sPQbDYLLYxec8xbSe SwavP1kVMPvA17JKPoD5miwNV3wWDahfjzX0bNNELsqvzb6H/28t6M0KA4u8U0shmqg+9B n2cOoMJxMLfvWAYPBE2VDqN1y9HWD+HHfNTVRWOnZLlALrV8xA4ApU3exDLpntCQrWcWGm U7zkr3qV9AbRcMP2VZ+Pmy7mp2gm60mTrA1NopdycvJP+QxKFIelpNLfOORQ2Q== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=INpe9DvGpe4FTOHEvQ1GTi+g78m9uL5dEWVTh3OkzdM=; b=jRXSLZT45+kuc/HdhzWSnwW22leLHuQpdVMvwYC1kxP5LRNR3mLsDrAazzZwu7PJz+zQ+4 O55Ah6pHJxTYLVvNfAGljJkkPlOGjm3fiGI48oZuXFggDewxfUG5YCZQgQzVDzXqG+aztF Nh6aSIjO4ezkPaSXXJkwrTOui1jngvFTenya/PEiP4/Hd2bnbvdsSiZtIkLmEh/9id48Pk vuaQBRflm9VUc4gevwQTE7AJboggKaI4qlbGPehBYLrCFKfwrq5erRjCM0Z/50E1wecV6B DAydvdNk0HuAuawOlxTSbeibBFKpBBIMJEZl0ijg8MiKgQYAteQLbyt/6Yhtig== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 25/41] net: phy: realtek: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:01 +0100 Message-Id: <20230319170317.27711-25-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 1jndkofdui66mfrnksfd6umdfxmdoj1b X-MBO-RS-ID: 7e14fd787ab525a4ff5 X-Rspamd-Queue-Id: 4Pfkkt1mgWz9scl X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/realtek.c | 21 +++++---------------- include/phy.h | 1 - 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 03d221f216d..e821a3f37cb 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_REALTEK - phy_realtek_init(); -#endif #ifdef CONFIG_PHY_SMSC phy_smsc_init(); #endif diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 24c3ea59bbb..247d9753a88 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -409,7 +409,7 @@ static int rtl8211f_startup(struct phy_device *phydev) } /* Support for RTL8211B PHY */ -static struct phy_driver RTL8211B_driver = { +U_BOOT_PHY_DRIVER(rtl8211b) = { .name = "RealTek RTL8211B", .uid = 0x1cc912, .mask = 0xffffff, @@ -421,7 +421,7 @@ static struct phy_driver RTL8211B_driver = { }; /* Support for RTL8211E-VB-CG, RTL8211E-VL-CG and RTL8211EG-VB-CG PHYs */ -static struct phy_driver RTL8211E_driver = { +U_BOOT_PHY_DRIVER(rtl8211e) = { .name = "RealTek RTL8211E", .uid = 0x1cc915, .mask = 0xffffff, @@ -433,7 +433,7 @@ static struct phy_driver RTL8211E_driver = { }; /* Support for RTL8211DN PHY */ -static struct phy_driver RTL8211DN_driver = { +U_BOOT_PHY_DRIVER(rtl8211dn) = { .name = "RealTek RTL8211DN", .uid = 0x1cc914, .mask = 0xffffff, @@ -444,7 +444,7 @@ static struct phy_driver RTL8211DN_driver = { }; /* Support for RTL8211F PHY */ -static struct phy_driver RTL8211F_driver = { +U_BOOT_PHY_DRIVER(rtl8211f) = { .name = "RealTek RTL8211F", .uid = 0x1cc916, .mask = 0xffffff, @@ -458,7 +458,7 @@ static struct phy_driver RTL8211F_driver = { }; /* Support for RTL8201F PHY */ -static struct phy_driver RTL8201F_driver = { +U_BOOT_PHY_DRIVER(rtl8201f) = { .name = "RealTek RTL8201F 10/100Mbps Ethernet", .uid = 0x1cc816, .mask = 0xffffff, @@ -468,14 +468,3 @@ static struct phy_driver RTL8201F_driver = { .startup = &rtl8211e_startup, .shutdown = &genphy_shutdown, }; - -int phy_realtek_init(void) -{ - phy_register(&RTL8211B_driver); - phy_register(&RTL8211E_driver); - phy_register(&RTL8211F_driver); - phy_register(&RTL8211DN_driver); - phy_register(&RTL8201F_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index bc42a522ea6..24a880ed2fb 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_realtek_init(void); int phy_smsc_init(void); int phy_teranetics_init(void); int phy_ti_init(void); From patchwork Sun Mar 19 17:03:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758729 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=dMBlfrKO; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=FN/cWqhV; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfktg1F9Kz2476 for ; Mon, 20 Mar 2023 04:11:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F8F085CF9; Sun, 19 Mar 2023 18:09:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="dMBlfrKO"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="FN/cWqhV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24E7485C6E; Sun, 19 Mar 2023 18:06:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6C63885B38 for ; Sun, 19 Mar 2023 18:05:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkkw74c6z9sdT; Sun, 19 Mar 2023 18:05:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rjdrui3gAHIQgjh6Udy3JW0wIpa7T+0f79QkNq+Q0Ps=; b=dMBlfrKOdvCHI2Uhk22q+PG6s9HqfIoRwGYKrG0ya9oLEWcvmxX1EXqvAtrgV+Sr9b864D pAE3yoG3FtrdFIUSCAsDsIKzv+1DDRBZQ0Xn9q2YU0Fkfi1OaGRTOYe8D6umWAe9NsqcGn vobRJRS2GBaZziJzf2HaUFWskoN0aaVGDEBI4/aaJu/UwWOut53Runh/sbiy8DSS+xlq4G wTYwE/W+ikmf894UQbNqfUmf67mmR3fqAzTsBeYTIBN3d2kCFYFmFFmXWYvoWp8yeVDGBu plA5n5durdrHATf2hRVKHDDJsrAqAbBcYF3ki7fmL6KPUHBYy5PSYObh6RuZ/A== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rjdrui3gAHIQgjh6Udy3JW0wIpa7T+0f79QkNq+Q0Ps=; b=FN/cWqhVEkObw12NKQgAg7HEIosDDmOfNzQIx4HQkUUVKVUoRZ4Fuv8z7dRq+jluBjp72v hWzJk8np365Ep595fUFTDxu39uewczg9ZJ8PpaBCEc4/0Kq6tM/IKxzxuMRoTMvpmoji0o 9ZtW5UUiWsRG7Z2+A2nJowQ+9+yddQK28rMp58JgwmacXYO5paW/yAvRKXM6cPO36LxbN1 6IE8Issb/F8ayf76crSG3At2knokx3U3hoO0nOcHaEh04Kf+acFh2I/8gFfO5vOvtB/4bG jgjCd035S4NhAf3UYDG4Gu52gKnwuuuoaIz5O0vD5DmT0j4FNIdhruGFJkAC2w== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 26/41] net: phy: smsc: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:02 +0100 Message-Id: <20230319170317.27711-26-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: s7t81w86s6kzy7mmumf1ep8co5o3tbzp X-MBO-RS-ID: 60ec417f9026f4a9942 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/smsc.c | 24 ++++++------------------ include/phy.h | 1 - 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e821a3f37cb..d4a50fb76ac 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_SMSC - phy_smsc_init(); -#endif #ifdef CONFIG_PHY_TERANETICS phy_teranetics_init(); #endif diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 7740a2510d2..056b607e0b8 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -43,7 +43,7 @@ static int smsc_startup(struct phy_device *phydev) return smsc_parse_status(phydev); } -static struct phy_driver lan8700_driver = { +U_BOOT_PHY_DRIVER(lan8700) = { .name = "SMSC LAN8700", .uid = 0x0007c0c0, .mask = 0xffff0, @@ -53,7 +53,7 @@ static struct phy_driver lan8700_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver lan911x_driver = { +U_BOOT_PHY_DRIVER(lan911x) = { .name = "SMSC LAN911x Internal PHY", .uid = 0x0007c0d0, .mask = 0xffff0, @@ -63,7 +63,7 @@ static struct phy_driver lan911x_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver lan8710_driver = { +U_BOOT_PHY_DRIVER(lan8710) = { .name = "SMSC LAN8710/LAN8720", .uid = 0x0007c0f0, .mask = 0xffff0, @@ -73,7 +73,7 @@ static struct phy_driver lan8710_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver lan8740_driver = { +U_BOOT_PHY_DRIVER(lan8740) = { .name = "SMSC LAN8740", .uid = 0x0007c110, .mask = 0xffff0, @@ -83,7 +83,7 @@ static struct phy_driver lan8740_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver lan8741_driver = { +U_BOOT_PHY_DRIVER(lan8741) = { .name = "SMSC LAN8741", .uid = 0x0007c120, .mask = 0xffff0, @@ -93,7 +93,7 @@ static struct phy_driver lan8741_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver lan8742_driver = { +U_BOOT_PHY_DRIVER(lan8742) = { .name = "SMSC LAN8742", .uid = 0x0007c130, .mask = 0xffff0, @@ -102,15 +102,3 @@ static struct phy_driver lan8742_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_smsc_init(void) -{ - phy_register(&lan8710_driver); - phy_register(&lan911x_driver); - phy_register(&lan8700_driver); - phy_register(&lan8740_driver); - phy_register(&lan8741_driver); - phy_register(&lan8742_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index 24a880ed2fb..4326ef223e0 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_smsc_init(void); int phy_teranetics_init(void); int phy_ti_init(void); int phy_vitesse_init(void); From patchwork Sun Mar 19 17:03:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758732 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=ucv7O/pp; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=c4WN1yYT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkvJ1qVJz2476 for ; Mon, 20 Mar 2023 04:12:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7C7C885D19; Sun, 19 Mar 2023 18:09:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="ucv7O/pp"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="c4WN1yYT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2272A85B92; Sun, 19 Mar 2023 18:06:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [IPv6:2001:67c:2050:0:465::103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E0CBF85B05 for ; Sun, 19 Mar 2023 18:05:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Pfkkz4Qgcz9sX0; Sun, 19 Mar 2023 18:05:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UELc162fhBaVM3nJ/nSHNt+XnRfslgeB6QC1GB7eyUk=; b=ucv7O/pph00UwSaRYbllB0rtOyXsxsErexDdYQ8D/3x2m2My+u+QwBUz4Cua1Wc7MtyXhe Cn74CLfAiK/rK6Udx1pfNUQE4un4nSU+uybUUTq4Zv5TGSzV9WH8ZtNQIIBfPl+Whm7ms1 2iW7AzHfL/EqRByGZrY8KolPKRqIgj7sYoOJ9AkdVDO+zOPb+yiMLPaMFKlmJf1jHYJYok /3d7vqkzJOiA7ApZw3Pk0Rcpt6KWKYNJTtT98S5OApYBD3x+/cP+iGPwWzhviTenLr3a3Z f3xH2nX6zTSbkjEthABktyFDCSHS+OHzHrqwQeeFhYtJDVnqHJAaWY6VPuuTdg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UELc162fhBaVM3nJ/nSHNt+XnRfslgeB6QC1GB7eyUk=; b=c4WN1yYTDpiDFrjA0mJ/erPROsGr2Rby1C1fRilXMvnXyj7RHlge1d94ng0e/9zbRWJN2I p6xkqR2lZS4mT8ZhkqzQBWxZZZCdX/FayMqZ6KPBFnsw9oCdUj7UBhj+6Run/xvQF6hftN XXynVMbVSF8w33x9QP/1sfChqLd/959GRzQEjfj+PJYkK6NzwMkp+WaJr087RjprDA6TUg 9kc00bUUyhlXV/E4U8Y+RErfMelNggPFYgm4dwgRNiQEhytblyr+Uxc0zlByfqOQFPC8FA iw2G4zJr4P7Z/yuCAdrcPj2J8+0Q+a6sOAiuc+cm4vSGP6sJ+k9Gv69cpuavtQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 27/41] net: phy: teranetics: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:03 +0100 Message-Id: <20230319170317.27711-27-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: e091b7b95ab56239e74 X-MBO-RS-META: oqc117b5o5psid143di5hfg86ry9587c X-Rspamd-Queue-Id: 4Pfkkz4Qgcz9sX0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/teranetics.c | 9 +-------- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index d4a50fb76ac..b76cc51cbfb 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_TERANETICS - phy_teranetics_init(); -#endif #ifdef CONFIG_PHY_TI phy_ti_init(); #endif diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c index c402bad88c6..15f2c12ed83 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -90,7 +90,7 @@ int tn2020_startup(struct phy_device *phydev) return 0; } -static struct phy_driver tn2020_driver = { +U_BOOT_PHY_DRIVER(tn2020) = { .name = "Teranetics TN2020", .uid = PHY_UID_TN2020, .mask = 0xfffffff0, @@ -102,10 +102,3 @@ static struct phy_driver tn2020_driver = { .startup = &tn2020_startup, .shutdown = &gen10g_shutdown, }; - -int phy_teranetics_init(void) -{ - phy_register(&tn2020_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index 4326ef223e0..2c6e167f26e 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_teranetics_init(void); int phy_ti_init(void); int phy_vitesse_init(void); int phy_xilinx_init(void); From patchwork Sun Mar 19 17:03:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758728 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=LoWxKCtQ; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=SW+sg1mF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfktN3Ybfz2476 for ; Mon, 20 Mar 2023 04:11:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE4FA85C6E; Sun, 19 Mar 2023 18:09:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="LoWxKCtQ"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="SW+sg1mF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 215A985C67; Sun, 19 Mar 2023 18:06:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6BCF285C67 for ; Sun, 19 Mar 2023 18:05:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Pfkl32ytbz9sW7; Sun, 19 Mar 2023 18:05:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/SSah0UHqvz2pupbPPkhgH+OH7onihdVLd73Zk1yzEE=; b=LoWxKCtQcPf37qVZmIR5m5F2wTxYHy4DBHCkVGdVChV2EOtyI9sLDAXR68XtvRI31Gnqpv c8K7S3cCqj2sj60BeQeUtVkSZutJjTfOrQ+gF8tyU9gEOzCNr/fjLU1Je//N7wFk9d+65t 7UvCkLXmR2h+kX+q+pMVk+y3hEHjT6smnwJnm1sZvVeB3SqbAIk5gv3/TA1Lmm6tA7cXOZ HELrSl83oLcR2w/AH62yDM3aoznt9Ykx8gfCs4x/6wrRIsaYUny4W+LGe0hxnZ6RJ6bHmU KPeFdaZ6Ft9v5njMai7khL3Uw19ivok1p9r1arKVFkBxc5V6Zhm7W5LgFyts3g== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/SSah0UHqvz2pupbPPkhgH+OH7onihdVLd73Zk1yzEE=; b=SW+sg1mFHxo+dCpwPy888C40EcEt0uWahBhwQ6RdT/Lsq8hscrbjpMI2X5qhKhtdv0amBF lqz+hC2G8Gfq3yajnf4mbU44aRc2mM0v7yJwbu+L9vH+z3HwN37W01DFSz4Ua4aFgeuV24 Xy3jDM6vbufemcSzm/JQvDCRooSg8oe63YLK7SI8ePTM3Vz3bPIjI8Chf0iz+9H8s33d1d SHCKhOpkGvhw7NzeSG2lmZdyWqze+Ydr4kd64YTOBo7dHJ4CAw3yfz8M0he0upNFB1K/Mj okqlzDInN6EwMZ/zkC+uo3NTH1tfYMnQGcwLzKdDzWlx+ay7ByamVIfyuCj9Sw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 28/41] net: phy: ti: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:04 +0100 Message-Id: <20230319170317.27711-28-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: d84781b45b4a39574ce X-MBO-RS-META: u3jemp98yyhj8ycqtcab1achhx376kwn X-Rspamd-Queue-Id: 4Pfkl32ytbz9sW7 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" This particular PHY driver is slightly more spread out across additional source files. Since the phy_register() calls are no longer necessary, all the registration calls across those source files is dropped. Furthermore, the Makefile can now be updated to only compile generic TI PHY support if matching Kconfig symbol is enabled and the ifdeffery in the generic TI PHY driver can be dropped. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/Makefile | 2 +- drivers/net/phy/dp83867.c | 8 +------- drivers/net/phy/dp83869.c | 8 +------- drivers/net/phy/phy.c | 3 --- drivers/net/phy/ti_phy_init.c | 38 +++++++---------------------------- include/phy.h | 1 - 6 files changed, 10 insertions(+), 50 deletions(-) diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index d38e99e7171..963d96e2bcb 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_PHY_NXP_TJA11XX) += nxp-tja11xx.o obj-$(CONFIG_PHY_REALTEK) += realtek.o obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o -obj-$(CONFIG_PHY_TI) += ti_phy_init.o +obj-$(CONFIG_PHY_TI_GENERIC) += ti_phy_init.o obj-$(CONFIG_PHY_TI_DP83867) += dp83867.o obj-$(CONFIG_PHY_TI_DP83869) += dp83869.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index a45152bddc9..b861bf7cef3 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -409,7 +409,7 @@ static int dp83867_probe(struct phy_device *phydev) return 0; } -static struct phy_driver DP83867_driver = { +U_BOOT_PHY_DRIVER(dp83867) = { .name = "TI DP83867", .uid = 0x2000a231, .mask = 0xfffffff0, @@ -419,9 +419,3 @@ static struct phy_driver DP83867_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_dp83867_init(void) -{ - phy_register(&DP83867_driver); - return 0; -} diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c index 23dbf42b68c..8d32d73b07f 100644 --- a/drivers/net/phy/dp83869.c +++ b/drivers/net/phy/dp83869.c @@ -473,7 +473,7 @@ static int dp83869_probe(struct phy_device *phydev) return 0; } -static struct phy_driver DP83869_driver = { +U_BOOT_PHY_DRIVER(dp83869) = { .name = "TI DP83869", .uid = 0x2000a0f1, .mask = 0xfffffff0, @@ -485,9 +485,3 @@ static struct phy_driver DP83869_driver = { .readext = dp83869_readext, .writeext = dp83869_writeext }; - -int phy_dp83869_init(void) -{ - phy_register(&DP83869_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index b76cc51cbfb..404d61c5ab3 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_TI - phy_ti_init(); -#endif #ifdef CONFIG_PHY_VITESSE phy_vitesse_init(); #endif diff --git a/drivers/net/phy/ti_phy_init.c b/drivers/net/phy/ti_phy_init.c index 075b19a39f0..a0878193ac0 100644 --- a/drivers/net/phy/ti_phy_init.c +++ b/drivers/net/phy/ti_phy_init.c @@ -10,8 +10,7 @@ #include #include "ti_phy_init.h" -#ifdef CONFIG_PHY_TI_GENERIC -static struct phy_driver dp83822_driver = { +U_BOOT_PHY_DRIVER(dp83822) = { .name = "TI DP83822", .uid = 0x2000a240, .mask = 0xfffffff0, @@ -21,7 +20,7 @@ static struct phy_driver dp83822_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver dp83826nc_driver = { +U_BOOT_PHY_DRIVER(dp83826nc) = { .name = "TI DP83826NC", .uid = 0x2000a110, .mask = 0xfffffff0, @@ -31,7 +30,7 @@ static struct phy_driver dp83826nc_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver dp83826c_driver = { +U_BOOT_PHY_DRIVER(dp83826c) = { .name = "TI DP83826C", .uid = 0x2000a130, .mask = 0xfffffff0, @@ -41,7 +40,7 @@ static struct phy_driver dp83826c_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver dp83825s_driver = { +U_BOOT_PHY_DRIVER(dp83825s) = { .name = "TI DP83825S", .uid = 0x2000a140, .mask = 0xfffffff0, @@ -51,7 +50,7 @@ static struct phy_driver dp83825s_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver dp83825i_driver = { +U_BOOT_PHY_DRIVER(dp83825i) = { .name = "TI DP83825I", .uid = 0x2000a150, .mask = 0xfffffff0, @@ -61,7 +60,7 @@ static struct phy_driver dp83825i_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver dp83825m_driver = { +U_BOOT_PHY_DRIVER(dp83825m) = { .name = "TI DP83825M", .uid = 0x2000a160, .mask = 0xfffffff0, @@ -71,7 +70,7 @@ static struct phy_driver dp83825m_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver dp83825cs_driver = { +U_BOOT_PHY_DRIVER(dp83825cs) = { .name = "TI DP83825CS", .uid = 0x2000a170, .mask = 0xfffffff0, @@ -80,26 +79,3 @@ static struct phy_driver dp83825cs_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; -#endif /* CONFIG_PHY_TI_GENERIC */ - -int phy_ti_init(void) -{ -#ifdef CONFIG_PHY_TI_DP83867 - phy_dp83867_init(); -#endif - -#ifdef CONFIG_PHY_TI_DP83869 - phy_dp83869_init(); -#endif - -#ifdef CONFIG_PHY_TI_GENERIC - phy_register(&dp83822_driver); - phy_register(&dp83825s_driver); - phy_register(&dp83825i_driver); - phy_register(&dp83825m_driver); - phy_register(&dp83825cs_driver); - phy_register(&dp83826c_driver); - phy_register(&dp83826nc_driver); -#endif - return 0; -} diff --git a/include/phy.h b/include/phy.h index 2c6e167f26e..e6508a132d0 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_ti_init(void); int phy_vitesse_init(void); int phy_xilinx_init(void); int phy_xway_init(void); From patchwork Sun Mar 19 17:03:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758715 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=NX/Bstae; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=JYvbYIix; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkqK5c1vz1yWs for ; Mon, 20 Mar 2023 04:09:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD67485B1E; Sun, 19 Mar 2023 18:08:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="NX/Bstae"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="JYvbYIix"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6DE3985B31; Sun, 19 Mar 2023 18:06:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050:0:465::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7A49085C70 for ; Sun, 19 Mar 2023 18:05:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Pfkl61mFMz9scR; Sun, 19 Mar 2023 18:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Y2U16fd3KB7Gn51fYw11k0v59EE2U3jvzTEfVbxo9U=; b=NX/BstaegU3/zZWViFOzGh4W5A5KOBKHiIjv6kujEoBFaOVTgoOGJdV7BNLhBalfGiWANF KBT1nak3M/YufgpQ7PKWLD8HoG/6S6PaUGEwiuI1iCQrrBoGI+cc/H/Ir8ZiUrP4NK7ffR XDwcghJXsJ4dvzaNXllVOhORYwhIOSx2eblO3OtpiuxDJFmqkoBiFNehAtwqIgGhLpunfR 199okB9XuS0RvdxKBNP8E0EG2MK/oNHMKxpyDypjOW2qWh5I8RPYfg49skH3p2SB0mgZCC iuQjaE4ahd8huDbb3Tpw9fffH0+4Qvkq1KZ4CWTKxn11kqgYeuES96bAUEA0ng== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Y2U16fd3KB7Gn51fYw11k0v59EE2U3jvzTEfVbxo9U=; b=JYvbYIix3rN1FoPxfXuwXSH10/at5CQmcbp9F4ROgGtR/JQQI/d/dKZ9kWV/lsI4kEMhjr sh/eIHdWbAHYIEHrxe2x34xenqTYiz69+mVQshoHF0ZnA9D+T2SW7SoJ0oQJCa8E6TR/yG BfS4Dq4AJTlNOqT6VXswUufBgfwkXMdRVdqONuD2ljxKm+/dbbaKmYj03igGOOb6tcSEqJ YW9Q6ILK8bvvRHCkukrfLkvoh2jywX2vt7+W4aLXjxq42tJII3vElEIJNJG7fPNWPXqP/i ZiAJnqcI23nNa/PQwyTl6ArMSMEU7AmVIaSz4n/n+RIhqFhG94oU/Ym9LY+VYw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 29/41] net: phy: vitesse: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:05 +0100 Message-Id: <20230319170317.27711-29-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 7ff10911b66ebe270e8 X-MBO-RS-META: ypf53mfqm4zanj9twyus5c556op9j7pa X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/vitesse.c | 45 +++++++++++---------------------------- include/phy.h | 1 - 3 files changed, 13 insertions(+), 36 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 404d61c5ab3..fff1d669fcd 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_VITESSE - phy_vitesse_init(); -#endif #ifdef CONFIG_PHY_XILINX phy_xilinx_init(); #endif diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c index eca26c98938..c5cf0d7dfbd 100644 --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c @@ -293,7 +293,7 @@ static int vsc8664_config(struct phy_device *phydev) return 0; } -static struct phy_driver VSC8211_driver = { +U_BOOT_PHY_DRIVER(vsc8211) = { .name = "Vitesse VSC8211", .uid = 0xfc4b0, .mask = 0xffff0, @@ -303,7 +303,7 @@ static struct phy_driver VSC8211_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8221_driver = { +U_BOOT_PHY_DRIVER(vsc8221) = { .name = "Vitesse VSC8221", .uid = 0xfc550, .mask = 0xffff0, @@ -313,7 +313,7 @@ static struct phy_driver VSC8221_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8244_driver = { +U_BOOT_PHY_DRIVER(vsc8244) = { .name = "Vitesse VSC8244", .uid = 0xfc6c0, .mask = 0xffff0, @@ -323,7 +323,7 @@ static struct phy_driver VSC8244_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8234_driver = { +U_BOOT_PHY_DRIVER(vsc8234) = { .name = "Vitesse VSC8234", .uid = 0xfc620, .mask = 0xffff0, @@ -333,7 +333,7 @@ static struct phy_driver VSC8234_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8574_driver = { +U_BOOT_PHY_DRIVER(vsc8574) = { .name = "Vitesse VSC8574", .uid = 0x704a0, .mask = 0xffff0, @@ -343,7 +343,7 @@ static struct phy_driver VSC8574_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8514_driver = { +U_BOOT_PHY_DRIVER(vsc8514) = { .name = "Vitesse VSC8514", .uid = 0x70670, .mask = 0xffff0, @@ -353,7 +353,7 @@ static struct phy_driver VSC8514_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8584_driver = { +U_BOOT_PHY_DRIVER(vsc8584) = { .name = "Vitesse VSC8584", .uid = 0x707c0, .mask = 0xffff0, @@ -363,7 +363,7 @@ static struct phy_driver VSC8584_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8601_driver = { +U_BOOT_PHY_DRIVER(vsc8601) = { .name = "Vitesse VSC8601", .uid = 0x70420, .mask = 0xffff0, @@ -373,7 +373,7 @@ static struct phy_driver VSC8601_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8641_driver = { +U_BOOT_PHY_DRIVER(vsc8641) = { .name = "Vitesse VSC8641", .uid = 0x70430, .mask = 0xffff0, @@ -383,7 +383,7 @@ static struct phy_driver VSC8641_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8662_driver = { +U_BOOT_PHY_DRIVER(vsc8662) = { .name = "Vitesse VSC8662", .uid = 0x70660, .mask = 0xffff0, @@ -393,7 +393,7 @@ static struct phy_driver VSC8662_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8664_driver = { +U_BOOT_PHY_DRIVER(vsc8664) = { .name = "Vitesse VSC8664", .uid = 0x70660, .mask = 0xffff0, @@ -404,7 +404,7 @@ static struct phy_driver VSC8664_driver = { }; /* Vitesse bought Cicada, so we'll put these here */ -static struct phy_driver cis8201_driver = { +U_BOOT_PHY_DRIVER(cis8201) = { .name = "CIS8201", .uid = 0xfc410, .mask = 0xffff0, @@ -414,7 +414,7 @@ static struct phy_driver cis8201_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver cis8204_driver = { +U_BOOT_PHY_DRIVER(cis8204) = { .name = "Cicada Cis8204", .uid = 0xfc440, .mask = 0xffff0, @@ -423,22 +423,3 @@ static struct phy_driver cis8204_driver = { .startup = &vitesse_startup, .shutdown = &genphy_shutdown, }; - -int phy_vitesse_init(void) -{ - phy_register(&VSC8641_driver); - phy_register(&VSC8601_driver); - phy_register(&VSC8234_driver); - phy_register(&VSC8244_driver); - phy_register(&VSC8211_driver); - phy_register(&VSC8221_driver); - phy_register(&VSC8574_driver); - phy_register(&VSC8584_driver); - phy_register(&VSC8514_driver); - phy_register(&VSC8662_driver); - phy_register(&VSC8664_driver); - phy_register(&cis8201_driver); - phy_register(&cis8204_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index e6508a132d0..74f3ada2491 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_vitesse_init(void); int phy_xilinx_init(void); int phy_xway_init(void); int phy_mscc_init(void); From patchwork Sun Mar 19 17:03:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758721 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=uoplPU5a; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=yWAspM92; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkrl0380z246f for ; Mon, 20 Mar 2023 04:10:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 11E4685C67; Sun, 19 Mar 2023 18:08:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="uoplPU5a"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="yWAspM92"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 88E0085D02; Sun, 19 Mar 2023 18:06:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0C028859B6 for ; Sun, 19 Mar 2023 18:05:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkl85tKJz9sTs; Sun, 19 Mar 2023 18:05:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cllsqzs/Ce/9i+PClbAexmxdRyz4xXWwr2LbanZBXFk=; b=uoplPU5aPdMlsudHEAOptKTp7ygkCVbNPqu4cKWWO7LsKwiIYikQzpPlpZf/1Jo/Vx5Cil iAW9uC71MoR3+me2nms76n6TcNgpUZ+J9VIA59QrHW/ENcC87Lf4NoylbYsb+2J+iUWzYi xXISZl2YNa4gf68zUvnAitD6fEToHHpcJ6h6np4Dwvv2esnlRyBumyR8lY/b4m13XB6LhU ec8098tgp6+kAl9/KfknXyV2Qm9CzLroWz9oQtVvolUImXd+TB3zmZPNmv1opWm9NHi4bC GxE3RGB6AG0Y3YgxJkX5FxsKFb/DmNva3Z9mJm51ttrYcWGKfBlCoHvbjToPrw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cllsqzs/Ce/9i+PClbAexmxdRyz4xXWwr2LbanZBXFk=; b=yWAspM92NR7z6LbpuCYhkcWeuTkzPZMhznW2ruYHjyYqIHe9MmiXrwUGmBQ27UUBHhc6du KRCozbjUKTY1XNMuDJqk157skigVemF6DvzR8SvfookxsUSnjE2mjLAXxDiPULW++s/DhQ 8ggy5vSlQyDkM0J0CFCBp2QIK2dAdKwLi7XhZEngtOV2vVkpg6dBzoDzlOvbqAK/kSfc6z HR8sKy3w7vjHrWmN0dzeVkW+IwKpH6P5wXudBVaY94wjmaDKTAPQLn6RkInWFO/pGw172K QMtUTc0MMKqCPgzUUfRtMz0HfW7WTLQMBGobx2UCl8ys6gY171ttqT/PO1eXtw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 30/41] net: phy: xilinx: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:06 +0100 Message-Id: <20230319170317.27711-30-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: thyukizuoftijschqugunweqxpewcc9e X-MBO-RS-ID: a4da7828b3fab98994c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/xilinx_phy.c | 10 +--------- include/phy.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fff1d669fcd..b85d5c4566d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_XILINX - phy_xilinx_init(); -#endif #ifdef CONFIG_PHY_XWAY phy_xway_init(); #endif diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c index 39dbfdb7da8..1df639d6f44 100644 --- a/drivers/net/phy/xilinx_phy.c +++ b/drivers/net/phy/xilinx_phy.c @@ -127,7 +127,7 @@ static int xilinxphy_config(struct phy_device *phydev) return 0; } -static struct phy_driver xilinxphy_driver = { +U_BOOT_PHY_DRIVER(xilinxphy) = { .uid = XILINX_PHY_ID, .mask = XILINX_PHY_ID_MASK, .name = "Xilinx PCS/PMA PHY", @@ -136,11 +136,3 @@ static struct phy_driver xilinxphy_driver = { .startup = &xilinxphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_xilinx_init(void) -{ - debug("%s\n", __func__); - phy_register(&xilinxphy_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index 74f3ada2491..e128ddf0037 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_xilinx_init(void); int phy_xway_init(void); int phy_mscc_init(void); int phy_fixed_init(void); From patchwork Sun Mar 19 17:03:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758710 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=PZNmminK; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=rhieVqZD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkp73ZlRz1yWs for ; Mon, 20 Mar 2023 04:07:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 71C1F855F5; Sun, 19 Mar 2023 18:07:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="PZNmminK"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="rhieVqZD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3911F85283; Sun, 19 Mar 2023 18:07:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BEE1D85AC0 for ; Sun, 19 Mar 2023 18:05:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PfklC2v0lz9sdB; Sun, 19 Mar 2023 18:05:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YwJrJ3mgCaImkU+ySO5MXFcA373VIYq4kPju7roJP4w=; b=PZNmminKBOsy360d7LnEG4yD3JbiKWhyjDnA0kgTz7cu1sTOt+idlpgBsj2NwDU+sspoo3 HAi2WYI1J+35HfWFyp6O78Qp54bSAPd85wkNZatdKwhOoX6sCEAJZEhtDBoKAdE97Yds0v HletCxTT2DUt0lqgWtz86AJRZR1iVC4VpOBTfs/vyIbwajqnyCXW70c5LF9+qj+/PfkrZk q9irpPfJLLP6btGDeMNnfaz8zG21S3ZuHvBlc7pCc/Ll3UIgUgtsp8Vl8vKhPxcZkKOHsv 2ijV9yfpaTE+ETJ4Y+I5lGBtmsU0b8eciEFNjhKyQl/tkwk7iBNfs9MIjU0d+A== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YwJrJ3mgCaImkU+ySO5MXFcA373VIYq4kPju7roJP4w=; b=rhieVqZDscI16P+14rGql6QqJLyMpIawmWEq00RVfF6exKtgAjh90EciYUWksTsvpSC1r1 8TkRvlW0sAUt0EpkMLOvX8KBXgcqQ0RVATMobqv3H9OSixDXZyL687Iio1d0nKxBjzr83u zk0fSnwu/iXVrCqR7Phh7dthq79j/+Ir0/qfGBfRZV3Y3WZQFsfoDd3ne6hXiPCHGN/leL j8pSu/l3gwEWIz+4UfMNbzYNMgm/lzgtQihG5EkdBJY8be381KWCjYHXjLHZO7xA6wqUGK kUw4DDrSuF0Z9FdC8/MVYHcNm5z3Rk+Z0WP+62TAQ+bOxe6mUh4arQodCvKX0w== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 31/41] net: phy: intel-xway: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:07 +0100 Message-Id: <20230319170317.27711-31-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: wa95usrfxoqbfepgur63kcbqoeo7pd4b X-MBO-RS-ID: bccd32644c33c11e02f X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/intel_xway.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/intel_xway.c b/drivers/net/phy/intel_xway.c index dfce3f8332e..9d1b97d349f 100644 --- a/drivers/net/phy/intel_xway.c +++ b/drivers/net/phy/intel_xway.c @@ -30,7 +30,7 @@ static int xway_config(struct phy_device *phydev) return 0; } -static struct phy_driver XWAY_driver = { +U_BOOT_PHY_DRIVER(xway) = { .name = "XWAY", .uid = 0xD565A400, .mask = 0xffffff00, @@ -39,10 +39,3 @@ static struct phy_driver XWAY_driver = { .startup = genphy_startup, .shutdown = genphy_shutdown, }; - -int phy_xway_init(void) -{ - phy_register(&XWAY_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index b85d5c4566d..1542fe89252 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_XWAY - phy_xway_init(); -#endif #ifdef CONFIG_PHY_MSCC phy_mscc_init(); #endif diff --git a/include/phy.h b/include/phy.h index e128ddf0037..fc8300d5d97 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_xway_init(void); int phy_mscc_init(void); int phy_fixed_init(void); int phy_ncsi_init(void); From patchwork Sun Mar 19 17:03:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758709 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=F6h77W5p; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=Rii4IKhD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfknx3pJrz1yWs for ; Mon, 20 Mar 2023 04:07:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 940C185A55; Sun, 19 Mar 2023 18:07:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="F6h77W5p"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="Rii4IKhD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F4EE859FF; Sun, 19 Mar 2023 18:07:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [IPv6:2001:67c:2050:0:465::103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 530D885B1E for ; Sun, 19 Mar 2023 18:05:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PfklG02s6z9sW7; Sun, 19 Mar 2023 18:05:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Ee+F/ykc97LIjy8MRZU34S4jplrozEx2DFoAXIu61E=; b=F6h77W5pFv7BzqJOXg4dZyd5hh/J0dPUQl/Cd4MLj99PxJJXTLhqHbJVv6CuKccNNn0bs/ RPkrfa02tro8O/ES1wuU1vYcgbzJaNoO9iUsDQz6t23GtqPaCgWuFrPdLz3HLiocJjIfhA ggK+zBPcFXuoRnS5uUnyJB4tpa7j1zdxr/q3NkJ/4/83CG0+TS9893cmyThWnJyqrSFn0X aN6ZLJUdJ0rP42MwxBq0jt7971M/Tybrpxz7tC2yS1w6mclfcIfzGZGMUjnJ2fkVLWmKZB p7Z0XHdF7q1aMiRWc2q4Ks5SOHVC+5ULiyurOyGJczeF3kODLrRWSSzdDf7dVA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Ee+F/ykc97LIjy8MRZU34S4jplrozEx2DFoAXIu61E=; b=Rii4IKhDfr/feVDoJEJxIsE5Tqpxb1cUf7JBVcPcA+cSfyH7kl8c30wgOJ4uw11OBUMGHT gAmj5/DJCGxkF/xFSR6UDX/rTnjpjmyrCpTP09+QxUwjlTEkfa8SAxjown1g9hyvqnVr/2 AWEVN76SQd9DmF1bgrPioaFDu2sIdNkGUGd0cEoMyg9dGNoxvKdi0cmp7bH/cjppYWQnmR OsJ+AbOQWk0fsliUh0fYe79E5XTX+9SWHEJHzfdbfsOqpe4Q/2vNW01aGjjt+ctxrTiRx7 1PfNmOLIM/hY0ycJ+oDfcw9Bg94YQfjPkPFOlQG6wv+97+FKakyM+P+PvqMt6Q== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 32/41] net: phy: mscc: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:08 +0100 Message-Id: <20230319170317.27711-32-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: a3792c87ad3002e05dc X-MBO-RS-META: jdpu6pxhqakms44knn8ewkdkzw4d1qjw X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/mscc.c | 27 +++++++-------------------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index f9482b21a01..ef1761a8bda 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -1558,7 +1558,7 @@ static int vsc8502_config(struct phy_device *phydev) return 0; } -static struct phy_driver VSC8530_driver = { +U_BOOT_PHY_DRIVER(vsc8530) = { .name = "Microsemi VSC8530", .uid = PHY_ID_VSC8530, .mask = 0x000ffff0, @@ -1568,7 +1568,7 @@ static struct phy_driver VSC8530_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8531_driver = { +U_BOOT_PHY_DRIVER(vsc8531) = { .name = "Microsemi VSC8531", .uid = PHY_ID_VSC8531, .mask = 0x000ffff0, @@ -1578,7 +1578,7 @@ static struct phy_driver VSC8531_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8502_driver = { +U_BOOT_PHY_DRIVER(vsc8502) = { .name = "Microsemi VSC8502", .uid = PHY_ID_VSC8502, .mask = 0x000ffff0, @@ -1588,7 +1588,7 @@ static struct phy_driver VSC8502_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8540_driver = { +U_BOOT_PHY_DRIVER(vsc8540) = { .name = "Microsemi VSC8540", .uid = PHY_ID_VSC8540, .mask = 0x000ffff0, @@ -1598,7 +1598,7 @@ static struct phy_driver VSC8540_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8541_driver = { +U_BOOT_PHY_DRIVER(vsc8541) = { .name = "Microsemi VSC8541", .uid = PHY_ID_VSC8541, .mask = 0x000ffff0, @@ -1608,7 +1608,7 @@ static struct phy_driver VSC8541_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8574_driver = { +U_BOOT_PHY_DRIVER(vsc8574) = { .name = "Microsemi VSC8574", .uid = PHY_ID_VSC8574, .mask = 0x000ffff0, @@ -1618,7 +1618,7 @@ static struct phy_driver VSC8574_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver VSC8584_driver = { +U_BOOT_PHY_DRIVER(vsc8584) = { .name = "Microsemi VSC8584", .uid = PHY_ID_VSC8584, .mask = 0x000ffff0, @@ -1627,16 +1627,3 @@ static struct phy_driver VSC8584_driver = { .startup = &mscc_startup, .shutdown = &genphy_shutdown, }; - -int phy_mscc_init(void) -{ - phy_register(&VSC8530_driver); - phy_register(&VSC8531_driver); - phy_register(&VSC8502_driver); - phy_register(&VSC8540_driver); - phy_register(&VSC8541_driver); - phy_register(&VSC8574_driver); - phy_register(&VSC8584_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1542fe89252..c20e750aa16 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_MSCC - phy_mscc_init(); -#endif #ifdef CONFIG_PHY_FIXED phy_fixed_init(); #endif diff --git a/include/phy.h b/include/phy.h index fc8300d5d97..e4a3e10c48b 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_mscc_init(void); int phy_fixed_init(void); int phy_ncsi_init(void); int phy_xilinx_gmii2rgmii_init(void); From patchwork Sun Mar 19 17:03:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758719 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=j8KTu0oL; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=bxwchd4c; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkrH3XxRz1yWs for ; Mon, 20 Mar 2023 04:09:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5761585BFA; Sun, 19 Mar 2023 18:08:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="j8KTu0oL"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="bxwchd4c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D07185CA6; Sun, 19 Mar 2023 18:07:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0933785BAC for ; Sun, 19 Mar 2023 18:05:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PfklJ4zhjz9sc3; Sun, 19 Mar 2023 18:05:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=euqT65yXedau26WbmMSLdY9hWzf6yxSZXbsx8mlfxSo=; b=j8KTu0oL851t/EW/h7o7GAZuai8ge8C/UYtB2N36faxEyJ8q2rndg/FT/Va2K97BpAao6m piJl+TTMOxmRuaNnbz3FpP0M2ZbBepatdn33rDEaivU4m9wAwaiIAoOgpd+QhSFUNtoHpk 3nUkVXeqFkpEIcqVOyi2Vavmu4oTRph7UrZNxB/V7E3sm57X429j3vtSmVgYMf2d6ktvm1 Rl2o4l8ODV94YTI0EAzWbZFXBntpry2HDi5dkGRygzVXjSyOGczz/GFmMBxApyoDlMB0L+ w9t+Xo9yDrlxzcm/5d+dz1oe3LCFX5glZXbX/WOhRBSx8HysxZXXyEv/rqn0OA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=euqT65yXedau26WbmMSLdY9hWzf6yxSZXbsx8mlfxSo=; b=bxwchd4cjS4vwNlRaH5pZ2ZMbp7UxCjS1yolqwEFf8l6l+CzuLe2JI4vMfoERk2fqcBFue ppMUqx56KtuI2Lxt1mpx1aREsyvovKDHaBhBa6ljZODkF3ap/nlAb7bbsWF9pKUPIot9lS 7GbJ3H36LJFnzse4Fo702DgZVuwrMkPu+c+1fymOtesA3ehscWwOVn4ccQk3OMkMeFGnnB bMUSpZ5yirf7/34Tjk7J4ZkD6F4dewrURATdw7qWrycB/lT1Yb5Ohx0eGB75nJRhRYLZ6n iq5uEPu6jEeeC4zS8LRZi8HcRG7zs2PWdY0n2gNcLEALo6fgQ1VC4h+RQjtiew== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 33/41] net: phy: fixed: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:09 +0100 Message-Id: <20230319170317.27711-33-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: w5dsyyywngkaoxqan76rz1o455zpnrpw X-MBO-RS-ID: 2dcdfea9395537189bc X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/fixed.c | 8 +------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 1192915ee52..2f0823b8365 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -93,7 +93,7 @@ static int fixedphy_shutdown(struct phy_device *phydev) return 0; } -static struct phy_driver fixedphy_driver = { +U_BOOT_PHY_DRIVER(fixedphy) = { .uid = PHY_FIXED_ID, .mask = 0xffffffff, .name = "Fixed PHY", @@ -103,9 +103,3 @@ static struct phy_driver fixedphy_driver = { .startup = fixedphy_startup, .shutdown = fixedphy_shutdown, }; - -int phy_fixed_init(void) -{ - phy_register(&fixedphy_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index c20e750aa16..245357c31dc 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_FIXED - phy_fixed_init(); -#endif #ifdef CONFIG_PHY_NCSI phy_ncsi_init(); #endif diff --git a/include/phy.h b/include/phy.h index e4a3e10c48b..9cabfeedec8 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_fixed_init(void); int phy_ncsi_init(void); int phy_xilinx_gmii2rgmii_init(void); From patchwork Sun Mar 19 17:03:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758730 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=uxrA5Np+; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=S1en6Q9Y; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfktv0d31z2476 for ; Mon, 20 Mar 2023 04:12:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D0B285C95; Sun, 19 Mar 2023 18:09:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="uxrA5Np+"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="S1en6Q9Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D46485936; Sun, 19 Mar 2023 18:07:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [IPv6:2001:67c:2050:0:465::103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ECF8985C86 for ; Sun, 19 Mar 2023 18:05:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PfklM3130z9sbL; Sun, 19 Mar 2023 18:05:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rOTD3eEWGbgKjosuyJgEVsiGNpRMSo620KyZde1pqaw=; b=uxrA5Np+VWdXrYo9xLOyQyo3g4YL24WXfG1zRBn0zkF5+AAYFEF8QUKTejmm7gUjXhyZR5 JD7OZ5y+54pfGas2+8MSN5nX2cH3kc7E7xbaV4x4BJHshH7KQa67wf24YIH2d3QIsTkisL lcMX61KH//IV/oPAp8bCfIaTVUbFhWBXYuZMmeNTl2+DCsuayqGNpEJDiJL412HZR2Cz7L jkxzevuVKxj/z1VHlJITGR2TvUkygyJi4LuakNXONDkTsFe1zpGPKRtIcDXBWYQ8jZNgpT Y1WthtrnhG1/QuzVrFcsxWfoWq8OAMV0dYVwE2w60Sawe7szE2+Kijb92cWrAQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rOTD3eEWGbgKjosuyJgEVsiGNpRMSo620KyZde1pqaw=; b=S1en6Q9Y2mDtvvF2HjQAA2TWVP/lXiPj63QsKnj9WyWeiPij9oj7N9R5qBLrz4+rE6gtdf bX97dtuPksooS1fdoUZWRTyltnvrKGTFE57BWa/MVaoZJjh/9vhg2O/05rtEnjd8sDQ2Af 44/p+MQ3yD7IIXfVmIFH2CpOlDv2xNH1/HpMogw/KpxoCImIS1CaQOqF9/2oGE6aL+UxEh Y5i6YvERPWxWmUgy/c4bpCiQHxvA4hQanGSswteOkAOMrUk80pFM/uoI5+m7K0JFGZWBeG BJMv5tJpnlosfxSamECuufs1//FX3vuw3G/nLYi7igGzZA++Kb+Pys89uhxD5g== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 34/41] net: phy: ncsi: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:10 +0100 Message-Id: <20230319170317.27711-34-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 91fb76e8307fab7ecdd X-MBO-RS-META: pmogg377hpfeqsicfftyaswa436bfjsp X-Rspamd-Queue-Id: 4PfklM3130z9sbL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/ncsi.c | 8 +------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c index bb7ecebed38..eb3fd65bb47 100644 --- a/drivers/net/phy/ncsi.c +++ b/drivers/net/phy/ncsi.c @@ -881,7 +881,7 @@ int ncsi_shutdown(struct phy_device *phydev) return 0; } -static struct phy_driver ncsi_driver = { +U_BOOT_PHY_DRIVER(ncsi) = { .uid = PHY_NCSI_ID, .mask = 0xffffffff, .name = "NC-SI", @@ -891,9 +891,3 @@ static struct phy_driver ncsi_driver = { .startup = ncsi_startup, .shutdown = ncsi_shutdown, }; - -int phy_ncsi_init(void) -{ - phy_register(&ncsi_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 245357c31dc..69db79f79e0 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_NCSI - phy_ncsi_init(); -#endif #ifdef CONFIG_PHY_XILINX_GMII2RGMII phy_xilinx_gmii2rgmii_init(); #endif diff --git a/include/phy.h b/include/phy.h index 9cabfeedec8..001c998db47 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_ncsi_init(void); int phy_xilinx_gmii2rgmii_init(void); /** From patchwork Sun Mar 19 17:03:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758737 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=vtSnmdyU; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=t4gRq5kr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfkwM21msz2476 for ; Mon, 20 Mar 2023 04:13:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C62CD85C67; Sun, 19 Mar 2023 18:10:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="vtSnmdyU"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="t4gRq5kr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52B4785A57; Sun, 19 Mar 2023 18:07:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B9A4D85C98 for ; Sun, 19 Mar 2023 18:05:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PfklQ1t8jz9shP; Sun, 19 Mar 2023 18:05:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9d2tY+2sF6dwspdNJ4JcX6UQCy9A/20jq+njEP9bcBg=; b=vtSnmdyUxL3NeOwyCWgPgBCXE/4ZTAtRYN6KqOwCzCpM3A1hvjo/mMbK9vrAHjU1jRJLf+ 6ArgilAe2jxs8Spki3QSERXXEyXJ6FusSMxbeqZe0H46/fO2CQI8Zm4nIAkaAI5fu3Ym49 C15SHT0Ayn708sUcsMuX/fhFP8P5+OgRcY5EHwrf6rW7IoJcXZ1fzySnvxNEkpBjT01Lvi SSUQl0Q2z1sWEOO+F+H4lfCo/rXMSbvRchGw5ctQCD8KySyHgXpGFp3zS4dJep0sS9PPwk vs/4Onzu/Pfkq1omtaXZgtnk8n9iEsITDxbS2MlSum0myfO8e0x0sjIQwlV2pg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9d2tY+2sF6dwspdNJ4JcX6UQCy9A/20jq+njEP9bcBg=; b=t4gRq5kraDFVPaU4A6lcvalPeeHmwQIYZ+lq3CsUEcwj7BowIRGVkiyk5Mzlt305gQaUGT Dj/bYAd71jvY4481Nnj3iI/Bax8ce69BkbqNK9JWnRPmSX1NyOE+zMKU0h3eYWJ5dMOqRP nGNe3QmUYWRw0qxWk6RxR7IEkq8JfmdJIwB10pjA0pCu4dVN7f6UL0kDbVKp7MHjdM8sX6 uqFQfYvdgBWE/bv9ig2uHYZIL2lVvWjxxdI0L2Yskyb1TTRQZ4/ANEn71UtYEOH1b9qHHq hv9gEKKT1WTACXgixGdqvkf/0Cr1xvWDaCSDCqw7VfevI4GLstpa+xnAXaMWDw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 35/41] net: phy: xilinx-gmii2rgmii: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:11 +0100 Message-Id: <20230319170317.27711-35-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: ocy1bqiqxddq9fo55jq8imem7cg8xrtw X-MBO-RS-ID: c107015fcb5244ed4e2 X-Rspamd-Queue-Id: 4PfklQ1t8jz9shP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/xilinx_gmii2rgmii.c | 9 +-------- include/phy.h | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 69db79f79e0..9d5d1494616 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_XILINX_GMII2RGMII - phy_xilinx_gmii2rgmii_init(); -#endif genphy_init(); return 0; diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index 73762839565..0b7436a7e1e 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -124,7 +124,7 @@ static int xilinxgmiitorgmii_probe(struct phy_device *phydev) return 0; } -static struct phy_driver gmii2rgmii_driver = { +U_BOOT_PHY_DRIVER(gmii2rgmii) = { .name = "XILINX GMII2RGMII", .uid = PHY_GMII2RGMII_ID, .mask = 0xffffffff, @@ -135,10 +135,3 @@ static struct phy_driver gmii2rgmii_driver = { .writeext = xilinxgmiitorgmii_extwrite, .readext = xilinxgmiitorgmii_extread, }; - -int phy_xilinx_gmii2rgmii_init(void) -{ - phy_register(&gmii2rgmii_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index 001c998db47..df2586f89ea 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,8 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_xilinx_gmii2rgmii_init(void); - /** * U_BOOT_PHY_DRIVER() - Declare a new U-Boot driver * @__name: name of the driver From patchwork Sun Mar 19 17:03:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758714 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=bw131oNC; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=ojniq4/4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkq50pvWz1yWs for ; Mon, 20 Mar 2023 04:08:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0BB2385982; Sun, 19 Mar 2023 18:08:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="bw131oNC"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="ojniq4/4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 694E585CFA; Sun, 19 Mar 2023 18:07:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D87BD85CB5 for ; Sun, 19 Mar 2023 18:05:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PfklT1yQcz9scl; Sun, 19 Mar 2023 18:05:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kaQ2FIoGmMea0G4ffBFMVgc7YEciVf19DWeF+S9F8ow=; b=bw131oNChW9GeVwkI3cjJrhinjk1L6JWWbvitFeeX/MSyTxoLBqda+Yru8LJULDrNPWXqF 4z1GDarJudoPFJBxsXqqUtEyJY5YOrL/3/BTrj3+PyMh//WQj1p7dlLmnci779NvG9mQCm YmqvEbc5jtjWIeU3Re27BimvqBRakh3KoV3TsVInCJlPZ8evqp/QR6ce3yiNO/MjrmWl+2 mdKs9Z5izQhP1EeBy1uZFL8PGm2+Kg4waw8i1bqrr3jqaD5zJp+REVhJRPfgdYjpqFFhGF PmGj36+bZz1qnLXC8MyHO9z0XYTGghH4JoxCrHMPK0Cffglc6XeBLHoQEdqcbw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kaQ2FIoGmMea0G4ffBFMVgc7YEciVf19DWeF+S9F8ow=; b=ojniq4/4TVXpx0+dqlKeJuXHsqvUQuhHzET5MxoPrRoNiJ2X2Ha5Qzf4nlKD9Qa6XNEO29 n60YdWR+khjXB6cyNLfgO8+ormlfcvHdSSBlpIn+bKi1DrRiM0sEEAhzO2VxNTOLBiHF9y 5TJCd9sQcPTaaBivfVOrMLTNXToWF1/hQYH5VJFmQk9cvssSvxKEqVimnQmfGYgSmUI5m0 kJRNQJmihOISxgVdeZyDXo4CcAmV/P/y5SVQzYioOp5ZrgdyrKDx8JGQ81vcgN3oQTUWI9 vLE9387rQMYQPTd7tcRHiTdgxhm8IytSJhv/XcIeAR15f/QPB3/9x++7BLyISQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 36/41] net: phy: genphy: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:12 +0100 Message-Id: <20230319170317.27711-36-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: d90fa76044949b9c6ec X-MBO-RS-META: q5odx61rwmnmenorfy9xura7jfeczyak X-Rspamd-Queue-Id: 4PfklT1yQcz9scl X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 9d5d1494616..b1e9861c6f3 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -451,7 +451,7 @@ int genphy_shutdown(struct phy_device *phydev) return 0; } -static struct phy_driver genphy_driver = { +U_BOOT_PHY_DRIVER(genphy) = { .uid = 0xffffffff, .mask = 0xffffffff, .name = "Generic PHY", @@ -463,11 +463,6 @@ static struct phy_driver genphy_driver = { .shutdown = genphy_shutdown, }; -static int genphy_init(void) -{ - return phy_register(&genphy_driver); -} - static LIST_HEAD(phy_drivers); #ifdef CONFIG_NEEDS_MANUAL_RELOC @@ -514,8 +509,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif - genphy_init(); - return 0; } @@ -576,7 +569,7 @@ static struct phy_driver *generic_for_phy(struct phy_device *phydev) return &gen10g_driver; #endif - return &genphy_driver; + return ll_entry_get(struct phy_driver, genphy, phy_driver); } static struct phy_driver *get_phy_driver(struct phy_device *phydev) From patchwork Sun Mar 19 17:03:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758739 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=uYhFQ8h1; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=dbCNpNxD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkwl3QGNz2476 for ; Mon, 20 Mar 2023 04:13:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EAF4A85D4A; Sun, 19 Mar 2023 18:10:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="uYhFQ8h1"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="dbCNpNxD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 325A485935; Sun, 19 Mar 2023 18:07:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BF15F85B86 for ; Sun, 19 Mar 2023 18:05:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PfklX0VcBz9sc3; Sun, 19 Mar 2023 18:05:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PE9FNZtK7usLaV+fTcW0VuU7FKFr9OnKgiIC6WJO07c=; b=uYhFQ8h1DpjbRZCabWgT/vPfvtPl6fRDYUQl0WyuKPAgPup/BHhPONrM6odVVJewdJdyNq l1Gqy6n3Ev3FKsxnV5T2R5lrllVMD3NrDW3Iu/jmdbyiEekIgWl8HNY21q0e+Mnt7pdo0S 8ZFDq90PGPYMuQcL9ji9Bkb8PuIeMgbShwf6LMZRiBaCs78kxsM3avmaC/6AstKds5jwuc mrh8WNSeeMKnUl2ir7LPWFcDmoa8DbPhzJzKr3pQzsiZMwva0MMx0MSAE0kd9X2xSgTeGu ZCT24X3JY102Msnkl0HXn5ImmvL+xGU4YZTH+DIYknpsI+5mu9lDbPVAIoIhUQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PE9FNZtK7usLaV+fTcW0VuU7FKFr9OnKgiIC6WJO07c=; b=dbCNpNxD8IYZVZ/7ai+SL33linoP7TcUrOhsaQ+Py9rqfXKjfFk2ruiKkIYAlqfpFiwSLL D0KXKuf4VeLXrQvo/OubrGaPh1vVtaub8sFFf8x6LesqwWJDgpbtHNCGM0aYPQHHsxkpmk rdpdfcaEVL3DEGd2LE8hCbPGdfpNyY0+Mqt/MLlhlHbS5HuPcmVTqqX0eDp0wa0njPK/nr IC/M+Pm83U5jXcykZJbcpw6W0VVqW43397VXtLrbM1HFqpRYGECVjjuoVwhjyZsKzr+eaz h8ku6hBqZ2T3rx1pujQ+If3kgUnzjQQyqb6+U4wazJhD5Fn9ByVm3faGoMJtPA== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 37/41] net: phy: gen10g: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:13 +0100 Message-Id: <20230319170317.27711-37-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 5801bc10063ada1c7f2 X-MBO-RS-META: cfiq858xtkkdm4tgkk5t6ttjxro6j3ct X-Rspamd-Queue-Id: 4PfklX0VcBz9sc3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/generic_10g.c | 2 +- drivers/net/phy/phy.c | 2 +- include/phy.h | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c index b4384e1f781..34ac51ea070 100644 --- a/drivers/net/phy/generic_10g.c +++ b/drivers/net/phy/generic_10g.c @@ -80,7 +80,7 @@ int gen10g_config(struct phy_device *phydev) return gen10g_discover_mmds(phydev); } -struct phy_driver gen10g_driver = { +U_BOOT_PHY_DRIVER(gen10g) = { .uid = 0xffffffff, .mask = 0xffffffff, .name = "Generic 10G PHY", diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index b1e9861c6f3..bd9c576f459 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -566,7 +566,7 @@ static struct phy_driver *generic_for_phy(struct phy_device *phydev) { #ifdef CONFIG_PHYLIB_10G if (phydev->is_c45) - return &gen10g_driver; + return ll_entry_get(struct phy_driver, gen10g, phy_driver); #endif return ll_entry_get(struct phy_driver, genphy, phy_driver); diff --git a/include/phy.h b/include/phy.h index df2586f89ea..5f4967cb150 100644 --- a/include/phy.h +++ b/include/phy.h @@ -173,10 +173,6 @@ struct fixed_link { int asym_pause; }; -#ifdef CONFIG_PHYLIB_10G -extern struct phy_driver gen10g_driver; -#endif - /** * phy_init() - Initializes the PHY drivers * This function registers all available PHY drivers From patchwork Sun Mar 19 17:03:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758723 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=uFES4EfI; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=s7MgWz1k; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfksB15w5z2476 for ; Mon, 20 Mar 2023 04:10:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 87A3C85CA6; Sun, 19 Mar 2023 18:08:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="uFES4EfI"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="s7MgWz1k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAF5085BAC; Sun, 19 Mar 2023 18:07:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6DC6F85CC3 for ; Sun, 19 Mar 2023 18:05:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pfklb0lyvz9sck; Sun, 19 Mar 2023 18:05:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sjtyAuvcENnxlgmYHasIyfbJeEI2PMbyrRzxX/tZBp8=; b=uFES4EfIn6D+9fH4r/sdTQkM6HV1btpslXcnI8CUJtqYSzYJuXExJRaGXhsIzGN+U/Muqu xzwpKk3n/MRTN5yN0ttNYiUX2/pfoNPTfuEBJzAgfg+nnpJluaURveze5zETEfHVcO4jX/ jpfMCte+Kaiww0QRbL9SIKvhzQSdK3G9Y1oB1NejK1MeBue8HVF6fRyKUKO1fx867A6+E+ SXuss1op7eBwo2Pqk8EqN9Z4Y37M7ON2/pn1fEPStQPSkCEP+bSdW81qWViUyA/ymZU2nO +emUmhWF7u71dYn9dmHLB2JORUivdaXeA568WvpZYgRaeh18QDh2tz5WlWP9Qg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sjtyAuvcENnxlgmYHasIyfbJeEI2PMbyrRzxX/tZBp8=; b=s7MgWz1kKU56KMSBwq9lx7MngYu4T9LFI6/J9dNfxcSuRATiKeDq4pojy1cV2Tkv5cLRfk hWgkOgS+7Bf/tTxK4Ye7/xyqytQ1u54MAAwDo9u0slx7v5cbYtcMT+m6c70ME6tKW1i5lI fSzG2nF54RpMgEmaJSUj3TPRegtrOYTzsvRVOwUl/LrLfJxJkSsAzGTY0RuGWNcy8Fyh2c 8tjHXNIxudW3R7QSNBSfow7a47MU0R3Feqdunla3dBaG/DkI4UxUgNduYspAasmZDsh5Ex nbWeWYw2Kb6218GAzFdtzm+XNk9EIyjxoEeC/qFSZr8NgsCPBkoKuQM/4xtugQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 38/41] net: phy: Drop static phy_drivers list Date: Sun, 19 Mar 2023 18:03:14 +0100 Message-Id: <20230319170317.27711-38-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: f9382bb497d01967427 X-MBO-RS-META: 5sn4meb3jbara1hcbqfgmont9wfygh3u X-Rspamd-Queue-Id: 4Pfklb0lyvz9sck X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The static phy_drivers list is superseded by linker list of struct phy_drivers now that all drivers have been converted to the later. Drop the phy_drivers list as well as list_head from struct phy_driver. Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 26 ++------------------------ include/phy.h | 2 -- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index bd9c576f459..f4aa1f664cb 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -463,8 +463,6 @@ U_BOOT_PHY_DRIVER(genphy) = { .shutdown = genphy_shutdown, }; -static LIST_HEAD(phy_drivers); - #ifdef CONFIG_NEEDS_MANUAL_RELOC static void phy_drv_reloc(struct phy_driver *drv) { @@ -493,16 +491,6 @@ int phy_init(void) const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver); struct phy_driver *drv, *ll_entry; - /* - * The pointers inside phy_drivers also needs to be updated incase of - * manual reloc, without which these points to some invalid - * pre reloc address and leads to invalid accesses, hangs. - */ - struct list_head *head = &phy_drivers; - - head->next = (void *)head->next + gd->reloc_off; - head->prev = (void *)head->prev + gd->reloc_off; - /* Perform manual relocation on linker list based PHY drivers */ ll_entry = ll_entry_start(struct phy_driver, phy_driver); for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) @@ -514,9 +502,6 @@ int phy_init(void) int phy_register(struct phy_driver *drv) { - INIT_LIST_HEAD(&drv->list); - list_add_tail(&drv->list, &phy_drivers); - #ifdef CONFIG_NEEDS_MANUAL_RELOC phy_drv_reloc(drv); #endif @@ -575,16 +560,9 @@ static struct phy_driver *generic_for_phy(struct phy_device *phydev) static struct phy_driver *get_phy_driver(struct phy_device *phydev) { const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver); - struct phy_driver *ll_entry; - struct list_head *entry; int phy_id = phydev->phy_id; - struct phy_driver *drv = NULL; - - list_for_each(entry, &phy_drivers) { - drv = list_entry(entry, struct phy_driver, list); - if ((drv->uid & drv->mask) == (phy_id & drv->mask)) - return drv; - } + struct phy_driver *ll_entry; + struct phy_driver *drv; ll_entry = ll_entry_start(struct phy_driver, phy_driver); for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) diff --git a/include/phy.h b/include/phy.h index 5f4967cb150..5e8ae5e29aa 100644 --- a/include/phy.h +++ b/include/phy.h @@ -125,8 +125,6 @@ struct phy_driver { int (*write_mmd)(struct phy_device *phydev, int devad, int reg, u16 val); - struct list_head list; - /* driver private data */ ulong data; }; From patchwork Sun Mar 19 17:03:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758716 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=Frn/i4qu; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=ZelCg90y; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkqd4bT7z1yWs for ; Mon, 20 Mar 2023 04:09:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7107585A48; Sun, 19 Mar 2023 18:08:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="Frn/i4qu"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="ZelCg90y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7BD1F85CCA; Sun, 19 Mar 2023 18:07:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 129C885D00 for ; Sun, 19 Mar 2023 18:05:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pfkld51NHz9sZL; Sun, 19 Mar 2023 18:05:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=coJL793MVfgDnaZb7xSFveHjas2z73I+RxXUMjwtNUY=; b=Frn/i4qud6evxmVA2CqfEuTqETQENOTcPbudyan/iSXAp/ZTL1QWUA3yGvy7Om1XZRATq9 19C5w2Qvjs/NdbLt6YGs5hTtBKXwO/+sqOcfYqY/678+rSavDphU2DDdwLDOYPHyW161he Hr8pMiRh0yd8zqx1EEdJdhdKKm/HhAW9DDbUrUBWSKAav+QDiDs3kzSNv91OlXwIyiBCrQ IkVU/n6LD5RGY0PGPbgujUV4scl0h7JZ2xFI/h0V/lgG91piR8+J2Ijneond0bxWWw4SP9 0c9XWCB1DYe0mjoIJdnVotTsB55gXYC5SW5/4vi/DuOtwR92f7VUDISioBzylg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=coJL793MVfgDnaZb7xSFveHjas2z73I+RxXUMjwtNUY=; b=ZelCg90ywMLgDIk3HHaT6DBtPnsl+99gwgph+K3jeaUb7WniGKv6B/eXOeAadPXRyioCuO mXGm/u4Jvtu4Io9NmkrZ4XepR5I54Gl2R+Keph6hdk30QGKuzlkKZULjAjekEbAhjTaiLe St4P4z/teoLsKr7VwIzo4cqYH5VlZlBjElxS5XY9AAUc09h8BXc0MR8/n4klMwAKERE9Nu rRIkV21aLB9rdB3eeXeYN8oPP2miDUGRgVkp8HG3VOnOUGK5m6fAb645oCQ5d+9jeNY/U/ puszSU2LAurU93OV9KJtArfuDvadOsgffjfu2MZ8gTneIydS9TPHW8fanvJjUw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 39/41] net: phy: Drop unused phy_register() Date: Sun, 19 Mar 2023 18:03:15 +0100 Message-Id: <20230319170317.27711-39-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 54773c0d2e8deb40eef X-MBO-RS-META: ig3z66aphmneg69gkaogpxqbxizqfg6y X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This function is no longer used, drop it. Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 8 -------- include/phy.h | 1 - 2 files changed, 9 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index f4aa1f664cb..15da9a80de2 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -500,14 +500,6 @@ int phy_init(void) return 0; } -int phy_register(struct phy_driver *drv) -{ -#ifdef CONFIG_NEEDS_MANUAL_RELOC - phy_drv_reloc(drv); -#endif - return 0; -} - int phy_set_supported(struct phy_device *phydev, u32 max_speed) { /* The default values for phydev->supported are provided by the PHY diff --git a/include/phy.h b/include/phy.h index 5e8ae5e29aa..4a9de461152 100644 --- a/include/phy.h +++ b/include/phy.h @@ -293,7 +293,6 @@ int phy_clear_bits_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val int phy_startup(struct phy_device *phydev); int phy_config(struct phy_device *phydev); int phy_shutdown(struct phy_device *phydev); -int phy_register(struct phy_driver *drv); int phy_set_supported(struct phy_device *phydev, u32 max_speed); int phy_modify(struct phy_device *phydev, int devad, int regnum, u16 mask, u16 set); From patchwork Sun Mar 19 17:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758735 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=MEaH8Ne2; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=i3SR94DS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfkvx4fQwz2476 for ; Mon, 20 Mar 2023 04:13:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 82DB185D15; Sun, 19 Mar 2023 18:10:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="MEaH8Ne2"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="i3SR94DS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4DF9985C45; Sun, 19 Mar 2023 18:07:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E32A085D0B for ; Sun, 19 Mar 2023 18:05:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfklh2xzDz9scX; Sun, 19 Mar 2023 18:05:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TO+62RtQhfcAj4sqHVhclxl8P7FZWAnOMGmeuuR3W9A=; b=MEaH8Ne2+xyWkKufjqxRwtcfcz3nHEfofSGuH4tpiNPF520k0aMpuA2Wh772XIU25TmMfw HYlXxMIZMwART6TIFfCH7R6mob+rQv5By7RkOHF+ToI5LVvTWUaXnItNJSpW3+/Im5gYes 8bRers1Xbr1WTygbQZN+30OMPt2z9xEmDDCdYacDM9qgxeNFKoG0B7aeOME7FufondyuXj 4iqEc1glB3qfHaCXLJ134EIrDP27tylZ9EMrQxNnXcIErrcpO3PX9iY2TqzQQnNe8csHCE 2/fjCRfR3uRcgr/VWg2B7KJijO4id4mNafkq2o/BWPrKqjDDJRDTD76yc5GpPg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TO+62RtQhfcAj4sqHVhclxl8P7FZWAnOMGmeuuR3W9A=; b=i3SR94DS9ybvQjSsj8Yevmss0Y+e2qRM+7LxBzhhgX59oLmKfDc5uwfdjZCgNEf8b837Gy QodUj8y3K4corjh8MDS8HrYJtLEXk7oepMfrCQZJHk04+k9e+MgRHoprQVws15p80wakUx 3uND0rWQXIKh+BJONzM6m85Mig7087kca/fF23yU0ixEvaGORRmuGASOFNXJ3qmBBU2q3a ku8EGvbmMrD2XR1MreRSGrNmmhYiKmzwun+QOFDSV2UhRfUFggv22thFAAYB+mbzuEQHk9 C4Z/IlTnWXYntsMdwyvIzl1YxJ2m4QLlvhmkH7z1Peawcq+Flhs1ojhe0WItLw== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 40/41] net: phy: Re-inline phy_drv_reloc() Date: Sun, 19 Mar 2023 18:03:16 +0100 Message-Id: <20230319170317.27711-40-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: b463828afc8e1d448b2 X-MBO-RS-META: fq7414aznuumphiuymt5dt5zd113ik51 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Wrap phy_drv_reloc() back into phy_init() to reduce ifdeffery, since phy_drv_reloc() is now called only from one call site. No functional change. Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 15da9a80de2..61603f28179 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -463,28 +463,6 @@ U_BOOT_PHY_DRIVER(genphy) = { .shutdown = genphy_shutdown, }; -#ifdef CONFIG_NEEDS_MANUAL_RELOC -static void phy_drv_reloc(struct phy_driver *drv) -{ - if (drv->probe) - drv->probe += gd->reloc_off; - if (drv->config) - drv->config += gd->reloc_off; - if (drv->startup) - drv->startup += gd->reloc_off; - if (drv->shutdown) - drv->shutdown += gd->reloc_off; - if (drv->readext) - drv->readext += gd->reloc_off; - if (drv->writeext) - drv->writeext += gd->reloc_off; - if (drv->read_mmd) - drv->read_mmd += gd->reloc_off; - if (drv->write_mmd) - drv->write_mmd += gd->reloc_off; -} -#endif - int phy_init(void) { #ifdef CONFIG_NEEDS_MANUAL_RELOC @@ -493,8 +471,24 @@ int phy_init(void) /* Perform manual relocation on linker list based PHY drivers */ ll_entry = ll_entry_start(struct phy_driver, phy_driver); - for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) - phy_drv_reloc(drv); + for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) { + if (drv->probe) + drv->probe += gd->reloc_off; + if (drv->config) + drv->config += gd->reloc_off; + if (drv->startup) + drv->startup += gd->reloc_off; + if (drv->shutdown) + drv->shutdown += gd->reloc_off; + if (drv->readext) + drv->readext += gd->reloc_off; + if (drv->writeext) + drv->writeext += gd->reloc_off; + if (drv->read_mmd) + drv->read_mmd += gd->reloc_off; + if (drv->write_mmd) + drv->write_mmd += gd->reloc_off; + } #endif return 0; From patchwork Sun Mar 19 17:03:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1758726 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=SOQsGg9N; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.a=rsa-sha256 header.s=mail20150812 header.b=odKlLl3i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pfksv1Clyz2476 for ; Mon, 20 Mar 2023 04:11:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78C8B85C9A; Sun, 19 Mar 2023 18:09:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="SOQsGg9N"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="odKlLl3i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC68385C86; Sun, 19 Mar 2023 18:07:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5893785D03 for ; Sun, 19 Mar 2023 18:05:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pfkll059Vz9sdJ; Sun, 19 Mar 2023 18:05:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AmdNxOH7X2USgl9u/7HJx1CbSu8ql6GgwvGxRolK8GQ=; b=SOQsGg9NRA3dfg2EefmXm7w4RpAGxTiyndTlBU1pY2jxtJmSekyWQHnkf8J14sWV9mRSSB 6Lb+aRVbir8+6HLGlDs9b1U0Q7rkXB0UbdYM60AeM8ZH9+b15462tUhfT2vtrcXN3tHrMm yg99KXtaPuetV7I8zFLb/NRXFBspRC3kQvYh+MjYBgAZLLescTmjk06U51/19gpM/H59TH Z9YhuHxYq5xCnKDhepuO0/RquW0Or1nWAVtMckrF5oEXv4CkziNJqsTQMI9utI4Zum7Ysc +Kv2fqIoEYSyNCibSgj5GuDzxv5H3pe4HbioeZmcLUr7kPZXvEFA/lmSSUyZHA== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AmdNxOH7X2USgl9u/7HJx1CbSu8ql6GgwvGxRolK8GQ=; b=odKlLl3ixnpOSfT+ChBpkRZ7craO0BnFSIWi72auF2mAolPpZGBmpQjOuu5lDy3k94kWmZ fOuqY+baTqmxsNq+wx/6eslLcyDY24/BaxWtoXRBtsspTkUcpvOFjyc4Vrv8NYqvHXSVTK pwFa3waqVFLaD9owenXtM7uBDR6x0nMV04lDl06TPaeLRksszMJHByf1EGkHaqGOztSzFn tFJTz5g+HltmhFj8L9u0j6Cgq1u6tVlSHZFx85ZgNE3djppzuAxiA3Gz1/4nCme63O5YDU rPWWUQOUWr5yMnAzg4VWZIFmCKED8xky8P6V8Nj0FdtgmvUERp1l0abl5WqMcQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?utf-8?q?C=C3=A9dr?= =?utf-8?q?ic_Le_Goater?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 41/41] net: phy: Only call phy_init() on systems needing manual relocation Date: Sun, 19 Mar 2023 18:03:17 +0100 Message-Id: <20230319170317.27711-41-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: c44e790ae0186e0d91f X-MBO-RS-META: ee6tyi1f7eru5pibbskfisp1h6om311n X-Rspamd-Queue-Id: 4Pfkll059Vz9sdJ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The phy_init() is now used only to perform manual relocation of PHY driver callbacks. Wrap it in ifdeffery and only call it on systems which still require manual relocation, i.e. m68k . Signed-off-by: Marek Vasut Reviewed-by: Ramon Fried --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 4 ++-- net/eth_common.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 61603f28179..9b0e497f223 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -463,9 +463,9 @@ U_BOOT_PHY_DRIVER(genphy) = { .shutdown = genphy_shutdown, }; +#ifdef CONFIG_NEEDS_MANUAL_RELOC int phy_init(void) { -#ifdef CONFIG_NEEDS_MANUAL_RELOC const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver); struct phy_driver *drv, *ll_entry; @@ -489,10 +489,10 @@ int phy_init(void) if (drv->write_mmd) drv->write_mmd += gd->reloc_off; } -#endif return 0; } +#endif int phy_set_supported(struct phy_device *phydev, u32 max_speed) { diff --git a/net/eth_common.c b/net/eth_common.c index 82d527abba6..c94a7ba6ae7 100644 --- a/net/eth_common.c +++ b/net/eth_common.c @@ -37,7 +37,7 @@ void eth_common_init(void) miiphy_init(); #endif -#ifdef CONFIG_PHYLIB +#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_PHYLIB) phy_init(); #endif #endif