dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ralink: various i2c related fixes

Browse Source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 42868
v19.07.3_mercusys_ac12_duma
John Crispin 10 years ago
parent af1207b58c
commit 1bbc5de86e
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File

41
target/linux/ramips/patches-3.14/0052-i2c-MIPS-adds-ralink-I2C-driver.patch
Unescape Escape View File

@ -75,8 +75,8 @@ Index: linux-3.14.18/drivers/i2c/busses/Makefile
Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.14.18/drivers/i2c/busses/i2c-ralink.c 2014-10-06 15:53:32.416500362 +0200 +++ linux-3.14.18/drivers/i2c/busses/i2c-ralink.c 2014-10-09 19:38:29.242416182 +0200
@@ -0,0 +1,298 @@ @@ -0,0 +1,299 @@
+/* +/*
+ * drivers/i2c/busses/i2c-ralink.c + * drivers/i2c/busses/i2c-ralink.c
+ * + *
@ -107,7 +107,6 @@ Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
+#include <linux/platform_device.h> +#include <linux/platform_device.h>
+#include <linux/i2c.h> +#include <linux/i2c.h>
+#include <linux/io.h> +#include <linux/io.h>
+#include <linux/of_i2c.h>
+#include <linux/err.h> +#include <linux/err.h>
+ +
+#include <asm/mach-ralink/ralink_regs.h> +#include <asm/mach-ralink/ralink_regs.h>
@ -200,7 +199,7 @@ Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
+ int nblock = msg->len / READ_BLOCK; + int nblock = msg->len / READ_BLOCK;
+ int rem = msg->len % READ_BLOCK; + int rem = msg->len % READ_BLOCK;
+ int ret = 0; + int ret = 0;
+ /*printk("i2c handle msg len:%d\n",msg->len);*/ +
+ if (msg->flags & I2C_M_TEN) { + if (msg->flags & I2C_M_TEN) {
+ printk("10 bits addr not supported\n"); + printk("10 bits addr not supported\n");
+ return -EINVAL; + return -EINVAL;
@ -209,14 +208,16 @@ Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
+ if (msg->flags & I2C_M_RD) { + if (msg->flags & I2C_M_RD) {
+ for (i = 0; i < nblock; i++) { + for (i = 0; i < nblock; i++) {
+ if (rt_i2c_wait_idle()) { + if (rt_i2c_wait_idle()) {
+ printk("i2c-read line busy\n"); + printk("i2c-read line busy\n");
+ return -ETIMEDOUT; + return -ETIMEDOUT;
+ } + }
+ rt_i2c_w32(READ_BLOCK - 1, REG_BYTECNT_REG); + rt_i2c_w32(READ_BLOCK - 1, REG_BYTECNT_REG);
+ rt_i2c_w32(READ_CMD, REG_STARTXFR_REG); + rt_i2c_w32(READ_CMD, REG_STARTXFR_REG);
+ for (j = 0; j < READ_BLOCK; j++) { + for (j = 0; j < READ_BLOCK; j++) {
+ if (rt_i2c_wait_rx_done()<0) ret = rt_i2c_wait_rx_done(); + if (rt_i2c_wait_rx_done() < 0)
+ if (rt_i2c_get_ack()<0) ret = rt_i2c_get_ack(); + ret = rt_i2c_wait_rx_done();
+ if (rt_i2c_get_ack() < 0)
+ ret = rt_i2c_get_ack();
+ msg->buf[pos++] = rt_i2c_r32(REG_DATAIN_REG); + msg->buf[pos++] = rt_i2c_r32(REG_DATAIN_REG);
+ } + }
+ } + }
@ -225,13 +226,15 @@ Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
+ printk("i2c-read line busy\n"); + printk("i2c-read line busy\n");
+ return -ETIMEDOUT; + return -ETIMEDOUT;
+ } + }
+ if (rem){ + if (rem) {
+ rt_i2c_w32(rem - 1, REG_BYTECNT_REG); + rt_i2c_w32(rem - 1, REG_BYTECNT_REG);
+ rt_i2c_w32(READ_CMD, REG_STARTXFR_REG); + rt_i2c_w32(READ_CMD, REG_STARTXFR_REG);
+ } + }
+ for (i = 0; i < rem; i++) { + for (i = 0; i < rem; i++) {
+ if (rt_i2c_wait_rx_done()<0) ret = rt_i2c_wait_rx_done(); + if (rt_i2c_wait_rx_done() < 0)
+ if (rt_i2c_get_ack() <0) ret = rt_i2c_get_ack(); + ret = rt_i2c_wait_rx_done();
+ if (rt_i2c_get_ack() < 0)
+ ret = rt_i2c_get_ack();
+ +
+ msg->buf[pos++] = rt_i2c_r32(REG_DATAIN_REG); + msg->buf[pos++] = rt_i2c_r32(REG_DATAIN_REG);
+ } + }
@ -245,10 +248,10 @@ Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
+ rt_i2c_w32(msg->buf[i], REG_DATAOUT_REG); + rt_i2c_w32(msg->buf[i], REG_DATAOUT_REG);
+ rt_i2c_w32(WRITE_CMD, REG_STARTXFR_REG); + rt_i2c_w32(WRITE_CMD, REG_STARTXFR_REG);
+ +
+ if (rt_i2c_wait_tx_done()<0) ret = rt_i2c_wait_tx_done(); + if (rt_i2c_wait_tx_done() < 0)
+ if (rt_i2c_get_ack()<0) ret = rt_i2c_get_ack(); + ret = rt_i2c_wait_tx_done();
+ + if (rt_i2c_get_ack() < 0)
+ + ret = rt_i2c_get_ack();
+ } + }
+ } + }
+ +
@ -325,8 +328,6 @@ Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c
+ if (ret) + if (ret)
+ return ret; + return ret;
+ +
+ of_i2c_register_devices(adapter);
+
+ platform_set_drvdata(pdev, adapter); + platform_set_drvdata(pdev, adapter);
+ +
+ dev_info(&pdev->dev, "loaded\n"); + dev_info(&pdev->dev, "loaded\n");

Write Preview
Loading…
Cancel
Save