Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 182958
b: refs/heads/master
c: 64d6882
h: refs/heads/master
v: v3
  • Loading branch information
Hartley Sweeten authored and Russell King committed Jan 12, 2010
1 parent ddf6318 commit bc5f306
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f3f1882ca7bc6b26bcf66ef206eec0c66d823ed3
refs/heads/master: 64d6882d02b0e5f74dd5572039e88517e40edb50
9 changes: 5 additions & 4 deletions trunk/arch/arm/mach-ep93xx/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* your option) any later version.
*/

#define pr_fmt(fmt) "ep93xx " KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
Expand Down Expand Up @@ -318,8 +320,7 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type)
desc->handle_irq = handle_edge_irq;
break;
default:
pr_err("ep93xx: failed to set irq type %d for gpio %d\n",
type, gpio);
pr_err("failed to set irq type %d for gpio %d\n", type, gpio);
return -EINVAL;
}

Expand Down Expand Up @@ -572,9 +573,9 @@ void __init ep93xx_register_i2c(struct i2c_gpio_platform_data *data,
* CMOS driver.
*/
if (data->sda_is_open_drain && data->sda_pin != EP93XX_GPIO_LINE_EEDAT)
pr_warning("ep93xx: sda != EEDAT, open drain has no effect\n");
pr_warning("sda != EEDAT, open drain has no effect\n");
if (data->scl_is_open_drain && data->scl_pin != EP93XX_GPIO_LINE_EECLK)
pr_warning("ep93xx: scl != EECLK, open drain has no effect\n");
pr_warning("scl != EECLK, open drain has no effect\n");

__raw_writel((data->sda_is_open_drain << 1) |
(data->scl_is_open_drain << 0),
Expand Down

0 comments on commit bc5f306

Please sign in to comment.