Skip to contentSkip to conversation

blackfin: Remove dead DSA code

PATCH In review Florian Fainelli 2 participants 8 messages Jan 1, 2017 – Jul 16, 2017

lore
Share & tools
lore

Florian Fainelli

author
#0 lore raw

cover blackfin: Remove dead DSA code

Hi all,

This patch series removes dead DSA code in the blackfin board specific code. There is no in tree driver for the KSZ8893M, and clearly this would not compile anymore.

Preparatory patch to help remove the legacy DSA platform device code from the tree.

Florian Fainelli (2):
blackfin: tcm-bf518: Remove dsa.h inclusion
blackfin: ezbrd: Remove non-functional DSA/KSZ8893M code

 arch/blackfin/mach-bf518/boards/ezbrd.c     | 47 -----------------------------
 arch/blackfin/mach-bf518/boards/tcm-bf518.c |  1 -
 2 files changed, 48 deletions(-)
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 1/2 blackfin: tcm-bf518: Remove dsa.h inclusion

Nothing in that file uses definitions from that header, so just get rid of it.

Signed-off-by Florian Fainelli <[email protected]>
---
 arch/blackfin/mach-bf518/boards/tcm-bf518.c | 1 -
 1 file changed, 1 deletion(-)
arch/blackfin/mach-bf518/boards/tcm-bf518.c +0 -1
index 240d5cb1f02c..37d868085f6a 100644
@@ -25,7 +25,6 @@
 #include <asm/dpmc.h>
 #include <asm/bfin_sdh.h>
 #include <linux/spi/ad7877.h>
-#include <net/dsa.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
Signature · 1 line
2.9.3
author
#2 lore raw

PATCH 2/2 blackfin: ezbrd: Remove non-functional DSA/KSZ8893M code

In reply to Florian Fainelli

There is no in tree driver for the KSZ8893M switch driver, so just get rid of the code in that board file.

Signed-off-by Florian Fainelli <[email protected]>
---
 arch/blackfin/mach-bf518/boards/ezbrd.c | 47 ---------------------------------
 1 file changed, 47 deletions(-)
arch/blackfin/mach-bf518/boards/ezbrd.c +0 -47
index d022112927c2..c51d1b810ac3 100644
@@ -25,7 +25,6 @@
 #include <asm/dpmc.h>
 #include <asm/bfin_sdh.h>
 #include <linux/spi/ad7877.h>
-#include <net/dsa.h>
 
 /*
  * Name the Board for the /proc/cpuinfo

@@ -105,11 +104,7 @@ static const unsigned short bfin_mac_peripherals[] = {
 
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
 	{
-#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
-		.addr = 3,
-#else
 		.addr = 1,
-#endif
 		.irq = IRQ_MAC_PHYINT,
 	},
 };

@@ -119,9 +114,6 @@ static struct bfin_mii_bus_platform_data bfin_mii_bus_data = {
 	.phydev_data = bfin_phydev_data,
 	.phy_mode = PHY_INTERFACE_MODE_MII,
 	.mac_peripherals = bfin_mac_peripherals,
-#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
-	.phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */
-#endif
 	.vlan1_mask = 1,
 	.vlan2_mask = 2,
 };

@@ -140,29 +132,6 @@ static struct platform_device bfin_mac_device = {
 	}
 };
 
-#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
-static struct dsa_chip_data ksz8893m_switch_chip_data = {
-	.mii_bus = &bfin_mii_bus.dev,
-	.port_names = {
-		NULL,
-		"eth%d",
-		"eth%d",
-		"cpu",
-	},
-};
-static struct dsa_platform_data ksz8893m_switch_data = {
-	.nr_chips = 1,
-	.netdev = &bfin_mac_device.dev,
-	.chip = &ksz8893m_switch_chip_data,
-};
-
-static struct platform_device ksz8893m_switch_device = {
-	.name		= "dsa",
-	.id		= 0,
-	.num_resources	= 0,
-	.dev.platform_data = &ksz8893m_switch_data,
-};
-#endif
 #endif
 
 #if IS_ENABLED(CONFIG_MTD_M25P80)

@@ -228,19 +197,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 	},
 #endif
 
