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

Commit f3f704d3 authored by Michael Hennerich's avatar Michael Hennerich Committed by Bryan Wu
Browse files

Blackfin arch: SPI_MMC is now mainlined MMC_SPI 



Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 4aad7ec3

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

+7 −17
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ static struct bfin5xx_spi_chip spi_switch_info = { 
#endif

#endif



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

static struct bfin5xx_spi_chip spi_mmc_chip_info = {

	.enable_dma = 1,

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif
@@ -276,23 +276,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

#endif



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

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "spi_mmc_dummy",

		.modalias = "mmc_spi",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 0,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.mode = SPI_MODE_3,

	},

	{

		.modalias = "spi_mmc",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = CONFIG_SPI_MMC_CS_CHAN,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.chip_select = 5,

		.controller_data = &mmc_spi_chip_info,

		.mode = SPI_MODE_3,

	},

#endif

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

+8 −18
Original line number Diff line number Diff line
@@ -487,9 +487,9 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = { 
};

#endif



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

static struct bfin5xx_spi_chip spi_mmc_chip_info = {

	.enable_dma = 1,

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip  mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif
@@ -585,23 +585,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.controller_data = &ad9960_spi_chip_info,

	},

#endif

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

	{

		.modalias = "spi_mmc_dummy",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 0,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.mode = SPI_MODE_3,

	},

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "spi_mmc",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.modalias = "mmc_spi",

		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = CONFIG_SPI_MMC_CS_CHAN,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.chip_select = 5,

		.controller_data = &mmc_spi_chip_info,

		.mode = SPI_MODE_3,

	},

#endif

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

+7 −17
Original line number Diff line number Diff line
@@ -256,9 +256,9 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { 
};

#endif



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

static struct bfin5xx_spi_chip spi_mmc_chip_info = {

	.enable_dma = 1,

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif
@@ -366,23 +366,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



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

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "spi_mmc_dummy",

		.modalias = "mmc_spi",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 0,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.mode = SPI_MODE_3,

	},

	{

		.modalias = "spi_mmc",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = CONFIG_SPI_MMC_CS_CHAN,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.chip_select = 5,

		.controller_data = &mmc_spi_chip_info,

		.mode = SPI_MODE_3,

	},

#endif

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

+7 −17
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { 
};

#endif



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

static struct bfin5xx_spi_chip spi_mmc_chip_info = {

	.enable_dma = 1,

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif
@@ -129,23 +129,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



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

	{

		.modalias = "spi_mmc_dummy",

		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 0,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.mode = SPI_MODE_3,

	},

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "spi_mmc",

		.modalias = "mmc_spi",

		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = CONFIG_SPI_MMC_CS_CHAN,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.chip_select = 5,

		.controller_data = &mmc_spi_chip_info,

		.mode = SPI_MODE_3,

	},

#endif

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

+7 −17
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = { 
};

#endif



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

static struct bfin5xx_spi_chip spi_mmc_chip_info = {

	.enable_dma = 1,

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif
@@ -138,23 +138,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



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

	{

		.modalias = "spi_mmc_dummy",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 0,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.mode = SPI_MODE_3,

	},

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "spi_mmc",

		.modalias = "mmc_spi",

		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = CONFIG_SPI_MMC_CS_CHAN,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,

		.chip_select = 5,

		.controller_data = &mmc_spi_chip_info,

		.mode = SPI_MODE_3,

	},

#endif