From patchwork Wed Nov 6 10:05:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 21358 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D831220DB9 for ; Wed, 6 Nov 2013 10:06:05 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md4sf15650165pbc.4 for ; Wed, 06 Nov 2013 02:06:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=83dlJr7GiduM1rydV6ENfcpeynccwbAoUxT9VlsiKWM=; b=EocqX1Wn/dSHuF33AVbl/1XjdDw3+oTXwH4H86dcOXTe9zNx19ZghMSmSA46vG++eT nx6IFtcBK+VzBt8mGv61QW4U3Xj+rIVrFeMD1kLTMeodz0iXKobu9zWRW9DGGGol+foY /9E5ElKAK2e9YcP3hPGPcVUSWccjhSM4a5/w7EHEaHCKfL0gyQM79mg+Q7d0xBlUJP0a dD6A5kspgc43nM568RHGRhw6uUV+aH2rDei22XKiJpSiGXq7GUYB13b9pz73eXZal7QQ LTANd/UpPd3kxp7SbOCaf8O98r3cvSGBUWWWQ562NdTX8iPmaUgk5dS6XnIoH4kLosjB 1edg== X-Gm-Message-State: ALoCoQnwUo5ILi+ZLqukN1r6OFNlV4VBaXsNXKA55qlMiSsGzlTMh7ghUoO5insZRwTBM/0FMCiw X-Received: by 10.66.49.166 with SMTP id v6mr1078506pan.1.1383732364899; Wed, 06 Nov 2013 02:06:04 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.116.43 with SMTP id jt11ls567092qeb.24.gmail; Wed, 06 Nov 2013 02:06:04 -0800 (PST) X-Received: by 10.58.161.231 with SMTP id xv7mr1737199veb.2.1383732364751; Wed, 06 Nov 2013 02:06:04 -0800 (PST) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id pv1si6825453veb.56.2013.11.06.02.06.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:06:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id c14so3410819vea.13 for ; Wed, 06 Nov 2013 02:06:04 -0800 (PST) X-Received: by 10.221.39.195 with SMTP id tn3mr1701605vcb.2.1383732364665; Wed, 06 Nov 2013 02:06:04 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp272598vcz; Wed, 6 Nov 2013 02:06:04 -0800 (PST) X-Received: by 10.42.70.5 with SMTP id d5mr1440843icj.39.1383732364062; Wed, 06 Nov 2013 02:06:04 -0800 (PST) Received: from mail-ie0-f177.google.com (mail-ie0-f177.google.com [209.85.223.177]) by mx.google.com with ESMTPS id ki9si6976575igb.10.2013.11.06.02.06.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:06:03 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.177 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.223.177; Received: by mail-ie0-f177.google.com with SMTP id e14so16507205iej.8 for ; Wed, 06 Nov 2013 02:06:03 -0800 (PST) X-Received: by 10.43.103.133 with SMTP id di5mr1489891icc.38.1383732363333; Wed, 06 Nov 2013 02:06:03 -0800 (PST) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginm.net. [92.233.57.238]) by mx.google.com with ESMTPSA id l7sm13291205igx.2.2013.11.06.02.06.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:06:02 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, Lee Jones Subject: [PATCH 4/7] ARM: ux500: Clean-up non-DT IRQ initialisation Date: Wed, 6 Nov 2013 10:05:45 +0000 Message-Id: <1383732348-18576-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1383732348-18576-1-git-send-email-lee.jones@linaro.org> References: <1383732348-18576-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 8f8004f..d11ac4b 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -63,12 +63,7 @@ void __init ux500_init_irq(void) } else ux500_unknown_soc(); -#ifdef CONFIG_OF - if (of_have_populated_dt()) - irqchip_init(); - else -#endif - gic_init(0, 29, dist_base, cpu_base); + irqchip_init(); /* * Init clocks here so that they are available for system timer @@ -78,16 +73,11 @@ void __init ux500_init_irq(void) prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1); ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1); - if (of_have_populated_dt()) - u8500_of_clk_init(U8500_CLKRST1_BASE, - U8500_CLKRST2_BASE, - U8500_CLKRST3_BASE, - U8500_CLKRST5_BASE, - U8500_CLKRST6_BASE); - else - u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE, - U8500_CLKRST3_BASE, U8500_CLKRST5_BASE, - U8500_CLKRST6_BASE); + u8500_of_clk_init(U8500_CLKRST1_BASE, + U8500_CLKRST2_BASE, + U8500_CLKRST3_BASE, + U8500_CLKRST5_BASE, + U8500_CLKRST6_BASE); } else if (cpu_is_u9540()) { prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1); ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);