summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-tegra/Makefile1
-rw-r--r--arch/arm/mach-tegra/board-cardhu.c15
-rw-r--r--arch/arm/mach-tegra/board-enterprise.c15
-rw-r--r--arch/arm/mach-tegra/board.h1
-rw-r--r--arch/arm/mach-tegra/i2c_error_recovery.c104
5 files changed, 136 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 6132ab0e1373..ed30b20dcc49 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += sleep-t3.o
obj-y += fuse.o
obj-y += kfuse.o
obj-y += tegra_odm_fuses.o
+obj-y += i2c_error_recovery.o
obj-$(CONFIG_TEGRA_LEGACY_AUDIO) += tegra_i2s_audio.o
obj-$(CONFIG_TEGRA_LEGACY_AUDIO) += tegra_spdif_audio.o
obj-y += mc.o
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index c46841577b2d..b63f9584cf31 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -192,6 +192,9 @@ static struct tegra_i2c_platform_data cardhu_i2c1_platform_data = {
.adapter_nr = 0,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PC4,
+ .sda_gpio = TEGRA_GPIO_PC5,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data cardhu_i2c2_platform_data = {
@@ -199,24 +202,36 @@ static struct tegra_i2c_platform_data cardhu_i2c2_platform_data = {
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
.is_clkon_always = true,
+ .scl_gpio = TEGRA_GPIO_PT5,
+ .sda_gpio = TEGRA_GPIO_PT6,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data cardhu_i2c3_platform_data = {
.adapter_nr = 2,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PBB1,
+ .sda_gpio = TEGRA_GPIO_PBB2,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data cardhu_i2c4_platform_data = {
.adapter_nr = 3,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PV4,
+ .sda_gpio = TEGRA_GPIO_PV5,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data cardhu_i2c5_platform_data = {
.adapter_nr = 4,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PZ6,
+ .sda_gpio = TEGRA_GPIO_PZ7,
+ .arb_recovery = arb_lost_recovery,
};
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index 430e6855e205..526dca29e15d 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -186,6 +186,9 @@ static struct tegra_i2c_platform_data enterprise_i2c1_platform_data = {
.adapter_nr = 0,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PC4,
+ .sda_gpio = TEGRA_GPIO_PC5,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data enterprise_i2c2_platform_data = {
@@ -193,24 +196,36 @@ static struct tegra_i2c_platform_data enterprise_i2c2_platform_data = {
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
.is_clkon_always = true,
+ .scl_gpio = TEGRA_GPIO_PT5,
+ .sda_gpio = TEGRA_GPIO_PT6,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data enterprise_i2c3_platform_data = {
.adapter_nr = 2,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PBB1,
+ .sda_gpio = TEGRA_GPIO_PBB2,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data enterprise_i2c4_platform_data = {
.adapter_nr = 3,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PV4,
+ .sda_gpio = TEGRA_GPIO_PV5,
+ .arb_recovery = arb_lost_recovery,
};
static struct tegra_i2c_platform_data enterprise_i2c5_platform_data = {
.adapter_nr = 4,
.bus_count = 1,
.bus_clk_rate = { 100000, 0 },
+ .scl_gpio = TEGRA_GPIO_PZ6,
+ .sda_gpio = TEGRA_GPIO_PZ7,
+ .arb_recovery = arb_lost_recovery,
};
static void enterprise_i2c_init(void)
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 942a1864944e..66800ce85a28 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -47,6 +47,7 @@ void __init tegra_protected_aperture_init(unsigned long aperture);
void tegra_move_framebuffer(unsigned long to, unsigned long from,
unsigned long size);
bool is_tegra_debug_uartport_hs(void);
+int arb_lost_recovery(int scl_gpio, int sda_gpio);
extern unsigned long tegra_bootloader_fb_start;
extern unsigned long tegra_bootloader_fb_size;
diff --git a/arch/arm/mach-tegra/i2c_error_recovery.c b/arch/arm/mach-tegra/i2c_error_recovery.c
new file mode 100644
index 000000000000..bea3133b48c1
--- /dev/null
+++ b/arch/arm/mach-tegra/i2c_error_recovery.c
@@ -0,0 +1,104 @@
+/*
+ * arch/arm/mach-tegra/i2c_error_recovery.c
+ *
+ * Copyright (c) 2011, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+
+#include "gpio-names.h"
+#include "board.h"
+
+#define RETRY_MAX_COUNT (9*8+1) /*I2C controller supports eight-byte burst transfer*/
+
+int arb_lost_recovery(int scl_gpio, int sda_gpio)
+{
+ int ret;
+ int retry = RETRY_MAX_COUNT;
+ int recovered_successfully = 0;
+ int val;
+
+ if ((!scl_gpio) || (!sda_gpio)) {
+ pr_err("not proper input:scl_gpio 0x%08x,"
+ "sda_gpio 0x%08x\n", scl_gpio, sda_gpio);
+ return -EINVAL;;
+ }
+
+ ret = gpio_request(scl_gpio, "scl_gpio");
+ if (ret < 0) {
+ pr_err("error in gpio 0x%08x request 0x%08x\n",
+ scl_gpio, ret);
+ return -EINVAL;;
+ }
+ tegra_gpio_enable(scl_gpio);
+
+ ret = gpio_request(sda_gpio, "sda_gpio");
+ if (ret < 0) {
+ pr_err("error in gpio 0x%08x request 0x%08x\n",
+ sda_gpio, ret);
+ goto err;
+ }
+ tegra_gpio_enable(sda_gpio);
+ gpio_direction_input(sda_gpio);
+
+ while (retry--) {
+ gpio_direction_output(scl_gpio,0);
+ udelay(5);
+ gpio_direction_output(scl_gpio,1);
+ udelay(5);
+
+ /* check whether sda struct low release */
+ val = gpio_get_value(sda_gpio);
+ if (val) {
+ /* send START */
+ gpio_direction_output(sda_gpio,0);
+ udelay(5);
+
+ /* send STOP in next clock cycle */
+ gpio_direction_output(scl_gpio,0);
+ udelay(5);
+ gpio_direction_output(scl_gpio,1);
+ udelay(5);
+ gpio_direction_output(sda_gpio,1);
+ udelay(5);
+
+ recovered_successfully = 1;
+ break;
+ }
+ }
+
+ gpio_free(scl_gpio);
+ tegra_gpio_disable(scl_gpio);
+ gpio_free(sda_gpio);
+ tegra_gpio_disable(sda_gpio);
+
+ if (likely(recovered_successfully)) {
+ pr_err("arbitration lost recovered by re-try-count 0x%08x\n",
+ RETRY_MAX_COUNT - retry);
+ return 0;
+ } else {
+ pr_err("Un-recovered arbitration lost.\n");
+ return -EINVAL;
+ }
+
+err:
+ gpio_free(scl_gpio);
+ tegra_gpio_disable(scl_gpio);
+ return ret;
+}
+
generated by cgit v1.2.3 (git 2.0.4) at 2024-07-02 00:10:03 +0000