mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, linus.walleij@stericsson.com,
	Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 6/6] mfd: Differentiate between u8500 and u9540 TCDM address mapping
Date: Wed, 10 Oct 2012 16:18:55 +0100	[thread overview]
Message-ID: <1349882335-6786-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1349882335-6786-1-git-send-email-lee.jones@linaro.org>

The TCDM mappings are quite different from u8500 to u9540. If these
aren't correctly specified for a given board, it will fail to boot.
Here we add the correct TCDM base for the u9540.

Please note that although this patch allows us to boot the u9540,
it doesn't provide us with full enablement. For that, another
patch-set will follow which completely re-vamps the way the PRCMU
is passed TCDM mappings.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/db8500-prcmu.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 9d51585..fd0462a 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2670,7 +2670,7 @@ static int db8500_irq_init(struct device_node *np)
 
 void __init db8500_prcmu_early_init(void)
 {
-	if (cpu_is_u8500v2()) {
+	if (cpu_is_u8500v2() || cpu_is_u9540()) {
 		void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
 
 		if (tcpm_base != NULL) {
@@ -2688,7 +2688,11 @@ void __init db8500_prcmu_early_init(void)
 			iounmap(tcpm_base);
 		}
 
-		tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
+		if (cpu_is_u9540())
+			tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
+						SZ_4K + SZ_8K) + SZ_8K;
+		else
+			tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
 	} else {
 		pr_err("prcmu: Unsupported chip version\n");
 		BUG();
-- 
1.7.9.5


  parent reply	other threads:[~2012-10-10 15:19 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-10 15:18 [PATCH 0/6] Provide basic support for the u9540 Lee Jones
2012-10-10 15:18 ` [PATCH 1/6] ARM: ux500: Remove unused board compatible string Lee Jones
2012-10-10 15:18 ` [PATCH 2/6] ARM: ux500: Add skeleton DTS file for the u9540 Lee Jones
2012-10-10 15:18 ` [PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC Lee Jones
2012-10-10 19:01   ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-11  7:38     ` Lee Jones
2012-10-11  8:52       ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-11  9:20         ` Lee Jones
2012-10-11 18:11           ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-10 15:18 ` [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree Lee Jones
2012-10-10 19:03   ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-11  7:29     ` Lee Jones
2012-10-11  8:50       ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-11  9:22         ` Lee Jones
2012-10-11 18:06           ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-12 21:15             ` Linus Walleij
2012-10-10 15:18 ` [PATCH 5/6] ARM: ux500: Enable SDI4 port on the u9540 when booting with " Lee Jones
2012-10-10 19:04   ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-11  7:28     ` Lee Jones
2012-10-10 15:18 ` Lee Jones [this message]
2012-10-10 18:34   ` [PATCH 6/6] mfd: Differentiate between u8500 and u9540 TCDM address mapping Arnd Bergmann
2012-10-11  8:59     ` Lee Jones
2012-10-11  9:16       ` Arnd Bergmann

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=1349882335-6786-7-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=arnd@arndb.de \
    --cc=linus.walleij@stericsson.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®