aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/savage/savagefb-i2c.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 58c8a3ce33c..5e7acda2ba9 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -170,9 +170,8 @@ void savagefb_create_i2c_busses(struct fb_info *info)
170 struct savagefb_par *par = info->par; 170 struct savagefb_par *par = info->par;
171 par->chan.par = par; 171 par->chan.par = par;
172 172
173 switch(info->fix.accel) { 173 switch (par->chip) {
174 case FB_ACCEL_PROSAVAGE_DDRK: 174 case S3_PROSAVAGE:
175 case FB_ACCEL_PROSAVAGE_PM:
176 par->chan.reg = CR_SERIAL2; 175 par->chan.reg = CR_SERIAL2;
177 par->chan.ioaddr = par->mmio.vbase; 176 par->chan.ioaddr = par->mmio.vbase;
178 par->chan.algo.setsda = prosavage_gpio_setsda; 177 par->chan.algo.setsda = prosavage_gpio_setsda;
@@ -180,7 +179,7 @@ void savagefb_create_i2c_busses(struct fb_info *info)
180 par->chan.algo.getsda = prosavage_gpio_getsda; 179 par->chan.algo.getsda = prosavage_gpio_getsda;
181 par->chan.algo.getscl = prosavage_gpio_getscl; 180 par->chan.algo.getscl = prosavage_gpio_getscl;
182 break; 181 break;
183 case FB_ACCEL_SAVAGE4: 182 case S3_SAVAGE4:
184 par->chan.reg = CR_SERIAL1; 183 par->chan.reg = CR_SERIAL1;
185 if (par->pcidev->revision > 1 && !(VGArCR(0xa6, par) & 0x40)) 184 if (par->pcidev->revision > 1 && !(VGArCR(0xa6, par) & 0x40))
186 par->chan.reg = CR_SERIAL2; 185 par->chan.reg = CR_SERIAL2;
@@ -190,7 +189,7 @@ void savagefb_create_i2c_busses(struct fb_info *info)
190 par->chan.algo.getsda = prosavage_gpio_getsda; 189 par->chan.algo.getsda = prosavage_gpio_getsda;
191 par->chan.algo.getscl = prosavage_gpio_getscl; 190 par->chan.algo.getscl = prosavage_gpio_getscl;
192 break; 191 break;
193 case FB_ACCEL_SAVAGE2000: 192 case S3_SAVAGE2000:
194 par->chan.reg = MM_SERIAL1; 193 par->chan.reg = MM_SERIAL1;
195 par->chan.ioaddr = par->mmio.vbase; 194 par->chan.ioaddr = par->mmio.vbase;
196 par->chan.algo.setsda = savage4_gpio_setsda; 195 par->chan.algo.setsda = savage4_gpio_setsda;