2 files changed, 11 insertions, 16 deletions

diff --git a/drivers/video/tegra/dc/dc.h b/drivers/video/tegra/dc/dc.h
index 8b47064ec..691dcaa7d 100644
--- a/drivers/video/tegra/dc/dc.h
+++ b/drivers/video/tegra/dc/dc.h
@@ -331,11 +331,12 @@ enum {
    DSI/DSIB pads' DPD for DSI_INSTANCE_1 can be enabled, respectively,
  * but in SW, sometimes pins from one pad can be used by
  * more than one module, so it may be dependent on board design.
+ * 0:A
+ * 1:B
+ * 2:C
+ * 3:D
  */
-#define DSI_DPD_EN              (1 << 0)
-#define DSIB_DPD_EN             (1 << 1)
-#define DSIC_DPD_EN             (1 << 2)
-#define DSID_DPD_EN             (1 << 3)
+#define DSI_DPD_EN(i)           (1 << i)
 
 struct tegra_dsi_board_info {
         u32 platform_boardid;
diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index d29048265..2ce6f841b 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -4498,18 +4498,12 @@ static int _tegra_dc_dsi_init(struct tegra_dc *dc)
          */
         if (!dsi->info.ganged_type && !dsi->info.dsi_csi_loopback &&
                 (dsi->info.controller_vs >= DSI_VS_1)) {
-                if ((dsi->info.dpd_dsi_pads & DSI_DPD_EN) &&
-                        dsi->dsi_io_padctrl[0])
-                        padctrl_power_disable(dsi->dsi_io_padctrl[0]);
-                if ((dsi->info.dpd_dsi_pads & DSIB_DPD_EN) &&
-                        dsi->dsi_io_padctrl[1])
-                        padctrl_power_disable(dsi->dsi_io_padctrl[1]);
-                if ((dsi->info.dpd_dsi_pads & DSIC_DPD_EN) &&
-                        dsi->dsi_io_padctrl[2])
-                        padctrl_power_disable(dsi->dsi_io_padctrl[2]);
-                if ((dsi->info.dpd_dsi_pads & DSID_DPD_EN) &&
-                        dsi->dsi_io_padctrl[3])
-                        padctrl_power_disable(dsi->dsi_io_padctrl[3]);
+                int i;
+                for (i = 0; i < MAX_DSI_INSTANCE; i++) {
+                        if ((dsi->info.dpd_dsi_pads & DSI_DPD_EN(i)) &&
+                                dsi->dsi_io_padctrl[i])
+                                padctrl_power_disable(dsi->dsi_io_padctrl[i]);
+                }
         }
 
         /*