Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1432811

[PATCH 2/6] soc/tegra: pmc: Fix early initialisation of PMC

Show all headers | View raw

During early initialisation, the available power partitions for a given
device is configured as well as the polarity of the PMC interrupt. Both
of which should only be configured if there is a valid device node for
the PMC device. This is because the soc data used for configuring the
power partitions is only available if a device node for the PMC is found
and the code to configure the interrupt polarity uses the device node
pointer directly.

Some early device-tree images may not have this device node and so fix
this by ensuring the device node pointer is valid when configuring these
items.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/soc/tegra/pmc.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 52a9e9703668..2e031c4ad547 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -1550,27 +1550,29 @@ static int __init tegra_pmc_early_init(void)
 		return -ENXIO;
 	}
 
-	/* Create a bit-map of the available and valid partitions */
-	for (i = 0; i < pmc->soc->num_powergates; i++)
-		if (pmc->soc->powergates[i])
-			set_bit(i, pmc->powergates_available);
-
 	mutex_init(&pmc->powergates_lock);
 
-	/*
-	 * Invert the interrupt polarity if a PMC device tree node exists and
-	 * contains the nvidia,invert-interrupt property.
-	 */
-	invert = of_property_read_bool(np, "nvidia,invert-interrupt");
+	if (np) {
+		/* Create a bit-map of the available and valid partitions */
+		for (i = 0; i < pmc->soc->num_powergates; i++)
+			if (pmc->soc->powergates[i])
+				set_bit(i, pmc->powergates_available);
 
-	value = tegra_pmc_readl(PMC_CNTRL);
+		/*
+		 * Invert the interrupt polarity if a PMC device tree node
+		 * exists and contains the nvidia,invert-interrupt property.
+		 */
+		invert = of_property_read_bool(np, "nvidia,invert-interrupt");
 
-	if (invert)
-		value |= PMC_CNTRL_INTR_POLARITY;
-	else
-		value &= ~PMC_CNTRL_INTR_POLARITY;
+		value = tegra_pmc_readl(PMC_CNTRL);
 
-	tegra_pmc_writel(value, PMC_CNTRL);
+		if (invert)
+			value |= PMC_CNTRL_INTR_POLARITY;
+		else
+			value &= ~PMC_CNTRL_INTR_POLARITY;
+
+		tegra_pmc_writel(value, PMC_CNTRL);
+	}
 
 	return 0;
 }
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] soc/tegra: Various PMC fixes Jon Hunter <jonathanh@nvidia.com> - 2016-06-28 12:50 +0200
  [PATCH 4/6] soc/tegra: pmc: Ensure mutex is always initialised Jon Hunter <jonathanh@nvidia.com> - 2016-06-28 12:50 +0200
  [PATCH 3/6] soc/tegra: pmc: Don't populate soc data until register space is mapped Jon Hunter <jonathanh@nvidia.com> - 2016-06-28 12:50 +0200
  [PATCH 6/6] soc/tegra: pmc: Don't probe pmc if early initialisation fails Jon Hunter <jonathanh@nvidia.com> - 2016-06-28 12:50 +0200
  [PATCH 5/6] soc/tegra: pmc: Add missing of_node_put Jon Hunter <jonathanh@nvidia.com> - 2016-06-28 12:50 +0200
  [PATCH 2/6] soc/tegra: pmc: Fix early initialisation of PMC Jon Hunter <jonathanh@nvidia.com> - 2016-06-28 12:50 +0200
    Re: [PATCH 2/6] soc/tegra: pmc: Fix early initialisation of PMC Jon Hunter <jonathanh@nvidia.com> - 2016-06-29 18:20 +0200
      Re: [PATCH 2/6] soc/tegra: pmc: Fix early initialisation of PMC Thierry Reding <thierry.reding@gmail.com> - 2016-06-30 12:10 +0200
  Re: [PATCH 0/6] soc/tegra: Various PMC fixes Thierry Reding <thierry.reding@gmail.com> - 2016-06-30 12:10 +0200

csiph-web