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: 5679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp384908wrs; Wed, 19 Oct 2022 08:21:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6aP1rafD4OBWDwf8nZ/N3e+xVrE8UK/zEZ/qjaguXbqZgD9mqSYFpD24ZtRvo3evJACYnZ X-Received: by 2002:a05:6402:4303:b0:45c:cd3d:f5 with SMTP id m3-20020a056402430300b0045ccd3d00f5mr7957365edc.188.1666192891987; Wed, 19 Oct 2022 08:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192891; cv=none; d=google.com; s=arc-20160816; b=ORfR1KwS1oGc+efUXiN+hcFaEvFasFR8UE4Nbdpbc/YjrA3qW7+ocdTs9fviAB9qfN K9cx6GfBfiZWEPAcbBFTwqlYg2CnycFa4Wt+D4wS5x8komzsj49N1Sk8OJUyyctfGdzf DXnvDLj4UnVUfPsgrOqAH6RQVMxGBQeJHAUjPAZ/JYD9SoWsWY1FiGs4a8whcQyoFMB0 x5jnTEP2kXmuAmtstIvi1ylbrweJisiSumtdAiIC0og8ujMuKaAdJE3j6LihQoyEZ8GS rFNXu2JmOypZyN7iwfkmoslT7dhofarYvx5SM9a9C2ChSLalFrLx1pESOLluCqrXw6yv dssA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hxGfj6i1aW+8omFWsxriZaULLo+YfXXsdcDp3gJHBjE=; b=Rnl0fjB9DRClJCUqcX6SXDl9o+e/llhfdMfSwZw3vP1AH9Ee+UjTf0Aqwrm7MPZZ0j 5gdgWr58guuROMTcOCvLWrY+EUATX8HXgUl2Q3AJ/k05GnQxS812zC0mn32rS9PVfouo udh5JIFfsar/HPjXGXOmmlKOakEEDzdLEUsz+WRMAmvFid+w07lRLOtLgwOUDvcc1j0I DqTG6l5xBfxGkypR5EUuQvilZpwE2oBK/Nju6AcGsuCf1Clkc3CRxozK6YHLPmSvw/IX 079ArXrNwqCCbrLv1OM8TjS/cF+EFpFOjSBPv2nwIreCFDSzcVsExZqONvqJ6yCNz+gZ 0H6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HymqCo6W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w7-20020a05640234c700b0045cfa0b1f46si16330717edc.11.2022.10.19.08.21.06; Wed, 19 Oct 2022 08:21:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HymqCo6W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231633AbiJSPTj (ORCPT + 99 others); Wed, 19 Oct 2022 11:19:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232609AbiJSPTG (ORCPT ); Wed, 19 Oct 2022 11:19:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B5B61D5E37 for ; Wed, 19 Oct 2022 08:12:41 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 1B4DC61908 for ; 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-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129878257831015?= X-GMAIL-MSGID: =?utf-8?q?1747129878257831015?= 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);