Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7275291f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'blackfin-Drop-non-functional-DSA-code' 



Florian Fainelli says:

====================
blackfin: Drop non-functional DSA code

I sent those many months ago in the hope that the bfin-linux people
would pick those patches but nobody seems to be responding, can you
queue those via net-next since this affects DSA?
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 53bade8a 637ae0f4

arch/blackfin/mach-bf518/boards/ezbrd.c

+0 −47
Original line number Diff line number Diff line
@@ -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)

arch/blackfin/mach-bf518/boards/tcm-bf518.c

+0 −1
Original line number Diff line number Diff line
@@ -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