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

Commit 7d157fb0 authored by Sonic Zhang's avatar Sonic Zhang Committed by Bob Liu
Browse files

blackfin: config: update macro SPI_BFIN in board file 



Macro name for spi controller driver has been modified, so update default
board file accordingly.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent 5ef835eb

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

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct physmap_flash_data ezbrd_flash_data = { 


static struct resource ezbrd_flash_resource = {

	.start = 0x20000000,

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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

	.end   = 0x202fffff,

#else

	.end   = 0x203fffff,
@@ -292,7 +292,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
};



/* SPI controller data */

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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

/* SPI (0) */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 6,
@@ -715,7 +715,7 @@ static struct platform_device *stamp_devices[] __initdata = { 
#endif

#endif



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

	&bfin_spi0_device,

	&bfin_spi1_device,

#endif
@@ -777,7 +777,7 @@ static int __init ezbrd_init(void) 
	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

	/* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */

	peripheral_request(P_AMS2, "ParaFlash");

#if !defined(CONFIG_SPI_BFIN) && !defined(CONFIG_SPI_BFIN_MODULE)

#if !defined(CONFIG_SPI_BFIN5XX) && !defined(CONFIG_SPI_BFIN5XX_MODULE)

	peripheral_request(P_AMS3, "ParaFlash");

#endif

	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
};



/* SPI controller data */

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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

/* SPI (0) */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 6,
@@ -635,7 +635,7 @@ static struct platform_device *tcm_devices[] __initdata = { 
	&bfin_mac_device,

#endif



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

	&bfin_spi0_device,

	&bfin_spi1_device,

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
@@ -744,7 +744,7 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_mac_device,

#endif



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

	&bfin_spi0_device,

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 8,
@@ -893,7 +893,7 @@ static struct platform_device *cmbf527_devices[] __initdata = { 
	&net2272_bfin_device,

#endif



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

	&bfin_spi0_device,

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 8,
@@ -776,7 +776,7 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_mac_device,

#endif



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

#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)

	&bfin_spi0_device,

#endif