From eccd6cda8945190a8d5e9dac2e283bf1017ecf2f Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Mon, 21 May 2007 18:09:10 +0800 Subject: [PATCH] --- yaml --- r: 56635 b: refs/heads/master c: ed2fbf57ea8d2ec1c0f6758bd5f9f98cef519049 h: refs/heads/master i: 56633: 6c198dd3249ab3c89bad9b3fd49b2d2b75a4f215 56631: 1e926ec5de4abfea23542783598d5cd9553f0fc8 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf533/boards/stamp.c | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 205bbd7a2956..01e29392ca70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8af10b79877ff5dfd5c7b1928d57cf38483e819d +refs/heads/master: ed2fbf57ea8d2ec1c0f6758bd5f9f98cef519049 diff --git a/trunk/arch/blackfin/mach-bf533/boards/stamp.c b/trunk/arch/blackfin/mach-bf533/boards/stamp.c index d7b3a5d74e8c..7d3dfcbc54aa 100644 --- a/trunk/arch/blackfin/mach-bf533/boards/stamp.c +++ b/trunk/arch/blackfin/mach-bf533/boards/stamp.c @@ -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) { @@ -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",