diff mbox

[U-Boot,v2,02/19] video: Work around lack of pinctrl

Message ID 1438611577-2245-3-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Aug. 3, 2015, 2:19 p.m. UTC 
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>
---

Changes in v2:
- Add a new patch to hold off the need for driver model pinctrl

 drivers/video/bridge/video-bridge-uclass.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

Comments

Simon Glass Aug. 9, 2015, 1:39 p.m. UTC | #1 
On 3 August 2015 at 08:19, Simon Glass <sjg@chromium.org> wrote:
> 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>
> ---
>
> Changes in v2:
> - Add a new patch to hold off the need for driver model pinctrl
>
>  drivers/video/bridge/video-bridge-uclass.c | 28 ++++++++++++++++++----------
>  1 file changed, 18 insertions(+), 10 deletions(-)

Applied to u-boot-dm.
diff mbox

Patch

diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index e1ea428..6c5990f 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) {