Merge tag 'tegra-for-4.9-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Pull "soc/tegra: Changes for v4.9-rc1" from Thierry Reding:

This contains a single patch to fix an issue with setting the deep power
down mode of I/O rails.

* tag 'tegra-for-4.9-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Fix incorrect DPD request

1 files changed, 8 insertions, 20 deletions

diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 71c834f3847e..7792ed88d80b 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -967,8 +967,8 @@ static void tegra_io_rail_unprepare(void)
 
 int tegra_io_rail_power_on(unsigned int id)
 {
-        unsigned long request, status, value;
-        unsigned int bit, mask;
+        unsigned long request, status;
+        unsigned int bit;
         int err;
 
         mutex_lock(&pmc->powergates_lock);
@@ -977,15 +977,9 @@ int tegra_io_rail_power_on(unsigned int id)
         if (err)
                 goto error;
 
-        mask = 1 << bit;
+        tegra_pmc_writel(IO_DPD_REQ_CODE_OFF | BIT(bit), request);
 
-        value = tegra_pmc_readl(request);
-        value |= mask;
-        value &= ~IO_DPD_REQ_CODE_MASK;
-        value |= IO_DPD_REQ_CODE_OFF;
-        tegra_pmc_writel(value, request);
-
-        err = tegra_io_rail_poll(status, mask, 0, 250);
+        err = tegra_io_rail_poll(status, BIT(bit), 0, 250);
         if (err) {
                 pr_info("tegra_io_rail_poll() failed: %d\n", err);
                 goto error;
@@ -1002,8 +996,8 @@ EXPORT_SYMBOL(tegra_io_rail_power_on);
 
 int tegra_io_rail_power_off(unsigned int id)
 {
-        unsigned long request, status, value;
-        unsigned int bit, mask;
+        unsigned long request, status;
+        unsigned int bit;
         int err;
 
         mutex_lock(&pmc->powergates_lock);
@@ -1014,15 +1008,9 @@ int tegra_io_rail_power_off(unsigned int id)
                 goto error;
         }
 
-        mask = 1 << bit;
-
-        value = tegra_pmc_readl(request);
-        value |= mask;
-        value &= ~IO_DPD_REQ_CODE_MASK;
-        value |= IO_DPD_REQ_CODE_ON;
-        tegra_pmc_writel(value, request);
+        tegra_pmc_writel(IO_DPD_REQ_CODE_ON | BIT(bit), request);
 
-        err = tegra_io_rail_poll(status, mask, mask, 250);
+        err = tegra_io_rail_poll(status, BIT(bit), BIT(bit), 250);
         if (err)
                 goto error;