aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-w90x900
diff options
context:
space:
mode:
authorwanzongshun <mcuos.com@gmail.com>2010-07-22 04:12:30 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-22 04:20:18 -0400
commitc6ca2e466f22dee01a97f04bcc6bec8062d79847 (patch)
tree0977e53e5ee9a1507f477ae37d18a34eccc0c82d /arch/arm/mach-w90x900
parentc588e37da8b2e4708397355b26d067450058f804 (diff)
ARM: 6250/1: patch for modifying spi flash configuration
This patch is to modify spi flash configuration, the previous one can make spi driver work failed. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-w90x900')
-rw-r--r--arch/arm/mach-w90x900/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index 7ae543899c85..7a1fa6adb7c3 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -209,7 +209,7 @@ static struct nuc900_spi_info nuc900_spiflash_data = {
209 .divider = 24, 209 .divider = 24,
210 .sleep = 0, 210 .sleep = 0,
211 .txnum = 0, 211 .txnum = 0,
212 .txbitlen = 1, 212 .txbitlen = 8,
213 .bus_num = 0, 213 .bus_num = 0,
214}; 214};
215 215
@@ -258,7 +258,7 @@ static struct spi_board_info nuc900_spi_board_info[] __initdata = {
258 .modalias = "m25p80", 258 .modalias = "m25p80",
259 .max_speed_hz = 20000000, 259 .max_speed_hz = 20000000,
260 .bus_num = 0, 260 .bus_num = 0,
261 .chip_select = 1, 261 .chip_select = 0,
262 .platform_data = &nuc900_spi_flash_data, 262 .platform_data = &nuc900_spi_flash_data,
263 .mode = SPI_MODE_0, 263 .mode = SPI_MODE_0,
264 }, 264 },