From patchwork Mon Nov 5 15:10:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1698481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 01307DF2AB for ; Mon, 5 Nov 2012 15:15:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TVOMG-0006Ym-JT; Mon, 05 Nov 2012 15:13:01 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TVOKO-0005VX-UR for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2012 15:11:05 +0000 Received: by mail-wg0-f49.google.com with SMTP id gg4so2667270wgb.18 for ; Mon, 05 Nov 2012 07:11:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=vUA2g/fbimRZr9eIgn3RYJjh41iltHozJb62+33U1g8=; b=U2TRNlz68GcQ5dSLbLAl+CXBFONJzy0azf+c1WgYCwwt2E7Zk6EZGwU5N4p0lm0/oq GotYAWNBbYKqvL/euaeWBzlKzrs4/ie6lW7kbjs0TB5i3wOEucLSLXBsxuvmbeJu1kb+ GcE8YwadlyKiearbE5Xh4b04qknJJ24BAlCHzXwGszW7pCTyebhv0jGgx5Ekxm261DZ6 RsnO25txDVE8b0V6PQuQVo7ucK2nEHfYsQA0cMGoB4kl0gxaXeDDCZlu2NBXCvOibB9L vnx7T0TvkxxIyM2DQn2yEFfrg5Bj1KIy36ih/8+7elwAV4kX6gxQtaJZIk0xAFvTBtvK Gqig== Received: by 10.180.100.97 with SMTP id ex1mr13658572wib.17.1352128264597; Mon, 05 Nov 2012 07:11:04 -0800 (PST) Received: from laptop.vlan14.pylonone.local (78.Red-88-2-49.staticIP.rima-tde.net. [88.2.49.78]) by mx.google.com with ESMTPS id ea9sm12275388wib.11.2012.11.05.07.11.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:11:03 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sameo@linux.intel.com Subject: [PATCH 8/8] mfd: Differentiate between u8500 and u9540 TCDM address mapping Date: Mon, 5 Nov 2012 16:10:36 +0100 Message-Id: <1352128236-11554-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352128236-11554-1-git-send-email-lee.jones@linaro.org> References: <1352128236-11554-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQm9xm/I+/jJbIxuHLvZv06kVvJbtTChNtVczJjGgDNF8OPmgtSp6jIXWxyCTfNOz7gPPh13 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121105_101105_190287_96899326 X-CRM114-Status: GOOD ( 14.08 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 Signed-off-by: Lee Jones --- 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 e91a6e6..70898c9 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2757,7 +2757,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) { @@ -2775,7 +2775,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();