diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-02-09 18:22:00 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-02-10 22:39:12 -0500 |
commit | 4c36b678a23d33b82d614afe4f958a9d244ede5d (patch) | |
tree | 2c3ffa99010f88c42a7abd668047a7db10804382 /drivers/gpu/drm/radeon | |
parent | 12d7798f71107e7f4391a532af8c6690bda16f66 (diff) |
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/radeon')
-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) | |||
254 | case CHIP_RV740: | 254 | case CHIP_RV740: |
255 | /* todo */ | 255 | /* todo */ |
256 | break; | 256 | break; |
257 | case CHIP_CEDAR: | ||
258 | case CHIP_REDWOOD: | ||
259 | case CHIP_JUNIPER: | ||
260 | case CHIP_CYPRESS: | ||
261 | case CHIP_HEMLOCK: | ||
262 | /* todo */ | ||
263 | break; | ||
257 | default: | 264 | default: |
258 | DRM_ERROR("i2c: unhandled radeon chip\n"); | 265 | DRM_ERROR("i2c: unhandled radeon chip\n"); |
259 | break; | 266 | break; |
@@ -833,6 +840,14 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
833 | /* XXX fill in hw i2c implementation */ | 840 | /* XXX fill in hw i2c implementation */ |
834 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | 841 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); |
835 | break; | 842 | break; |
843 | case CHIP_CEDAR: | ||
844 | case CHIP_REDWOOD: | ||
845 | case CHIP_JUNIPER: | ||
846 | case CHIP_CYPRESS: | ||
847 | case CHIP_HEMLOCK: | ||
848 | /* XXX fill in hw i2c implementation */ | ||
849 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
850 | break; | ||
836 | default: | 851 | default: |
837 | DRM_ERROR("i2c: unhandled radeon chip\n"); | 852 | DRM_ERROR("i2c: unhandled radeon chip\n"); |
838 | ret = -EIO; | 853 | ret = -EIO; |