shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

spi:fix bug of initial clock division

Browse Source
This commit is contained in:
Luowei
2014-09-18 14:53:57 +08:00
parent c56c050a02
commit 4013e49d8c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/spi/spi-rockchip-core.c
View File

@@ -579,7 +579,12 @@ static void pump_transfers(unsigned long data)
spi = message->spi;
if (unlikely(!chip->clk_div))
{
chip->clk_div = dws->max_freq / chip->speed_hz;
chip->clk_div = (chip->clk_div + 1) & 0xfffe;
chip->speed_hz = dws->max_freq / chip->clk_div;
}
if (message->state == ERROR_STATE) {
message->status = -EIO;
@@ -619,7 +624,6 @@ static void pump_transfers(unsigned long data)
cr0 = chip->cr0;
DBG_SPI("%s:len=%d\n",__func__,dws->len);
/* Handle per transfer options for bpw and speed */
if (transfer->speed_hz) {
@@ -638,10 +642,11 @@ static void pump_transfers(unsigned long data)
clk_div = dws->max_freq / speed;
clk_div = (clk_div + 1) & 0xfffe;
chip->speed_hz = speed;
chip->speed_hz = dws->max_freq / clk_div;
chip->clk_div = clk_div;
}
}
DBG_SPI("%s:len=%d,clk_div=%d,speed_hz=%d\n",__func__,dws->len,chip->clk_div,chip->speed_hz);
if (transfer->bits_per_word) {
bits = transfer->bits_per_word;

2
drivers/spi/spi-rockchip.c
View File

@@ -228,7 +228,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, sdd);
printk("%s:num_cs=%d,irq=%d,freq=%d ok\n",__func__, info->num_cs, irq, dws->max_freq);
printk("%s:num_cs=%d,bus_num=%d,irq=%d,freq=%d ok\n",__func__, info->num_cs, info->bus_num, irq, dws->max_freq);
return 0;
err_release_mem: