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: 2321411 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 EC3AADFE82 for ; Fri, 22 Mar 2013 15:31:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJ3tT-0003PZ-QE; Fri, 22 Mar 2013 15:28:35 +0000 Received: from mail-we0-x229.google.com ([2a00:1450:400c:c03::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJ3sx-0003IC-Gu for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2013 15:28:05 +0000 Received: by mail-we0-f169.google.com with SMTP id x56so2554353wey.14 for ; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=ozEwayzmM1f2h2a+fS1yDGqaW5Ght0/zH0lVRFkrWhA=; b=EJV65qFdLDHiAmPCzesSQdymLDg47qiszb/ys2+sbstNdoNmuHMOvc+owWojUPA97V Sn47NVShRD7x73HTAyRoB+BK1o4cxGr+36SNLRgqgBhxvNrDlLg90LvrH+0gCBxK4DNf 9NlmKRt3hHbZopWnngFpaeR+afGktjp83Lkpk88ZjAu1tXybWmRX8wxVKLs2zsAhtonO d18heW+DI8skjaWp3p5IImbVxmcAmkvbMip3WTjG5xsHN24qttTs7cKYB8Az7zJMcsNP hbIgazpgRyB/CRTjDpeVP3ow/ODI5vu1N6rqBJGiBorvnNyekGL0FOJRzBOOLahCx1rq maKQ== 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 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: ALoCoQnqdGM+lgiwsRAQPzYDgG7j3oVpxVQ2F4yBXf5a2Xu8naZSQkPDUkVdoXRKtDSJABFNZphL X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130322_112803_736455_D97EB8FA X-CRM114-Status: GOOD ( 10.05 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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)