Commit e8c3cc08 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bios: rename DCB_GPIO_PWM_FAN to DCB_GPIO_FAN 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 112a12aa

drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h

+1 −1
Original line number Diff line number Diff line
@@ -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

};

drivers/gpu/drm/nouveau/core/subdev/therm/fan.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c

+2 −2
Original line number Diff line number Diff line
@@ -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;