|
@@ -138,13 +138,29 @@ static const unsigned short cs_pins[][7] = {
|
|
#endif
|
|
#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,
|
|
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
|
|
unsigned int max_hz, unsigned int mode)
|
|
unsigned int max_hz, unsigned int mode)
|
|
{
|
|
{
|
|
struct bfin_spi_slave *bss;
|
|
struct bfin_spi_slave *bss;
|
|
- ulong sclk;
|
|
|
|
u32 mmr_base;
|
|
u32 mmr_base;
|
|
- u32 baud;
|
|
|
|
|
|
|
|
if (!spi_cs_is_valid(bus, cs))
|
|
if (!spi_cs_is_valid(bus, cs))
|
|
return NULL;
|
|
return NULL;
|
|
@@ -166,16 +182,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
|
|
default: return NULL;
|
|
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));
|
|
bss = malloc(sizeof(*bss));
|
|
if (!bss)
|
|
if (!bss)
|
|
return NULL;
|
|
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_CPHA) bss->ctl |= CPHA;
|
|
if (mode & SPI_CPOL) bss->ctl |= CPOL;
|
|
if (mode & SPI_CPOL) bss->ctl |= CPOL;
|
|
if (mode & SPI_LSB_FIRST) bss->ctl |= LSBF;
|
|
if (mode & SPI_LSB_FIRST) bss->ctl |= LSBF;
|
|
- bss->baud = baud;
|
|
|
|
bss->flg = mode & SPI_CS_HIGH ? 1 : 0;
|
|
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__,
|
|
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);
|
|
bus, cs, mmr_base, bss->ctl, baud, bss->flg);
|