mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH v2 3/8] ARM: at91: pm: add UDP and UHP checks to newer SoCs
Date: Thu, 15 Jan 2015 15:59:26 +0100	[thread overview]
Message-ID: <1421333971-7581-4-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1421333971-7581-1-git-send-email-alexandre.belloni@free-electrons.com>

Check UDP and UHP on sam9x5, sam9n12 and the sama5 series.
Check UHP on the sam9g45.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/pm.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 515791edcc60..71cc845263dc 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -275,6 +275,7 @@ static int __init at91_pm_init(void)
 	pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : ""));
 
 	at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;
+	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
 
 	if (of_machine_is_compatible("atmel,at91rm9200")) {
 		/*
@@ -286,14 +287,8 @@ static int __init at91_pm_init(void)
 		at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP |
 					    AT91RM9200_PMC_UDP;
 		at91_pm_data.memctrl = AT91_MEMCTRL_MC;
-	} else if (of_machine_is_compatible("atmel,at91sam9260") ||
-		   of_machine_is_compatible("atmel,at91sam9g20") ||
-		   of_machine_is_compatible("atmel,at91sam9261") ||
-		   of_machine_is_compatible("atmel,at91sam9g10") ||
-		   of_machine_is_compatible("atmel,at91sam9263")) {
-		at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP |
-					    AT91SAM926x_PMC_UDP;
 	} else if (of_machine_is_compatible("atmel,at91sam9g45")) {
+		at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP;
 		at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
 	}
 
-- 
2.1.0


  parent reply	other threads:[~2015-01-15 14:59 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-15 14:59 [PATCH v2 0/8] AT91 cleanup for 3.20 #2 Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 1/8] ARM: at91: pm: rework cpu detection Alexandre Belloni
2015-01-16  2:44   ` Yang, Wenyou
2015-01-16 10:26     ` Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 2/8] ARM: at91: pm: use the mmio-sram pool to access SRAM Alexandre Belloni
2015-01-15 14:59 ` Alexandre Belloni [this message]
2015-01-15 14:59 ` [PATCH v2 4/8] ARM: at91: pm: prepare for multiplatform Alexandre Belloni
2015-01-22 16:03   ` [PATCH] ARM: at91: fix PM initialization for newer SoCs Nicolas Ferre
2015-01-22 16:07     ` [PATCH v2] " Nicolas Ferre
2015-01-23  7:50       ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-23 10:11         ` Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 5/8] ARM: at91: remove useless map_io Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 6/8] ARM: at91: sama5d4: remove useless call to at91_init_sram Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 7/8] ARM: at91: remove unused at91_init_sram Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 8/8] ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c Alexandre Belloni
2015-01-16 17:11 ` [PATCH v2 0/8] AT91 cleanup for 3.20 #2 Nicolas Ferre

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=1421333971-7581-4-git-send-email-alexandre.belloni@free-electrons.com \
    --to=alexandre.belloni@free-electrons.com \
    --cc=arnd@arndb.de \
    --cc=boris.brezillon@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.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

all inboxes | Powered by JetHome®