drm/nouveau/bios: rename DCB_GPIO_PWM_FAN to DCB_GPIO_FAN

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

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 94e540e10567cdea133fc02dd044878bb45476e9..cb060576c20ef6e13d465276200a9bbb31e676f0 100644 (file)
--- 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 f7d32f49f657526f5150c348b18fa3329d28ecfd..edc1664ee54f1dcb8885e3469eaf291aaedbf800 100644 (file)
--- 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 7e50f1419ac6216af410efea02f83b890f33aca3..e0693e0109e8d38dc04d978f8fd907aef3d5e333 100644 (file)
--- 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;