From patchwork Wed Oct 19 15:03:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13012005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E10EFC4332F for ; Wed, 19 Oct 2022 15:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JS+fvMPd4mw75Kjip3sGZrQeVXnJYnHG11Iz6x7WoYQ=; b=F5mKOG4K+Zqple lQX9mCY1ai0DNH0WHaiOuUOmvGVFX1Zt8X2x06jgDTMgE4CYhQNz6JZgyA7JHC6CHtHeB9sp4YUqO SvTUurVtAPaalhRpcGG84H40YmaOaMLMwOpILy6pfIrlJYOJ9nKc3sB7/ngEnNoYJSGCuLyNqzpt5 kFHNagfDnFr2xsxl/eXupq9orn+FyADD/3EzXr7vF934ba3DLe4qgHWkl8Ig6+twgu9PXQfduTGji my7DbQ9xn0oW9mbNyNWlRewu3J2D/rxrwNoEow8koWHkmLNazgSCZGMMHXDXP5ydWNL6+MBvTg9Dc +gfQngCTWV1orccdaHSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olAyL-003Eyy-5V; Wed, 19 Oct 2022 15:27:09 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olAii-0035tz-3x for linux-arm-kernel@lists.infradead.org; Wed, 19 Oct 2022 15:11:02 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B807EB824A5; Wed, 19 Oct 2022 15:10:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2010BC433C1; Wed, 19 Oct 2022 15:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666192257; bh=5xA6B6Lhx1HQ5zgGPm0eHA4kLMFysAAeoFzT5uQjs8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HymqCo6Wgbr9158vual4dtY6Z6kWTheel++NX6FxkCDLDPz/WtOfVkY6pPK0X8uIG BZ96t2SpLpDVwZW/1dCg+JX60hiU7+EFrNJSniwPjabX+qdr0fVhMM2Ch9Sudgn0GZ WngN9wQqMCPg6JUuJ4LtNl369yP2Eh7PNbbehbQyMGNWqFETXrtIAAKxAWGk/6yw4M w1zZThnWioAUzYgLmpWGFY+GVY5iXPBSTq5IhETugIBnLxnU4r/iAwJ76A4p0rFURW ujP3ZP5IuAyHvVboSDPwXoXqam013eYLrLVgrPyyrgXwp1vIFiRzJpZnsUYYdXQ7Ta 76wkNub2AdcJw== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Andrew Lunn , Sebastian Hesselbarth , Gregory Clement Cc: linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 08/17] ARM: orion5x: remove dsa_chip_data references Date: Wed, 19 Oct 2022 17:03:30 +0200 Message-Id: <20221019150410.3851944-8-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20221019150410.3851944-1-arnd@kernel.org> References: <20221019144119.3848027-1-arnd@kernel.org> <20221019150410.3851944-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221019_081100_504716_DE3ABC28 X-CRM114-Status: GOOD ( 14.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann This is no longer used anywhere, which means we can kill off one link to gpio numbers. Cc: Andrew Lunn Signed-off-by: Arnd Bergmann --- arch/arm/mach-orion5x/common.c | 10 -------- arch/arm/mach-orion5x/common.h | 2 -- arch/arm/plat-orion/common.c | 31 ----------------------- arch/arm/plat-orion/include/plat/common.h | 3 --- 4 files changed, 46 deletions(-) diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 2e711b7252c6..df056d60b675 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -100,15 +99,6 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) } -/***************************************************************************** - * Ethernet switch - ****************************************************************************/ -void __init orion5x_eth_switch_init(struct dsa_chip_data *d) -{ - orion_ge00_switch_init(d); -} - - /***************************************************************************** * I2C ****************************************************************************/ diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index eb96009e21c4..f2e0577bf50f 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h @@ -4,7 +4,6 @@ #include -struct dsa_chip_data; struct mv643xx_eth_platform_data; struct mv_sata_platform_data; @@ -42,7 +41,6 @@ void orion5x_setup_wins(void); void orion5x_ehci0_init(void); void orion5x_ehci1_init(void); void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data); -void orion5x_eth_switch_init(struct dsa_chip_data *d); void orion5x_i2c_init(void); void orion5x_sata_init(struct mv_sata_platform_data *sata_data); void orion5x_spi_init(void); diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 8647cb80a93b..cabe98386245 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -468,36 +467,6 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data, eth_data, &orion_ge11); } -#ifdef CONFIG_ARCH_ORION5X -/***************************************************************************** - * Ethernet switch - ****************************************************************************/ -static __initdata struct mdio_board_info orion_ge00_switch_board_info = { - .bus_id = "orion-mii", - .modalias = "mv88e6085", -}; - -void __init orion_ge00_switch_init(struct dsa_chip_data *d) -{ - unsigned int i; - - if (!IS_BUILTIN(CONFIG_PHYLIB)) - return; - - for (i = 0; i < ARRAY_SIZE(d->port_names); i++) { - if (!strcmp(d->port_names[i], "cpu")) { - d->netdev[i] = &orion_ge00.dev; - break; - } - } - - orion_ge00_switch_board_info.mdio_addr = d->sw_addr; - orion_ge00_switch_board_info.platform_data = d; - - mdiobus_register_board_info(&orion_ge00_switch_board_info, 1); -} -#endif - /***************************************************************************** * I2C ****************************************************************************/ diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index 3647d3b33c20..d2aad95d20cb 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h @@ -12,7 +12,6 @@ #include #include -struct dsa_chip_data; struct mv_sata_platform_data; void __init orion_uart0_init(void __iomem *membase, @@ -57,8 +56,6 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data, unsigned long mapbase, unsigned long irq); -void __init orion_ge00_switch_init(struct dsa_chip_data *d); - void __init orion_i2c_init(unsigned long mapbase, unsigned long irq, unsigned long freq_m);