summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2016-02-18 16:49:56 +0530
committerPaul Walmsley <paul@pwsan.com>2016-02-25 00:17:42 -0700
commit1c96bee4df1998b9dec3e2ef8f77e8436e29342b (patch)
tree4b16b9e8f55cb522c250d7532afd74fb09cbff92 /arch/arm/mach-omap2/omap_hwmod_7xx_data.c
parent4321dc8dff356cdc852936fcfb443463b504890d (diff)
downloadop-kernel-dev-1c96bee4df1998b9dec3e2ef8f77e8436e29342b.zip
op-kernel-dev-1c96bee4df1998b9dec3e2ef8f77e8436e29342b.tar.gz
ARM: DRA7: hwmod: Add custom reset handler for PCIeSS
Add a custom reset handler for DRA7x PCIeSS. This handler is required to deassert PCIe hardreset lines after they have been asserted. This enables the PCIe driver to access registers after PCIeSS has been runtime enabled without having to deassert hardreset lines itself. With this patch applied, used lspci to make sure connected PCIe device enumerates on DRA74x and DRA72x EVMs. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Reported-by: Richard Cochran <richardcochran@gmail.com> Tested-by: Kishon Vijay Abraham I <kishon@ti.com> Cc: Suman Anna <s-anna@ti.com> Cc: Dave Gerlach <d-gerlach@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_7xx_data.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index b61355e..252b746 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -1526,8 +1526,31 @@ static struct omap_hwmod dra7xx_ocp2scp3_hwmod = {
*
*/
+/*
+ * As noted in documentation for _reset() in omap_hwmod.c, the stock reset
+ * functionality of OMAP HWMOD layer does not deassert the hardreset lines
+ * associated with an IP automatically leaving the driver to handle that
+ * by itself. This does not work for PCIeSS which needs the reset lines
+ * deasserted for the driver to start accessing registers.
+ *
+ * We use a PCIeSS HWMOD class specific reset handler to deassert the hardreset
+ * lines after asserting them.
+ */
+static int dra7xx_pciess_reset(struct omap_hwmod *oh)
+{
+ int i;
+
+ for (i = 0; i < oh->rst_lines_cnt; i++) {
+ omap_hwmod_assert_hardreset(oh, oh->rst_lines[i].name);
+ omap_hwmod_deassert_hardreset(oh, oh->rst_lines[i].name);
+ }
+
+ return 0;
+}
+
static struct omap_hwmod_class dra7xx_pciess_hwmod_class = {
.name = "pcie",
+ .reset = dra7xx_pciess_reset,
};
/* pcie1 */
OpenPOWER on IntegriCloud