diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-12-07 11:01:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 16:00:28 +1000 |
| commit | e8c3cc0803b7f70f2f96d3bae3c4a4ac5238ed10 (patch) | |
| tree | 3a5f670aff04d4347a755d78500c677479e301b1 /drivers | |
| parent | 112a12aab8a5c1137a140c341f98a160e27b8c49 (diff) | |
| download | linux-3.10-e8c3cc0803b7f70f2f96d3bae3c4a4ac5238ed10.tar.gz linux-3.10-e8c3cc0803b7f70f2f96d3bae3c4a4ac5238ed10.tar.bz2 linux-3.10-e8c3cc0803b7f70f2f96d3bae3c4a4ac5238ed10.zip | |
drm/nouveau/bios: rename DCB_GPIO_PWM_FAN to DCB_GPIO_FAN
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/fan.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h index 94e540e1056..cb060576c20 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h @@ -5,7 +5,7 @@ enum dcb_gpio_func_name { DCB_GPIO_PANEL_POWER = 0x01, DCB_GPIO_TVDAC0 = 0x0c, DCB_GPIO_TVDAC1 = 0x2d, - DCB_GPIO_PWM_FAN = 0x09, + DCB_GPIO_FAN = 0x09, DCB_GPIO_FAN_SENSE = 0x3d, DCB_GPIO_UNUSED = 0xff }; diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c index f7d32f49f65..edc1664ee54 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c @@ -213,7 +213,7 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm) int ret; /* attempt to locate a drivable fan, and determine control method */ - ret = gpio->find(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, &func); + ret = gpio->find(gpio, 0, DCB_GPIO_FAN, 0xff, &func); if (ret == 0) ret = nouveau_fanpwm_create(therm, &func); if (ret != 0) diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c index 7e50f1419ac..e0693e0109e 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c @@ -53,8 +53,8 @@ nouveau_fantog_update(struct nouveau_fantog_priv *priv, int percent) percent = priv->percent; priv->percent = percent; - duty = !gpio->get(gpio, 0, DCB_GPIO_PWM_FAN, 0xff); - gpio->set(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, duty); + duty = !gpio->get(gpio, 0, DCB_GPIO_FAN, 0xff); + gpio->set(gpio, 0, DCB_GPIO_FAN, 0xff, duty); if (list_empty(&priv->alarm.head) && percent != (duty * 100)) { u64 next_change = (percent * priv->period_us) / 100; |