Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56635
b: refs/heads/master
c: ed2fbf5
h: refs/heads/master
i:
  56633: 6c198dd
  56631: 1e926ec
v: v3
  • Loading branch information
Bryan Wu authored and Linus Torvalds committed May 21, 2007
1 parent 3bcfd05 commit eccd6cd
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8af10b79877ff5dfd5c7b1928d57cf38483e819d
refs/heads/master: ed2fbf57ea8d2ec1c0f6758bd5f9f98cef519049
28 changes: 28 additions & 0 deletions trunk/arch/blackfin/mach-bf533/boards/stamp.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ static struct bfin5xx_spi_chip ad5304_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,
.bits_per_word = 8,
};
#endif

static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
{
Expand Down Expand Up @@ -199,6 +206,27 @@ 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 = 1,
.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 = 1,
.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)
{
.modalias = "fxs-spi",
Expand Down

0 comments on commit eccd6cd

Please sign in to comment.