From patchwork Tue Nov 27 09:34:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13233 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E3C404C1794 for ; Tue, 27 Nov 2012 09:34:58 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 60721A19C31 for ; Tue, 27 Nov 2012 09:34:58 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so5971604iag.11 for ; Tue, 27 Nov 2012 01:34:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=0V6VEoW6gaZ2P/2tWKxjMS9cSeZUazComyWMqjlYD80=; b=WBvewRf4D38QVZknr+Y76F21h2A1FLQyMMq2D1njX3Atb1oi+4v/qPPgWsAUlmj5rt l+8LPzwU/6HKZsGvuH52E7ZKVVarIID/mibt2cxqeLw8MWvfrpjnsZtaNFKRLLkYNuLm tV3+JApgPAb1ze4sRa6yWUQGRyza3ZdlmKj/aGs/hJTGb93fQnfGMF6pERnTF/Mj7rWN MIVDTRFoEgYH1fAkhfM+u5Ri9zAZngogE2hZLaVKzWNlRGPZpdmsHFuU3imsbSd9u5Fs GNTlcQBsILvNSySM8s3Vc5W7+H4NRz5wNKJtCvm7hzP0uIEtbA9mvTbXaPsofUkrK5YS syrg== Received: by 10.50.161.169 with SMTP id xt9mr17238833igb.62.1354008897686; Tue, 27 Nov 2012 01:34:57 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp426814igt; Tue, 27 Nov 2012 01:34:57 -0800 (PST) Received: by 10.180.92.132 with SMTP id cm4mr25673033wib.12.1354008896457; Tue, 27 Nov 2012 01:34:56 -0800 (PST) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by mx.google.com with ESMTPS id x4si9815693wex.66.2012.11.27.01.34.55 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Nov 2012 01:34:56 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.179 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.179; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.179 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f179.google.com with SMTP id r6so4075843wey.38 for ; Tue, 27 Nov 2012 01:34:55 -0800 (PST) Received: by 10.180.88.42 with SMTP id bd10mr17625377wib.8.1354008895590; Tue, 27 Nov 2012 01:34:55 -0800 (PST) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id p2sm1987018wic.7.2012.11.27.01.34.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Nov 2012 01:34:54 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 1/1] ARM: ux500: Fix u9540 booting issues Date: Tue, 27 Nov 2012 09:34:50 +0000 Message-Id: <1354008890-10476-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQm8Md18pSf/b0btOBem0cdvmoi5MTo0ISAbXHP75I3CXVwe5VBtY/2SB9seBlbKY+Nlbcfx The u9540 stopped booting after the v3.7 merge window due to a lack of common clk support and early PRCMU initialisation. In this patch we rectify these issues, placing the u9540 development board back into a successfully booting state. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 721e7b4..d4dcec5 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -71,13 +71,11 @@ void __init ux500_init_irq(void) * Init clocks here so that they are available for system timer * initialization. */ - if (cpu_is_u8500_family()) + if (cpu_is_u8500_family() || cpu_is_u9540()) db8500_prcmu_early_init(); - if (cpu_is_u8500_family()) + if (cpu_is_u8500_family() || cpu_is_u9540()) u8500_clk_init(); - else if (cpu_is_u9540()) - u9540_clk_init(); else if (cpu_is_u8540()) u8540_clk_init(); }