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

Commit 5bda2723 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: protect only the SPI bus controller with CONFIG_SPI_BFIN 



Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent bd628bd0

arch/blackfin/mach-bf527/boards/ezkit.c

+2 −7
Original line number Diff line number Diff line
@@ -451,9 +451,6 @@ static struct platform_device net2272_bfin_device = { 
};

#endif



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

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {
@@ -676,6 +673,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 8,
@@ -1018,10 +1016,7 @@ static int __init stamp_init(void) 
#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

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

	spi_register_board_info(bfin_spi_board_info,

				ARRAY_SIZE(bfin_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

arch/blackfin/mach-bf533/boards/ezkit.c

+1 −5
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ static struct platform_device smc91x_device = { 
};

#endif



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

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {

	{
@@ -189,6 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

/* SPI (0) */

static struct resource bfin_spi0_resource[] = {

	[0] = {
@@ -425,9 +423,7 @@ static int __init ezkit_init(void) 
{

	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));

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

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

#endif



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

arch/blackfin/mach-bf533/boards/stamp.c

+3 −7
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ static struct platform_device stamp_flash_device = { 
};

#endif



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

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {

	{
@@ -320,6 +317,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

/* SPI (0) */

static struct resource bfin_spi0_resource[] = {

	[0] = {
@@ -626,10 +624,8 @@ static int __init stamp_init(void) 
	SSYNC();

#endif



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

	spi_register_board_info(bfin_spi_board_info,

				ARRAY_SIZE(bfin_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

#endif

arch/blackfin/mach-bf537/boards/stamp.c

+2 −7
Original line number Diff line number Diff line
@@ -400,9 +400,6 @@ static struct platform_device stamp_flash_device = { 
};

#endif



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

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {
@@ -629,6 +626,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 8,
@@ -939,10 +937,7 @@ static int __init stamp_init(void) 
#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

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

	spi_register_board_info(bfin_spi_board_info,

				ARRAY_SIZE(bfin_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

arch/blackfin/mach-bf548/boards/ezkit.c

+3 −7
Original line number Diff line number Diff line
@@ -412,8 +412,6 @@ static struct platform_device ezkit_flash_device = { 
};

#endif



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

/* all SPI peripherals info goes here */

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)

/* SPI flash chip (m25p16) */
@@ -481,7 +479,7 @@ static struct bfin5xx_spi_chip spidev_chip_info = { 
};

#endif



static struct spi_board_info bf54x_spi_board_info[] __initdata = {

static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)

	{
@@ -527,6 +525,7 @@ static struct spi_board_info bf54x_spi_board_info[] __initdata = { 
#endif

};



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

/* SPI (0) */

static struct resource bfin_spi0_resource[] = {

	[0] = {
@@ -800,10 +799,7 @@ static int __init ezkit_init(void) 


	platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));



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

	spi_register_board_info(bf54x_spi_board_info,

			ARRAY_SIZE(bf54x_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



	return 0;

}