aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2007-02-13 11:12:04 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-14 10:21:24 -0500
commit588ef7693574cfbcb228f48d5478c2b39a9b0c9f (patch)
tree6cc5ac8e7d2544514ab405357f01a91da8471780 /drivers/i2c/busses
parentdfc544c7216b276c1e9c0c753299692df4068c44 (diff)
[ARM] 4184/1: iop: cp6 access handler (undef_hook)
Enable svc access to cp6 via an undefined instruction hook. Do not enable access for usr code. This patch also makes iop13xx select PLAT_IOP, this requires a small change to drivers/i2c/busses/i2c-iop3xx.c. Per Lennert Buytenhek's note, the cp6 trap routine is moved to arch/arm/plat-iop Per Nicolas Pitre's note, the cp_wait is skipped since the latency to return to the faulting function is longer than cp_wait. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-iop3xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index d108ab4974cc..b70a7f7daacc 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -84,7 +84,7 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
84 * Every time unit enable is asserted, GPOD needs to be cleared 84 * Every time unit enable is asserted, GPOD needs to be cleared
85 * on IOP3XX to avoid data corruption on the bus. 85 * on IOP3XX to avoid data corruption on the bus.
86 */ 86 */
87#ifdef CONFIG_PLAT_IOP 87#if defined(CONFIG_ARCH_IOP32X) || defined(CONFIG_ARCH_IOP33X)
88 if (iop3xx_adap->id == 0) { 88 if (iop3xx_adap->id == 0) {
89 gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW); 89 gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW);
90 gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW); 90 gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW);