From: Venkateshwar Rao G <venkateshwar.rao.gannavarapu@xilinx.com>
Date: Mon, 12 Mar 2018 18:08:08 +0000 (+0530)
Subject: drm: xlnx: scaler: Updating vpss-scaler reset logic
X-Git-Tag: xilinx-v2018.1~30
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/zynq/linux.git/commitdiff_plain/724f25fb3b1f886526cba0e14bcfba068208b707

drm: xlnx: scaler: Updating vpss-scaler reset logic

This patch updates the reset through gpio logic

Signed-off-by: Venkateshwar Rao G <vgannava@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/gpu/drm/xlnx/xlnx_scaler.c b/drivers/gpu/drm/xlnx/xlnx_scaler.c
index 8460b1691292..d96ddeb49b59 100644
--- a/drivers/gpu/drm/xlnx/xlnx_scaler.c
+++ b/drivers/gpu/drm/xlnx/xlnx_scaler.c
@@ -1525,8 +1525,8 @@ static int xilinx_scaler_bridge_set_input(struct xlnx_bridge *bridge,
 	scaler->fmt_in = bus_fmt;
 
 	/* IP Reset through GPIO */
-	gpiod_set_value_cansleep(scaler->rst_gpio, XSCALER_RESET_DEASSERT);
 	gpiod_set_value_cansleep(scaler->rst_gpio, XSCALER_RESET_ASSERT);
+	gpiod_set_value_cansleep(scaler->rst_gpio, XSCALER_RESET_DEASSERT);
 	xilinx_scaler_reset(scaler);
 	memset(scaler->H_phases, 0, sizeof(scaler->H_phases));
 
@@ -1634,7 +1634,7 @@ static int xilinx_scaler_probe(struct platform_device *pdev)
 	scaler->max_pixels = XSCALER_MAX_WIDTH;
 
 	/* Reset the Global IP Reset through a GPIO */
-	gpiod_set_value_cansleep(scaler->rst_gpio, XSCALER_RESET_ASSERT);
+	gpiod_set_value_cansleep(scaler->rst_gpio, XSCALER_RESET_DEASSERT);
 	xilinx_scaler_reset(scaler);
 
 	scaler->bridge.enable = &xilinx_scaler_bridge_enable;