diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-26 17:45:37 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-26 17:45:37 -0500 |
| commit | 9e4de7fd4acc8f99b6d383c711d21c0159849629 (patch) | |
| tree | 703f5ea8560e931870c842493d246fdd52fb8d68 /drivers/i2c/mvtwsi.c | |
| parent | b72ae192e39f933100b0eb034768cb4daeebf67a (diff) | |
| parent | 2ca02995791484007373ae51b3e7148511f1479b (diff) | |
| download | talos-obmc-uboot-9e4de7fd4acc8f99b6d383c711d21c0159849629.tar.gz talos-obmc-uboot-9e4de7fd4acc8f99b6d383c711d21c0159849629.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers/i2c/mvtwsi.c')
| -rw-r--r-- | drivers/i2c/mvtwsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 5f993b9905..221ff4fe7a 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -204,8 +204,8 @@ static int twsi_start(struct i2c_adapter *adap, int expected_status) /* globally set TWSIEN in case it was not */ twsi_control_flags |= MVTWSI_CONTROL_TWSIEN; /* assert START */ - twsi_control_flags |= MVTWSI_CONTROL_START | MVTWSI_CONTROL_CLEAR_IFLG; - writel(twsi_control_flags, &twsi->control); + writel(twsi_control_flags | MVTWSI_CONTROL_START | + MVTWSI_CONTROL_CLEAR_IFLG, &twsi->control); /* wait for controller to process START */ return twsi_wait(adap, expected_status); } |
