diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2014-01-28 13:53:34 +0800 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2014-02-20 06:46:56 +0100 |
| commit | d6a320d5bb3050eeb9a586481145d3a75ef24db8 (patch) | |
| tree | 89c94515625e3e071bf2be44fb32db285cd289a6 /drivers | |
| parent | bb0fad0ea095944c76dc94fcd13b91699413f79f (diff) | |
| download | blackbird-obmc-uboot-d6a320d5bb3050eeb9a586481145d3a75ef24db8.tar.gz blackbird-obmc-uboot-d6a320d5bb3050eeb9a586481145d3a75ef24db8.zip | |
blackfin: add spi and i2c specific get clock functions
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/bfin-twi_i2c.c | 3 | ||||
| -rw-r--r-- | drivers/spi/bfin_spi.c | 7 | ||||
| -rw-r--r-- | drivers/spi/bfin_spi6xx.c | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/drivers/i2c/bfin-twi_i2c.c b/drivers/i2c/bfin-twi_i2c.c index 5c372809c9..cfab064dfa 100644 --- a/drivers/i2c/bfin-twi_i2c.c +++ b/drivers/i2c/bfin-twi_i2c.c @@ -10,6 +10,7 @@ #include <i2c.h> #include <asm/blackfin.h> +#include <asm/clock.h> #include <asm/mach-common/bits/twi.h> /* Every register is 32bit aligned, but only 16bits in size */ @@ -274,7 +275,7 @@ unsigned int i2c_get_bus_speed(void) */ void i2c_init(int speed, int slaveaddr) { - uint8_t prescale = ((get_sclk() / 1000 / 1000 + 5) / 10) & 0x7F; + uint8_t prescale = ((get_i2c_clk() / 1000 / 1000 + 5) / 10) & 0x7F; /* Set TWI internal clock as 10MHz */ twi->control = prescale; diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c index aa89d89a32..71a31d0127 100644 --- a/drivers/spi/bfin_spi.c +++ b/drivers/spi/bfin_spi.c @@ -13,6 +13,7 @@ #include <spi.h> #include <asm/blackfin.h> +#include <asm/clock.h> #include <asm/gpio.h> #include <asm/portmux.h> #include <asm/mach-common/bits/spi.h> @@ -140,12 +141,12 @@ static const unsigned short cs_pins[][7] = { void spi_set_speed(struct spi_slave *slave, uint hz) { struct bfin_spi_slave *bss = to_bfin_spi_slave(slave); - ulong sclk; + ulong clk; u32 baud; - sclk = get_sclk(); + clk = get_spi_clk(); /* baud should be rounded up */ - baud = DIV_ROUND_UP(sclk, 2 * hz); + baud = DIV_ROUND_UP(clk, 2 * hz); if (baud < 2) baud = 2; else if (baud > (u16)-1) diff --git a/drivers/spi/bfin_spi6xx.c b/drivers/spi/bfin_spi6xx.c index 07b833d3a3..eba01d16f5 100644 --- a/drivers/spi/bfin_spi6xx.c +++ b/drivers/spi/bfin_spi6xx.c @@ -22,6 +22,7 @@ #include <spi.h> #include <asm/blackfin.h> +#include <asm/clock.h> #include <asm/gpio.h> #include <asm/portmux.h> #include <asm/mach-common/bits/spi6xx.h> @@ -135,11 +136,11 @@ static const unsigned short cs_pins[][7] = { void spi_set_speed(struct spi_slave *slave, uint hz) { struct bfin_spi_slave *bss = to_bfin_spi_slave(slave); - ulong sclk; + ulong clk; u32 clock; - sclk = get_sclk1(); - clock = sclk / hz; + clk = get_spi_clk(); + clock = clk / hz; if (clock) clock--; bss->clock = clock; |
