diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-24 13:31:02 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-24 13:31:02 +0200 |
| commit | faa5a0c6fc5609acb4037a5eae79f7a47de4c6ee (patch) | |
| tree | 408edf924d2bb05c4a5638a7a26066d77ac8b1c7 /drivers/spi/atmel_dataflash_spi.c | |
| parent | 7ee38c044ca5041d3378d6507580ea4ec344af96 (diff) | |
| parent | 6ebff365eb63093ca35b687316002535c6a18820 (diff) | |
| download | u-boot-imx-faa5a0c6fc5609acb4037a5eae79f7a47de4c6ee.zip u-boot-imx-faa5a0c6fc5609acb4037a5eae79f7a47de4c6ee.tar.gz u-boot-imx-faa5a0c6fc5609acb4037a5eae79f7a47de4c6ee.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'drivers/spi/atmel_dataflash_spi.c')
| -rw-r--r-- | drivers/spi/atmel_dataflash_spi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/atmel_dataflash_spi.c b/drivers/spi/atmel_dataflash_spi.c index 3eb252c..614965c 100644 --- a/drivers/spi/atmel_dataflash_spi.c +++ b/drivers/spi/atmel_dataflash_spi.c @@ -21,6 +21,7 @@ #include <common.h> #include <asm/arch/hardware.h> +#include <asm/arch/clk.h> #include <asm/arch/gpio.h> #include <asm/arch/io.h> #include <asm/arch/at91_pio.h> @@ -45,7 +46,7 @@ void AT91F_SpiInit(void) writel(AT91_SPI_NCPHA | (AT91_SPI_DLYBS & DATAFLASH_TCSS) | (AT91_SPI_DLYBCT & DATAFLASH_TCHS) | - ((AT91_MASTER_CLOCK / AT91_SPI_CLK) << 8), + ((get_mck_clk_rate() / AT91_SPI_CLK) << 8), AT91_BASE_SPI + AT91_SPI_CSR(0)); #ifdef CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 @@ -53,7 +54,7 @@ void AT91F_SpiInit(void) writel(AT91_SPI_NCPHA | (AT91_SPI_DLYBS & DATAFLASH_TCSS) | (AT91_SPI_DLYBCT & DATAFLASH_TCHS) | - ((AT91_MASTER_CLOCK / AT91_SPI_CLK) << 8), + ((get_mck_clk_rate() / AT91_SPI_CLK) << 8), AT91_BASE_SPI + AT91_SPI_CSR(1)); #endif @@ -62,7 +63,7 @@ void AT91F_SpiInit(void) writel(AT91_SPI_NCPHA | (AT91_SPI_DLYBS & DATAFLASH_TCSS) | (AT91_SPI_DLYBCT & DATAFLASH_TCHS) | - ((AT91_MASTER_CLOCK / AT91_SPI_CLK) << 8), + ((get_mck_clk_rate() / AT91_SPI_CLK) << 8), AT91_BASE_SPI + AT91_SPI_CSR(3)); #endif |