From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 09/13] ARM: at91: pm: find and remap the pmc
Date: Thu, 14 Jan 2016 18:04:21 -0800 [thread overview]
Message-ID: <20160115020421.GK22188@codeaurora.org> (raw)
In-Reply-To: <1449248628-3486-10-git-send-email-alexandre.belloni@free-electrons.com>
On 12/04, Alexandre Belloni wrote:
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 5c2b60c5a2a1..38e93174031d 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -35,6 +35,8 @@
> #include "generic.h"
> #include "pm.h"
>
> +void __iomem *pmc;
static?
> +
> /*
> * FIXME: this is needed to communicate between the pinctrl driver and
> * the PM implementation in the machine. Possibly part of the PM
> @@ -85,7 +87,7 @@ static int at91_pm_verify_clocks(void)
> unsigned long scsr;
> int i;
>
> - scsr = at91_pmc_read(AT91_PMC_SCSR);
> + scsr = readl(pmc + AT91_PMC_SCSR);
>
> /* USB must not be using PLLB */
> if ((scsr & at91_pm_data.uhp_udp_mask) != 0) {
> @@ -99,8 +101,7 @@ static int at91_pm_verify_clocks(void)
>
> if ((scsr & (AT91_PMC_PCK0 << i)) == 0)
> continue;
> -
> - css = at91_pmc_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS;
> + css = readl(pmc + AT91_PMC_PCKR(i)) & AT91_PMC_CSS;
> if (css != AT91_PMC_CSS_SLOW) {
> pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
> return 0;
> @@ -143,8 +144,8 @@ static void at91_pm_suspend(suspend_state_t state)
> flush_cache_all();
> outer_disable();
>
> - at91_suspend_sram_fn(at91_pmc_base, at91_ramc_base[0],
> - at91_ramc_base[1], pm_data);
> + at91_suspend_sram_fn(pmc, at91_ramc_base[0],
> + at91_ramc_base[1], pm_data);
>
> outer_resume();
> }
> @@ -394,13 +395,33 @@ static void __init at91_pm_sram_init(void)
> &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
> }
>
> +static const struct of_device_id atmel_pmc_ids[] = {
__initconst?
> + { .compatible = "atmel,at91rm9200-pmc" },
> + { .compatible = "atmel,at91sam9260-pmc" },
> + { .compatible = "atmel,at91sam9g45-pmc" },
> + { .compatible = "atmel,at91sam9n12-pmc" },
> + { .compatible = "atmel,at91sam9x5-pmc" },
> + { .compatible = "atmel,sama5d3-pmc" },
> + { .compatible = "atmel,sama5d2-pmc" },
> + { /* sentinel */ },
> +};
> +
> static void __init at91_pm_init(void)
> {
> - at91_pm_sram_init();
> + struct device_node *pmc_np;
>
> if (at91_cpuidle_device.dev.platform_data)
> platform_device_register(&at91_cpuidle_device);
>
> + pmc_np = of_find_matching_node(NULL, atmel_pmc_ids);
> + pmc = of_iomap(pmc_np, 0);
> + if (!pmc) {
> + pr_info("AT91: PM not supported, PMC not found\n");
pr_err?
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-01-15 2:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-04 17:03 [PATCH v3 00/13] ARM: at91: PMC driver rework Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 01/13] clk: at91: make use of syscon to share PMC registers in several drivers Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 02/13] clk: at91: make use of syscon/regmap internally Alexandre Belloni
2016-01-15 2:10 ` Stephen Boyd
2015-12-04 17:03 ` [PATCH v3 03/13] clk: at91: clk-main: factorize irq handling Alexandre Belloni
2016-01-15 2:08 ` Stephen Boyd
2015-12-04 17:03 ` [PATCH v3 04/13] clk: at91: make IRQ optional and register them later Alexandre Belloni
2016-01-15 2:02 ` Stephen Boyd
2016-01-15 9:39 ` Boris Brezillon
2016-01-16 1:26 ` Stephen Boyd
2016-01-16 12:45 ` Boris Brezillon
2016-01-20 22:04 ` Stephen Boyd
2016-01-22 15:40 ` Sebastian Andrzej Siewior
2016-01-25 22:28 ` Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 05/13] clk: at91: only disable available IRQs Alexandre Belloni
2016-01-15 2:05 ` Stephen Boyd
2015-12-04 17:03 ` [PATCH v3 06/13] clk: at91: pmc: merge at91_pmc_init in atmel_pmc_probe Alexandre Belloni
2016-01-15 2:04 ` Stephen Boyd
2015-12-04 17:03 ` [PATCH v3 07/13] clk: at91: pmc: move pmc structures to C file Alexandre Belloni
2016-01-15 2:04 ` Stephen Boyd
2015-12-04 17:03 ` [PATCH v3 08/13] ARM: at91: pm: simply call at91_pm_init Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 09/13] ARM: at91: pm: find and remap the pmc Alexandre Belloni
2016-01-15 2:04 ` Stephen Boyd [this message]
2015-12-04 17:03 ` [PATCH v3 10/13] ARM: at91: pm: move idle functions to pm.c Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 11/13] ARM: at91: remove useless includes and function prototypes Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 12/13] usb: gadget: atmel: access the PMC using regmap Alexandre Belloni
2015-12-04 17:03 ` [PATCH v3 13/13] clk: at91: pmc: drop at91_pmc_base Alexandre Belloni
2016-01-15 2:07 ` Stephen Boyd
2015-12-10 17:06 ` [PATCH v3 00/13] ARM: at91: PMC driver rework Boris Brezillon
2015-12-15 9:22 ` Alexandre Belloni
2016-01-15 2:07 ` Stephen Boyd
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=20160115020421.GK22188@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).