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

Commit c19577e3 authored by Graf Yang's avatar Graf Yang Committed by Bryan Wu
Browse files

Blackfin arch: Fix bug - make ksz8893m driver available when bfin_mac is enabled 



Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent f7e989ab

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

+6 −3
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static struct platform_device bfin_mac_device = { 
	.name = "bfin_mac",

	.dev.platform_data = &bfin_mii_bus,

};

#endif



#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)

static struct dsa_platform_data ksz8893m_switch_data = {
@@ -132,6 +131,7 @@ static struct platform_device ksz8893m_switch_device = { 
	.dev.platform_data = &ksz8893m_switch_data,

};

#endif

#endif



#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -171,6 +171,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { 
};

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#if defined(CONFIG_NET_DSA_KSZ8893M) \

	|| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)

/* SPI SWITCH CHIP */
@@ -179,6 +180,7 @@ static struct bfin5xx_spi_chip spi_switch_info = { 
	.bits_per_word = 8,

};

#endif

#endif



#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)

static struct bfin5xx_spi_chip spi_mmc_chip_info = {
@@ -259,6 +261,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#if defined(CONFIG_NET_DSA_KSZ8893M) \

	|| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)

	{
@@ -271,6 +274,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.mode = SPI_MODE_3,

	},

#endif

#endif



#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)

	{
@@ -630,11 +634,10 @@ static struct platform_device *stamp_devices[] __initdata = { 
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

	&bfin_mii_bus,

	&bfin_mac_device,

#endif



#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)

	&ksz8893m_switch_device,

#endif

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	&bfin_spi0_device,