From: Simon Glass Date: Mon, 3 Aug 2015 14:19:20 +0000 (-0600) Subject: video: Work around lack of pinctrl X-Git-Tag: v2015.10-rc2~394^2~46 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5eaeadaa3afee088421e26cbbc07b6969a9e3425;p=oweals%2Fu-boot.git video: Work around lack of pinctrl We haven't quite got pinctrl ready to apply to mainline. We don't want to GPIO pull-up/down support to the driver model GPIO layer either. So work around this for now. We can address this when pinctrl is complete. Signed-off-by: Simon Glass --- diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c index e1ea42816a..6c5990f54c 100644 --- a/drivers/video/bridge/video-bridge-uclass.c +++ b/drivers/video/bridge/video-bridge-uclass.c @@ -57,22 +57,30 @@ static int video_bridge_pre_probe(struct udevice *dev) debug("%s: Could not decode sleep-gpios (%d)\n", __func__, ret); return ret; } - ret = dm_gpio_set_pull(&uc_priv->sleep, GPIO_PULL_NONE); - if (ret) { - debug("%s: Could not set sleep pull value\n", __func__); - return ret; - } + /* + * Drop this for now as we do not have driver model pinctrl support + * + * ret = dm_gpio_set_pull(&uc_priv->sleep, GPIO_PULL_NONE); + * if (ret) { + * debug("%s: Could not set sleep pull value\n", __func__); + * return ret; + * } + */ ret = gpio_request_by_name(dev, "reset-gpios", 0, &uc_priv->reset, GPIOD_IS_OUT); if (ret) { debug("%s: Could not decode reset-gpios (%d)\n", __func__, ret); return ret; } - ret = dm_gpio_set_pull(&uc_priv->reset, GPIO_PULL_NONE); - if (ret) { - debug("%s: Could not set reset pull value\n", __func__); - return ret; - } + /* + * Drop this for now as we do not have driver model pinctrl support + * + * ret = dm_gpio_set_pull(&uc_priv->reset, GPIO_PULL_NONE); + * if (ret) { + * debug("%s: Could not set reset pull value\n", __func__); + * return ret; + * } + */ ret = gpio_request_by_name(dev, "hotplug-gpios", 0, &uc_priv->hotplug, GPIOD_IS_IN); if (ret && ret != -ENOENT) {