[U-Boot] [PATCH 0/2] SPI updates
Looks like a few patches were merged from Thomas' series, but the core piece was missed, as well as the new Blackfin support for it. The new mmc_spi driver that has been merged already into mainline uses these for example.
Thomas Chou (2): spi: add spi_set_speed func bfin_spi: add spi_set_speed
drivers/spi/bfin_spi.c | 32 +++++++++++++++++++------------- include/spi.h | 8 ++++++++ 2 files changed, 27 insertions(+), 13 deletions(-)
From: Thomas Chou thomas@wytron.com.tw
This func helps mmc_spi driver set correct speed for mmc/sd, as mmc card needs 400KHz clock for spi mode initialization.
Signed-off-by: Thomas Chou thomas@wytron.com.tw Signed-off-by: Mike Frysinger vapier@gentoo.org --- include/spi.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/include/spi.h b/include/spi.h index 320e50e..7887d0f 100644 --- a/include/spi.h +++ b/include/spi.h @@ -176,6 +176,14 @@ void spi_cs_activate(struct spi_slave *slave); void spi_cs_deactivate(struct spi_slave *slave);
/*----------------------------------------------------------------------- + * Set transfer speed. + * This sets a new speed to be applied for next spi_xfer(). + * slave: The SPI slave + * hz: The transfer speed + */ +void spi_set_speed(struct spi_slave *slave, uint hz); + +/*----------------------------------------------------------------------- * Write 8 bits, then read 8 bits. * slave: The SPI slave we're communicating with * byte: Byte to be written
From: Thomas Chou thomas@wytron.com.tw
The new speed will be applied by spi_claim_bus.
Signed-off-by: Thomas Chou thomas@wytron.com.tw Signed-off-by: Mike Frysinger vapier@gentoo.org --- drivers/spi/bfin_spi.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c index e8a4de5..213e792 100644 --- a/drivers/spi/bfin_spi.c +++ b/drivers/spi/bfin_spi.c @@ -138,13 +138,29 @@ static const unsigned short cs_pins[][7] = { #endif };
+void spi_set_speed(struct spi_slave *slave, uint hz) +{ + struct bfin_spi_slave *bss = to_bfin_spi_slave(slave); + ulong sclk; + u32 baud; + + sclk = get_sclk(); + baud = sclk / (2 * hz); + /* baud should be rounded up */ + if (sclk % (2 * hz)) + baud += 1; + if (baud < 2) + baud = 2; + else if (baud > (u16)-1) + baud = -1; + bss->baud = baud; +} + struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) { struct bfin_spi_slave *bss; - ulong sclk; u32 mmr_base; - u32 baud;
if (!spi_cs_is_valid(bus, cs)) return NULL; @@ -166,16 +182,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, default: return NULL; }
- sclk = get_sclk(); - baud = sclk / (2 * max_hz); - /* baud should be rounded up */ - if (sclk % (2 * max_hz)) - baud += 1; - if (baud < 2) - baud = 2; - else if (baud > (u16)-1) - baud = -1; - bss = malloc(sizeof(*bss)); if (!bss) return NULL; @@ -187,8 +193,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (mode & SPI_CPHA) bss->ctl |= CPHA; if (mode & SPI_CPOL) bss->ctl |= CPOL; if (mode & SPI_LSB_FIRST) bss->ctl |= LSBF; - bss->baud = baud; bss->flg = mode & SPI_CS_HIGH ? 1 : 0; + spi_set_speed(&bss->slave, max_hz);
debug("%s: bus:%i cs:%i mmr:%x ctl:%x baud:%i flg:%i\n", __func__, bus, cs, mmr_base, bss->ctl, baud, bss->flg);
The following changes since commit f02efacc515e35695e52ecd08762835c8a74a463:
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2011-04-25 00:58:45 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-blackfin.git spi
Thomas Chou (2): spi: add spi_set_speed func bfin_spi: add spi_set_speed
drivers/spi/bfin_spi.c | 32 +++++++++++++++++++------------- include/spi.h | 8 ++++++++ 2 files changed, 27 insertions(+), 13 deletions(-)
Dear Mike Frysinger,
In message 1303710563-25546-1-git-send-email-vapier@gentoo.org you wrote:
The following changes since commit f02efacc515e35695e52ecd08762835c8a74a463:
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2011-04-25 00:58:45 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-blackfin.git spi
Thomas Chou (2): spi: add spi_set_speed func bfin_spi: add spi_set_speed
drivers/spi/bfin_spi.c | 32 +++++++++++++++++++------------- include/spi.h | 8 ++++++++ 2 files changed, 27 insertions(+), 13 deletions(-)
Appllied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Mike Frysinger -
Wolfgang Denk