From patchwork Fri Mar 22 15:27:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15549 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 5867323E66 for ; Fri, 22 Mar 2013 15:28:03 +0000 (UTC) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by fiordland.canonical.com (Postfix) with ESMTP id 26578A18227 for ; Fri, 22 Mar 2013 15:28:03 +0000 (UTC) Received: by mail-la0-f46.google.com with SMTP id fq12so7413225lab.5 for ; Fri, 22 Mar 2013 08:28:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=ozEwayzmM1f2h2a+fS1yDGqaW5Ght0/zH0lVRFkrWhA=; b=hfErUjw56JxsCB/OeT0C2PtpqwOi1+OtV9XOiopliECZbYdXO/c6a0Q0MRuUHwBWM3 B2GltEQL45mPt+3JBzQqrCPZ5PFI/vpNH1ABuwtMN5GY1lvBR1ptl5cpD8L+lrnl+omZ mQR3IyQ67LUxzro8x83XvCh9NM5xrvnZMe1sP2nUpe0kFuywvFcXoisv90MxNW5O24eW Mnp/RPPmfIbiLejOSpbC3rH2rdOJkH4yNn4lc29mWJQjpVZfC+8BKJyjHeeVuf0lLAzd BbuFHpQS8NzbgUwZ2gqEW1knXt7HYqnjMdvrl/3TuLMctkdL/YwsGjYpcW+smgX/2ZJM yu7g== X-Received: by 10.112.9.10 with SMTP id v10mr1390820lba.47.1363966082653; Fri, 22 Mar 2013 08:28:02 -0700 (PDT) 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.112.91.146 with SMTP id ce18csp114142lbb; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) X-Received: by 10.194.123.103 with SMTP id lz7mr3965468wjb.10.1363966081747; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]) by mx.google.com with ESMTPS id cp10si1110036wjb.153.2013.03.22.08.28.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:28:01 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::232 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::232 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-f178.google.com with SMTP id o45so3278513wer.23 for ; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) X-Received: by 10.194.119.200 with SMTP id kw8mr3890645wjb.31.1363966081529; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id r7sm4249093wiz.2.2013.03.22.08.27.59 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:28:00 -0700 (PDT) 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 3/5] ARM: ux500: Remove platform specific PRCMU and Clk initialisation Date: Fri, 22 Mar 2013 15:27:43 +0000 Message-Id: <1363966065-2478-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363966065-2478-1-git-send-email-lee.jones@linaro.org> References: <1363966065-2478-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmtOxFDNa8/73Me99GVNnKBPZwoe8aHsFCtEohjHski2H/aMPszyWFGVKr9HYUBZK4Yzofm For the moment at least, every platform which executes though ux500_init_irq requires the same clk and prcmu initialisation. So let's call those functions without clause. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 537870d..1fc3608 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -68,13 +68,8 @@ void __init ux500_init_irq(void) * Init clocks here so that they are available for system timer * initialization. */ - if (cpu_is_u8500_family() || cpu_is_u9540()) - db8500_prcmu_early_init(); - - if (cpu_is_u8500_family() || cpu_is_u9540()) - u8500_clk_init(); - else if (cpu_is_u8540()) - u8540_clk_init(); + db8500_prcmu_early_init(); + u8500_clk_init(); } void __init ux500_init_late(void)