mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-30 04:46:45 +07:00
Blackfin arch: Retire old spi_mmc driver
Turn to use the mmc_spi driver in mainline kernel. Signed-off-by: Yi Li <yi.li@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
parent
f79ea4cba0
commit
0c720da35c
@ -1285,7 +1285,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
|
|||||||
CONFIG_SDH_BFIN=m
|
CONFIG_SDH_BFIN=m
|
||||||
# CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set
|
# CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set
|
||||||
# CONFIG_MMC_SPI is not set
|
# CONFIG_MMC_SPI is not set
|
||||||
# CONFIG_SPI_MMC is not set
|
|
||||||
# CONFIG_NEW_LEDS is not set
|
# CONFIG_NEW_LEDS is not set
|
||||||
CONFIG_RTC_LIB=y
|
CONFIG_RTC_LIB=y
|
||||||
CONFIG_RTC_CLASS=y
|
CONFIG_RTC_CLASS=y
|
||||||
|
@ -504,13 +504,6 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_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,
|
|
||||||
.bits_per_word = 8,
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_PBX)
|
#if defined(CONFIG_PBX)
|
||||||
static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
|
static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
|
||||||
.ctl_reg = 0x4, /* send zero */
|
.ctl_reg = 0x4, /* send zero */
|
||||||
@ -602,26 +595,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
|
|||||||
.controller_data = &ad9960_spi_chip_info,
|
.controller_data = &ad9960_spi_chip_info,
|
||||||
},
|
},
|
||||||
#endif
|
#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,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
.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,
|
|
||||||
.mode = SPI_MODE_3,
|
|
||||||
},
|
|
||||||
#endif
|
|
||||||
#if defined(CONFIG_PBX)
|
#if defined(CONFIG_PBX)
|
||||||
{
|
{
|
||||||
.modalias = "fxs-spi",
|
.modalias = "fxs-spi",
|
||||||
|
@ -216,13 +216,6 @@ static struct bfin5xx_spi_chip spi_si3xxx_chip_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,
|
|
||||||
.bits_per_word = 8,
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
|
#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
|
||||||
static struct bfin5xx_spi_chip spidev_chip_info = {
|
static struct bfin5xx_spi_chip spidev_chip_info = {
|
||||||
.enable_dma = 0,
|
.enable_dma = 0,
|
||||||
@ -265,27 +258,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
|
|||||||
},
|
},
|
||||||
#endif
|
#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,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
.modalias = "spi_mmc",
|
|
||||||
.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,
|
|
||||||
.mode = SPI_MODE_3,
|
|
||||||
},
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_PBX)
|
#if defined(CONFIG_PBX)
|
||||||
{
|
{
|
||||||
.modalias = "fxs-spi",
|
.modalias = "fxs-spi",
|
||||||
|
@ -527,13 +527,6 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
|
|
||||||
static struct bfin5xx_spi_chip spi_mmc_chip_info = {
|
|
||||||
.enable_dma = 0,
|
|
||||||
.bits_per_word = 8,
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
|
#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
|
||||||
#define MMC_SPI_CARD_DETECT_INT IRQ_PF5
|
#define MMC_SPI_CARD_DETECT_INT IRQ_PF5
|
||||||
|
|
||||||
@ -720,26 +713,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
|
|||||||
.controller_data = &ad9960_spi_chip_info,
|
.controller_data = &ad9960_spi_chip_info,
|
||||||
},
|
},
|
||||||
#endif
|
#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,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
.modalias = "spi_mmc",
|
|
||||||
.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,
|
|
||||||
.mode = SPI_MODE_3,
|
|
||||||
},
|
|
||||||
#endif
|
|
||||||
#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
|
#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
|
||||||
{
|
{
|
||||||
.modalias = "mmc_spi",
|
.modalias = "mmc_spi",
|
||||||
|
Loading…
Reference in New Issue
Block a user