-#if IS_ENABLED(CONFIG_BFIN_MAC)
-#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
-	{
-		.modalias = "ksz8893m",
-		.max_speed_hz = 5000000,
-		.bus_num = 0,
-		.chip_select = 1,
-		.platform_data = NULL,
-		.mode = SPI_MODE_3,
-	},
-#endif
-#endif
-
 #if IS_ENABLED(CONFIG_MMC_SPI)
 	{
 		.modalias = "mmc_spi",

@@ -714,9 +670,6 @@ static struct platform_device *stamp_devices[] __initdata = {
 #if IS_ENABLED(CONFIG_BFIN_MAC)
 	&bfin_mii_bus,
 	&bfin_mac_device,
-#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
-	&ksz8893m_switch_device,
-#endif
 #endif
 
 #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
Signature · 1 line
2.9.3
author
#3 lore raw
In reply to Florian Fainelli
Quoted 8 lines · Florian Fainelli

Hi all,

This patch series removes dead DSA code in the blackfin board specific code. There is no in tree driver for the KSZ8893M, and clearly this would not compile anymore.

Preparatory patch to help remove the legacy DSA platform device code from the tree.

Ping, is anyone maintaining blackfin these days?

Quoted 9 lines

Florian Fainelli (2):
blackfin: tcm-bf518: Remove dsa.h inclusion
blackfin: ezbrd: Remove non-functional DSA/KSZ8893M code

 arch/blackfin/mach-bf518/boards/ezbrd.c     | 47 -----------------------------
 arch/blackfin/mach-bf518/boards/tcm-bf518.c |  1 -
 2 files changed, 48 deletions(-)
Signature · 1 line
Florian
author
#4 lore raw
In reply to Florian Fainelli
Quoted 8 lines · Florian Fainelli

Hi all,

This patch series removes dead DSA code in the blackfin board specific code. There is no in tree driver for the KSZ8893M, and clearly this would not compile anymore.

Preparatory patch to help remove the legacy DSA platform device code from the tree.

Hello? anyone still maintaining blackfin here?

Quoted 9 lines

Florian Fainelli (2):
blackfin: tcm-bf518: Remove dsa.h inclusion
blackfin: ezbrd: Remove non-functional DSA/KSZ8893M code

 arch/blackfin/mach-bf518/boards/ezbrd.c     | 47 -----------------------------
 arch/blackfin/mach-bf518/boards/tcm-bf518.c |  1 -
 2 files changed, 48 deletions(-)
Signature · 1 line
Florian
#5 lore raw
Quoted 1 line · Florian Fainelli

Hello? anyone still maintaining blackfin here?

Looks like people edit arch/blackfin/ a lot whenever it interferes with some other work, but the only blackfin-specific fixes seem to be a couple of drive-by ones by Al Viro, then nothing until first half of 2015.

Last maintainer pull request: 668b54a1 on 2015-04-24.

There was some mailing list traffic in Jan 2016:
https://sourceforge.net/p/adi-buildroot/mailman/adi-buildroot-devel/

So it looks pretty dead...

Signature · 4 lines
Don't be racist.  White, amber or black, all beers should be judged based
solely on their merits.  Heck, even if occasionally a cider applies for a
beer's job, why not?
On the other hand, corpo lager is not a race.
author
#6 lore raw
Quoted 7 lines · Adam Borowski
Quoted 1 line · Florian Fainelli

Hello? anyone still maintaining blackfin here?

Looks like people edit arch/blackfin/ a lot whenever it interferes with some other work, but the only blackfin-specific fixes seem to be a couple of drive-by ones by Al Viro, then nothing until first half of 2015.

Quoted 6 lines

Last maintainer pull request: 668b54a1 on 2015-04-24.

There was some mailing list traffic in Jan 2016:
https://sourceforge.net/p/adi-buildroot/mailman/adi-buildroot-devel/

So it looks pretty dead...

Yes indeed, Andrew, would you or someone else be willing to take these two patches, or should we just remove blackfin entirely from the source tree (there might still be active users).

Thanks!

Signature · 1 line
Florian
author
#7 lore raw
Quoted 12 lines · Florian Fainelli
Quoted 9 lines · Adam Borowski
Quoted 1 line · Florian Fainelli

Hello? anyone still maintaining blackfin here?

Looks like people edit arch/blackfin/ a lot whenever it interferes with some other work, but the only blackfin-specific fixes seem to be a couple of drive-by ones by Al Viro, then nothing until first half of 2015.

Last maintainer pull request: 668b54a1 on 2015-04-24.

Quoted 8 lines
Quoted 4 lines

There was some mailing list traffic in Jan 2016:
https://sourceforge.net/p/adi-buildroot/mailman/adi-buildroot-devel/

So it looks pretty dead...

Yes indeed, Andrew, would you or someone else be willing to take these two patches, or should we just remove blackfin entirely from the source tree (there might still be active users).

With akpm's corrected email this time.

Signature · 1 line
Florian