From: Arnd Bergmann <arnd@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Gregory Clement <gregory.clement@bootlin.com>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 08/17] ARM: orion5x: remove dsa_chip_data references
Date: Wed, 19 Oct 2022 17:03:30 +0200 [thread overview]
Message-ID: <20221019150410.3851944-8-arnd@kernel.org> (raw)
In-Reply-To: <20221019150410.3851944-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
This is no longer used anywhere, which means we can kill off
one link to gpio numbers.
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <linux/delay.h>
#include <linux/clk-provider.h>
#include <linux/cpu.h>
-#include <linux/platform_data/dsa.h>
#include <asm/page.h>
#include <asm/setup.h>
#include <asm/system_misc.h>
@@ -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 <linux/reboot.h>
-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 <linux/clkdev.h>
#include <linux/mv643xx_eth.h>
#include <linux/mv643xx_i2c.h>
-#include <linux/platform_data/dsa.h>
#include <linux/platform_data/dma-mv_xor.h>
#include <linux/platform_data/usb-ehci-orion.h>
#include <plat/common.h>
@@ -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 <linux/mv643xx_eth.h>
#include <linux/platform_data/usb-ehci-orion.h>
-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);
--
2.29.2
next prev parent reply other threads:[~2022-10-19 15:19 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 14:40 [PATCH 00/17] ARM: remove old board files Arnd Bergmann
2022-10-19 15:03 ` [PATCH 01/17] ARM: at91: remove stale MAINTAINER file entries Arnd Bergmann
2022-10-19 15:03 ` [PATCH 02/17] ARM: cns3xxx: remove entire platform Arnd Bergmann
2022-10-21 7:19 ` Krzysztof Hałasa
2022-10-19 15:03 ` [PATCH 03/17] mmc: remove cns3xxx driver Arnd Bergmann
2022-10-20 10:36 ` Ulf Hansson
2022-10-19 15:03 ` [PATCH 04/17] ARM: ep93xx: remove old board files Arnd Bergmann
2022-10-20 17:08 ` Alexander Sverdlin
2022-10-19 15:03 ` [PATCH 05/17] ASoC: remove unused ep93xx files Arnd Bergmann
2022-10-19 15:30 ` Mark Brown
2022-10-19 15:03 ` [PATCH 06/17] ARM: mv78xx0: un-deprecate Terastation WXL Arnd Bergmann
2022-10-19 15:03 ` [PATCH 07/17] ARM: orion: remove unused board files Arnd Bergmann
2022-10-19 15:03 ` Arnd Bergmann [this message]
2022-10-19 15:03 ` [PATCH 09/17] ARM: iop32x: remove the platform Arnd Bergmann
2022-10-19 16:29 ` Dan Williams
2022-10-19 19:30 ` Wolfram Sang
2022-10-19 15:03 ` [PATCH 10/17] dmaengine: remove iop-adma driver Arnd Bergmann
2022-10-19 16:30 ` Dan Williams
2022-10-19 16:56 ` Vinod Koul
2022-10-19 15:03 ` [PATCH 11/17] gpio: remove iop driver Arnd Bergmann
2022-10-20 7:52 ` Linus Walleij
2022-10-20 11:35 ` Bartosz Golaszewski
2022-10-19 15:03 ` [PATCH 12/17] ARM: footbridge: remove CATS Arnd Bergmann
2022-10-19 19:45 ` Linus Walleij
2022-10-19 15:03 ` [PATCH 13/17] ARM: omap1: remove unused board files Arnd Bergmann
2022-10-19 17:15 ` Aaro Koskinen
2022-10-20 7:11 ` Arnd Bergmann
2022-10-20 19:35 ` Aaro Koskinen
2022-10-21 6:52 ` Arnd Bergmann
2022-10-21 11:11 ` Aaro Koskinen
2022-10-24 5:49 ` Tony Lindgren
2022-10-24 16:02 ` Arnd Bergmann
2022-10-25 8:08 ` Tony Lindgren
2022-10-19 19:30 ` Wolfram Sang
2022-10-21 9:50 ` Lee Jones
2022-10-22 10:24 ` Greg Kroah-Hartman
2022-10-24 5:45 ` Tony Lindgren
2022-10-19 15:03 ` [PATCH 14/17] ARM: omap1: remove dead code Arnd Bergmann
2022-10-19 17:34 ` Aaro Koskinen
2022-10-21 7:51 ` Arnd Bergmann
2022-10-22 10:24 ` Greg Kroah-Hartman
2022-10-24 5:49 ` Tony Lindgren
2022-10-24 18:03 ` Kevin Hilman
2022-10-19 15:03 ` [PATCH 15/17] fbdev: omapfb: remove unused board support Arnd Bergmann
2022-10-24 5:50 ` Tony Lindgren
2022-10-19 15:03 ` [PATCH 16/17] spi: remove omap 100K driver Arnd Bergmann
2022-10-19 15:29 ` Mark Brown
2022-10-24 5:50 ` Tony Lindgren
2022-10-19 15:03 ` [PATCH 17/17] mfd: remove htc-i2cpld driver Arnd Bergmann
2022-10-31 15:18 ` Lee Jones
2022-10-21 8:33 ` [PATCH 01/17] ARM: at91: remove stale MAINTAINER file entries Nicolas Ferre
2022-10-21 9:45 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221019150410.3851944-8-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox