From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: linus.walleij@linaro.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 4/7] ARM: ux500: Clean-up non-DT IRQ initialisation
Date: Wed, 6 Nov 2013 10:05:45 +0000 [thread overview]
Message-ID: <1383732348-18576-5-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1383732348-18576-1-git-send-email-lee.jones@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
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);
--
1.8.1.2
next prev parent reply other threads:[~2013-11-06 10:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-06 10:05 [PATCH 0/7] ARM: ux500: More DT only clean-ups for the platform Lee Jones
2013-11-06 10:05 ` [PATCH 1/7] ARM: ux500: Remove legacy ATAG SSP support Lee Jones
2013-11-06 11:58 ` Linus Walleij
2013-11-07 11:47 ` Russell King - ARM Linux
2013-11-07 11:52 ` Lee Jones
2013-11-06 10:05 ` [PATCH 2/7] ARM: ux500: Consolidate [A|D]8500 platform data Lee Jones
2013-11-06 12:01 ` Linus Walleij
2013-11-06 12:04 ` Lee Jones
[not found] ` <201311071253281097419@gmail.com>
2013-11-07 9:41 ` PINCTRL:We May need mutex protect in pinctrl API Linus Walleij
[not found] ` <201311071748050629542@gmail.com>
2013-11-18 13:22 ` Linus Walleij
2013-11-06 10:05 ` [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC) Lee Jones
2013-11-07 11:40 ` Ulf Hansson
2013-11-07 12:07 ` Lee Jones
2013-11-08 9:06 ` Linus Walleij
2013-11-08 9:26 ` Lee Jones
2013-11-08 9:45 ` Linus Walleij
2013-11-07 11:46 ` Russell King - ARM Linux
2013-11-07 11:54 ` Lee Jones
2013-11-06 10:05 ` Lee Jones [this message]
2013-11-19 20:45 ` [PATCH 4/7] ARM: ux500: Clean-up non-DT IRQ initialisation Linus Walleij
2013-11-06 10:05 ` [PATCH 5/7] ARM: ux500: Remove unused call to register AMBA devices Lee Jones
2013-11-19 20:54 ` Linus Walleij
2013-11-06 10:05 ` [PATCH 6/7] ARM: ux500: Clean-up legacy extern prototype Lee Jones
2013-11-19 20:56 ` Linus Walleij
2013-11-06 10:05 ` [PATCH 7/7] ARM: ux500: Remove checking for DT during timer init as we are now DT only Lee Jones
2013-11-19 20:58 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383732348-18576-5-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).