From 9e63e5a28b39116bfa9e68bb1e3c3ab2c2d87d84 Mon Sep 17 00:00:00 2001 From: Ed Nash Date: Sat, 27 Jul 2013 20:48:42 -0400 Subject: add debugfs statistics and some code cleanup --- drivers/i2c/busses/i2c-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 36bad1eaa428..65525e1c25b3 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -621,7 +621,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) #ifdef CONFIG_ARCH_MVF // make sure not in use by MQX - if(mvf_sema4_assign(3, true, &sema4)) { + if(mvf_sema4_assign(MCC_I2C_SEMAPHORE_NUMBER, true, &sema4)) { dev_err(&pdev->dev, "could not grab MQX semaphore\n"); goto fail5; } -- cgit v1.2.3 From 625af91c5ecb9254375d471a0b4589d5264c7465 Mon Sep 17 00:00:00 2001 From: Ed Nash Date: Sat, 27 Jul 2013 23:23:52 -0400 Subject: fix gate number constant --- drivers/i2c/busses/i2c-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 65525e1c25b3..60d2f40420aa 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -621,7 +621,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) #ifdef CONFIG_ARCH_MVF // make sure not in use by MQX - if(mvf_sema4_assign(MCC_I2C_SEMAPHORE_NUMBER, true, &sema4)) { + if(mvf_sema4_assign(MVF_I2C_SEMAPHORE_NUMBER, true, &sema4)) { dev_err(&pdev->dev, "could not grab MQX semaphore\n"); goto fail5; } -- cgit v1.2.3 From 28dd51850b753fea8a61848d0eae1f97459e3d5b Mon Sep 17 00:00:00 2001 From: Ed Nash Date: Sun, 28 Jul 2013 09:47:05 -0400 Subject: fix debugfs worng directory for gate. cleanup debug comment / code in i2c-imx --- drivers/i2c/busses/i2c-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 60d2f40420aa..a2e6d2aa16b3 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -620,9 +620,9 @@ static int __init i2c_imx_probe(struct platform_device *pdev) platform_set_drvdata(pdev, i2c_imx); #ifdef CONFIG_ARCH_MVF - // make sure not in use by MQX + // for makeing sure not in use by MQX concurrently if(mvf_sema4_assign(MVF_I2C_SEMAPHORE_NUMBER, true, &sema4)) { - dev_err(&pdev->dev, "could not grab MQX semaphore\n"); + dev_err(&pdev->dev, "could not assign MQX semaphore %d\n", MVF_I2C_SEMAPHORE_NUMBER); goto fail5; } #endif -- cgit v1.2.3 From 614660a165ac827ea272c6fa0c59986881309f90 Mon Sep 17 00:00:00 2001 From: Ed Nash Date: Mon, 29 Jul 2013 21:01:35 -0400 Subject: add support for spin locks --- drivers/i2c/busses/i2c-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index a2e6d2aa16b3..e13e020cab2e 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -439,7 +439,7 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter, dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__); #ifdef CONFIG_ARCH_MVF - result = mvf_sema4_lock(sema4, 10000000); + result = mvf_sema4_lock(sema4, 10000000, true); if(result) return result; #endif @@ -621,7 +621,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) #ifdef CONFIG_ARCH_MVF // for makeing sure not in use by MQX concurrently - if(mvf_sema4_assign(MVF_I2C_SEMAPHORE_NUMBER, true, &sema4)) { + if(mvf_sema4_assign(MVF_I2C_SEMAPHORE_NUMBER, &sema4)) { dev_err(&pdev->dev, "could not assign MQX semaphore %d\n", MVF_I2C_SEMAPHORE_NUMBER); goto fail5; } -- cgit v1.2.3