diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-16 22:56:14 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 04:01:40 -0500 |
| commit | 2bdb06e3cff066c546fb41152bc582a5ec73e899 (patch) | |
| tree | 919e599c07672b170f1a1b6c3ab9d13294974729 /drivers/gpu/drm/nouveau/nouveau_i2c.h | |
| parent | 486a45c2a6c19b159602d044ab601a92cd81f524 (diff) | |
drm/nouveau/i2c: tidy up bit-bang helpers, also fixing nv50 setsda bug
Was using nv_mask, which is bad. Reading the reg senses the current line
states, which aren't necessarily the states we're trying to drive the
lines to.
Fixed to store SCL driver state just as we already do for SDA.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_i2c.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_i2c.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h index cf5f67d51fb..1d083893a4d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.h +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h | |||
| @@ -39,9 +39,9 @@ struct nouveau_i2c_chan { | |||
| 39 | u8 index; | 39 | u8 index; |
| 40 | u8 type; | 40 | u8 type; |
| 41 | u32 dcb; | 41 | u32 dcb; |
| 42 | unsigned rd; | 42 | u32 drive; |
| 43 | unsigned wr; | 43 | u32 sense; |
| 44 | unsigned data; | 44 | u32 state; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | int nouveau_i2c_init(struct drm_device *); | 47 | int nouveau_i2c_init(struct drm_device *); |