Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d508b00d authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: Add support for optional gpios"

parents 66c9479e 76eba302

drivers/gpu/drm/msm/dp/dp_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -253,8 +253,8 @@ static int dp_parser_gpio(struct dp_parser *parser) 
			dp_gpios[i], 0);



		if (!gpio_is_valid(mp->gpio_config[i].gpio)) {

			pr_err("%s gpio not specified\n", dp_gpios[i]);

			return -EINVAL;

			pr_debug("%s gpio not specified\n", dp_gpios[i]);

			continue;

		}



		strlcpy(mp->gpio_config[i].gpio_name, dp_gpios[i],

drivers/gpu/drm/msm/dp/dp_power.c

+4 −2
Original line number Diff line number Diff line
@@ -436,10 +436,12 @@ static int dp_power_config_gpios(struct dp_power_private *power, bool flip, 
		dp_power_set_gpio(power, flip);

	} else {

		for (i = 0; i < mp->num_gpio; i++) {

			if (gpio_is_valid(config[i].gpio)) {

				gpio_set_value(config[i].gpio, 0);

				gpio_free(config[i].gpio);

			}

		}

	}



	return 0;

}