|
@@ -285,8 +285,7 @@ static int dw_spi_transfer_one(struct spi_master *master,
|
|
struct chip_data *chip = spi_get_ctldata(spi);
|
|
struct chip_data *chip = spi_get_ctldata(spi);
|
|
u8 imask = 0;
|
|
u8 imask = 0;
|
|
u16 txlevel = 0;
|
|
u16 txlevel = 0;
|
|
- u16 clk_div = 0;
|
|
|
|
- u32 speed = 0;
|
|
|
|
|
|
+ u16 clk_div;
|
|
u32 cr0;
|
|
u32 cr0;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -301,14 +300,11 @@ static int dw_spi_transfer_one(struct spi_master *master,
|
|
spi_enable_chip(dws, 0);
|
|
spi_enable_chip(dws, 0);
|
|
|
|
|
|
/* Handle per transfer options for bpw and speed */
|
|
/* Handle per transfer options for bpw and speed */
|
|
- speed = chip->speed_hz;
|
|
|
|
- if ((transfer->speed_hz != speed) || !chip->clk_div) {
|
|
|
|
- speed = transfer->speed_hz;
|
|
|
|
-
|
|
|
|
|
|
+ if (transfer->speed_hz != chip->speed_hz) {
|
|
/* clk_div doesn't support odd number */
|
|
/* clk_div doesn't support odd number */
|
|
- clk_div = (dws->max_freq / speed + 1) & 0xfffe;
|
|
|
|
|
|
+ clk_div = (dws->max_freq / transfer->speed_hz + 1) & 0xfffe;
|
|
|
|
|
|
- chip->speed_hz = speed;
|
|
|
|
|
|
+ chip->speed_hz = transfer->speed_hz;
|
|
chip->clk_div = clk_div;
|
|
chip->clk_div = clk_div;
|
|
|
|
|
|
spi_set_clk(dws, chip->clk_div);
|
|
spi_set_clk(dws, chip->clk_div);
|