From: Tony Lindgren <tony@atomide.com>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
richardcochran@gmail.com, Russell King <linux@arm.linux.org.uk>,
Suman Anna <s-anna@ti.com>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, nsekhar@ti.com,
Paul Walmsley <paul@pwsan.com>, Tero Kristo <t-kristo@ti.com>
Subject: Re: [PATCH v2 1/3] ARM: DRA7: hwmod: Add reset data for PCIe
Date: Wed, 13 Jan 2016 09:13:28 -0800 [thread overview]
Message-ID: <20160113171328.GG12777@atomide.com> (raw)
In-Reply-To: <1452667666-17533-2-git-send-email-kishon@ti.com>
* Kishon Vijay Abraham I <kishon@ti.com> [160112 22:48]:
> Add PCIe reset data to PCIe hwmods on DRA7x.
Adding Paul and Tero to Cc. I don't see other solution to get
the PCI driver working until the reset driver is available.
Regards,
Tony
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 15 +++++++++++++++
> arch/arm/mach-omap2/prm7xx.h | 1 +
> 2 files changed, 16 insertions(+)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> index ee4e044..1281deb 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> @@ -1532,14 +1532,21 @@ static struct omap_hwmod_class dra7xx_pciess_hwmod_class = {
> };
>
> /* pcie1 */
> +static struct omap_hwmod_rst_info dra7xx_pciess1_resets[] = {
> + { .name = "pcie", .rst_shift = 0 },
> +};
> +
> static struct omap_hwmod dra7xx_pciess1_hwmod = {
> .name = "pcie1",
> .class = &dra7xx_pciess_hwmod_class,
> .clkdm_name = "pcie_clkdm",
> + .rst_lines = dra7xx_pciess1_resets,
> + .rst_lines_cnt = ARRAY_SIZE(dra7xx_pciess1_resets),
> .main_clk = "l4_root_clk_div",
> .prcm = {
> .omap4 = {
> .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET,
> + .rstctrl_offs = DRA7XX_RM_L3INIT_PCIESS_RSTCTRL_OFFSET,
> .context_offs = DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET,
> .modulemode = MODULEMODE_SWCTRL,
> },
> @@ -1547,14 +1554,22 @@ static struct omap_hwmod dra7xx_pciess1_hwmod = {
> };
>
> /* pcie2 */
> +static struct omap_hwmod_rst_info dra7xx_pciess2_resets[] = {
> + { .name = "pcie", .rst_shift = 1 },
> +};
> +
> +/* pcie2 */
> static struct omap_hwmod dra7xx_pciess2_hwmod = {
> .name = "pcie2",
> .class = &dra7xx_pciess_hwmod_class,
> .clkdm_name = "pcie_clkdm",
> + .rst_lines = dra7xx_pciess2_resets,
> + .rst_lines_cnt = ARRAY_SIZE(dra7xx_pciess2_resets),
> .main_clk = "l4_root_clk_div",
> .prcm = {
> .omap4 = {
> .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS2_CLKCTRL_OFFSET,
> + .rstctrl_offs = DRA7XX_RM_L3INIT_PCIESS_RSTCTRL_OFFSET,
> .context_offs = DRA7XX_RM_L3INIT_PCIESS2_CONTEXT_OFFSET,
> .modulemode = MODULEMODE_SWCTRL,
> },
> diff --git a/arch/arm/mach-omap2/prm7xx.h b/arch/arm/mach-omap2/prm7xx.h
> index cc1e6a2..294deed 100644
> --- a/arch/arm/mach-omap2/prm7xx.h
> +++ b/arch/arm/mach-omap2/prm7xx.h
> @@ -360,6 +360,7 @@
> /* PRM.L3INIT_PRM register offsets */
> #define DRA7XX_PM_L3INIT_PWRSTCTRL_OFFSET 0x0000
> #define DRA7XX_PM_L3INIT_PWRSTST_OFFSET 0x0004
> +#define DRA7XX_RM_L3INIT_PCIESS_RSTCTRL_OFFSET 0x0010
> #define DRA7XX_PM_L3INIT_MMC1_WKDEP_OFFSET 0x0028
> #define DRA7XX_RM_L3INIT_MMC1_CONTEXT_OFFSET 0x002c
> #define DRA7XX_PM_L3INIT_MMC2_WKDEP_OFFSET 0x0030
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2016-01-13 17:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 6:47 [PATCH v2 0/3] dra7xx: get pcie working in mainline Kishon Vijay Abraham I
2016-01-13 6:47 ` [PATCH v2 1/3] ARM: DRA7: hwmod: Add reset data for PCIe Kishon Vijay Abraham I
2016-01-13 17:13 ` Tony Lindgren [this message]
2016-01-13 17:46 ` Suman Anna
2016-01-13 6:47 ` [PATCH v2 2/3] ARM: DRA7: add pdata-quirks to do reset of PCIe Kishon Vijay Abraham I
2016-01-13 17:35 ` Suman Anna
2016-01-13 6:47 ` [PATCH v2 3/3] pci: dra7xx: use pdata callbacks to perform reset Kishon Vijay Abraham I
2016-01-13 17:19 ` Tony Lindgren
2016-01-13 17:51 ` Suman Anna
2016-01-14 8:37 ` Kishon Vijay Abraham I
2016-01-14 13:28 ` Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160113171328.GG12777@atomide.com \
--to=tony@atomide.com \
--cc=bhelgaas@google.com \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nsekhar@ti.com \
--cc=paul@pwsan.com \
--cc=richardcochran@gmail.com \
--cc=s-anna@ti.com \
--cc=t-kristo@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).