diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-03 08:19:20 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-05 21:06:13 -0600 |
| commit | 5eaeadaa3afee088421e26cbbc07b6969a9e3425 (patch) | |
| tree | 312c7dde941646d4cb6c5d04e04b59b443fdfec8 /drivers/video | |
| parent | 801ab9e93c228b30bb526bb1b431e042d46ba2e8 (diff) | |
| download | talos-obmc-uboot-5eaeadaa3afee088421e26cbbc07b6969a9e3425.tar.gz talos-obmc-uboot-5eaeadaa3afee088421e26cbbc07b6969a9e3425.zip | |
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 <sjg@chromium.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/bridge/video-bridge-uclass.c | 28 |
1 files changed, 18 insertions, 10 deletions
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) { |
