diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-02-09 18:22:00 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-11 13:39:12 +1000 |
| commit | 4c36b678a23d33b82d614afe4f958a9d244ede5d (patch) | |
| tree | 2c3ffa99010f88c42a7abd668047a7db10804382 /drivers/gpu/drm | |
| parent | 12d7798f71107e7f4391a532af8c6690bda16f66 (diff) | |
| download | talos-op-linux-4c36b678a23d33b82d614afe4f958a9d244ede5d.tar.gz talos-op-linux-4c36b678a23d33b82d614afe4f958a9d244ede5d.zip | |
drm/radeon/kms/evergreen: adapt to i2c changes
original evergreen patches we against a kernel tree
without my radeon i2c algo changes.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_i2c.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index d15fa5e62bb5..4ae50c19589f 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c @@ -254,6 +254,13 @@ static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) case CHIP_RV740: /* todo */ break; + case CHIP_CEDAR: + case CHIP_REDWOOD: + case CHIP_JUNIPER: + case CHIP_CYPRESS: + case CHIP_HEMLOCK: + /* todo */ + break; default: DRM_ERROR("i2c: unhandled radeon chip\n"); break; @@ -833,6 +840,14 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, /* XXX fill in hw i2c implementation */ ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); break; + case CHIP_CEDAR: + case CHIP_REDWOOD: + case CHIP_JUNIPER: + case CHIP_CYPRESS: + case CHIP_HEMLOCK: + /* XXX fill in hw i2c implementation */ + ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); + break; default: DRM_ERROR("i2c: unhandled radeon chip\n"); ret = -EIO; |
