* [GIT PULL 02/10] 2nd irq-s3c24xx for v3.10
@ 2013-04-08 18:18 Kukjin Kim
2013-04-09 20:19 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Kukjin Kim @ 2013-04-08 18:18 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit d98fedef912832611b668fa7ece8e8ff54a6a590:
gpio: samsung: fixes build warning with s3c2410_defconfig (2013-03-05
20:21:36 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/irq-s3c24xx-for-v3.10
for you to fetch changes up to f0774d41da0e607b70e54ecc50aeb6684f54c2b1:
irqchip: s3c24xx: add devicetree support (2013-04-04 14:56:30 +0900)
----------------------------------------------------------------
s3c24xx irq cleanup and move into drivers/irqchip
----------------------------------------------------------------
Heiko Stuebner (12):
ARM: S3C24XX: fix redundant checks in the irq mapping function
ARM: S3C24XX: fix irq parent check
ARM: S3C24XX: move s3c24xx_init_irq to s3c2410_init_irq
ARM: S3C24XX: make s3c24xx_init_intc static
ARM: S3C24XX: add handle_irq function
ARM: S3C24XX: move irq driver to drivers/irqchip
irqchip: s3c24xx: fix comments on some camera interrupts
irqchip: s3c24xx: fix irqlist of second s3c2416 controller
irqchip: s3c24xx: add irq_set_type callback for basic interrupt types
irqchip: s3c24xx: globally keep track of the created intc instances
irqchip: s3c24xx: make interrupt handling independent of
irq_domain structure
irqchip: s3c24xx: add devicetree support
.../interrupt-controller/samsung,s3c24xx-irq.txt | 53 +++
arch/arm/Kconfig | 1 +
arch/arm/mach-s3c24xx/Makefile | 2 +-
arch/arm/mach-s3c24xx/common.h | 1 +
arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 70 ---
arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
arch/arm/mach-s3c24xx/mach-bast.c | 2 +-
arch/arm/mach-s3c24xx/mach-h1940.c | 7 +-
arch/arm/mach-s3c24xx/mach-n30.c | 4 +-
arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +-
arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
arch/arm/mach-s3c24xx/mach-vr1000.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu.h | 1 -
drivers/irqchip/Makefile | 1 +
.../irq.c => drivers/irqchip/irq-s3c24xx.c | 523
++++++++++++++++-----
17 files changed, 472 insertions(+), 205 deletions(-)
create mode 100644
Documentation/devicetree/bindings/interrupt-controller/samsung,s3c24xx-irq.txt
delete mode 100644 arch/arm/mach-s3c24xx/include/mach/entry-macro.S
rename arch/arm/mach-s3c24xx/irq.c => drivers/irqchip/irq-s3c24xx.c (75%)
--
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL 02/10] 2nd irq-s3c24xx for v3.10
2013-04-08 18:18 [GIT PULL 02/10] 2nd irq-s3c24xx for v3.10 Kukjin Kim
@ 2013-04-09 20:19 ` Arnd Bergmann
2013-04-09 20:21 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2013-04-09 20:19 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 08 April 2013, Kukjin Kim wrote:
> s3c24xx irq cleanup and move into drivers/irqchip
I had a little trouble applying this because of the interface change to
CLOCKSOURCE_OF_DECLARE. This is the rather complex merge I did. Please
check that it still works.
Arnd
commit 682f619ef995c6bc7e07b356451b8d762caefc5e
Merge: 894b738 354599f
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue Apr 9 22:07:37 2013 +0200
Merge tag 'mct-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim <kgene.kim@samsung.com>:
add support exynos mct device tree and move into drivers/clocksource
* tag 'mct-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
clocksource: mct: Add terminating entry for exynos_mct_ids table
clocksource: mct: Add missing semicolons in exynos_mct.c
ARM: EXYNOS: move mct driver to drivers/clocksource
ARM: EXYNOS: remove static io-remapping of mct registers for Exynos5
ARM: dts: add mct device tree node for all supported Exynos SoC's
ARM: EXYNOS: allow dt based discovery of mct controller using clocksource_of_init
ARM: EXYNOS: add device tree support for MCT controller driver
ARM: EXYNOS: prepare an array of MCT interrupt numbers and use it
ARM: EXYNOS: add a register base address variable in mct controller driver
Conflicts:
drivers/clocksource/Makefile
drivers/clocksource/exynos_mct.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --cc drivers/clocksource/Makefile
index e74c8ce,1c1b15d..cd1f09c
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -19,7 -19,7 +19,8 @@@ obj-$(CONFIG_ARCH_BCM2835) += bcm2835_t
obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o
obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o
obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o
- obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o
++obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o
+ obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o
obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o
obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o
diff --cc drivers/clocksource/exynos_mct.c
index c9d6650,d3f1327..957af86
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@@ -445,13 -477,17 +477,17 @@@ static struct local_timer_ops exynos4_m
};
#endif /* CONFIG_LOCAL_TIMERS */
- static void __init exynos4_timer_resources(void)
-static void __init exynos4_timer_resources(struct device_node *np)
++static void __init exynos4_timer_resources(void __iomem *base)
{
struct clk *mct_clk;
mct_clk = clk_get(NULL, "xtal");
clk_rate = clk_get_rate(mct_clk);
- reg_base = np ? of_iomap(np, 0) : S5P_VA_SYSTIMER;
++ reg_base = base;
+ if (!reg_base)
+ panic("%s: unable to ioremap mct address space\n", __func__);
+
#ifdef CONFIG_LOCAL_TIMERS
if (mct_int_type == MCT_INT_PPI) {
int err;
@@@ -467,19 -503,49 +503,54 @@@
#endif /* CONFIG_LOCAL_TIMERS */
}
- void __init exynos4_timer_init(void)
-static const struct of_device_id exynos_mct_ids[] = {
- { .compatible = "samsung,exynos4210-mct", .data = (void *)MCT_INT_SPI },
- { .compatible = "samsung,exynos4412-mct", .data = (void *)MCT_INT_PPI },
- { }
-};
-
+ void __init mct_init(void)
{
- if (soc_is_exynos5440()) {
- arch_timer_of_register();
- return;
- struct device_node *np = NULL;
- const struct of_device_id *match;
- u32 nr_irqs, i;
-
-#ifdef CONFIG_OF
- np = of_find_matching_node_and_match(NULL, exynos_mct_ids, &match);
-#endif
- if (np) {
- mct_int_type = (u32)(match->data);
-
- /* This driver uses only one global timer interrupt */
- mct_irqs[MCT_G0_IRQ] = irq_of_parse_and_map(np, MCT_G0_IRQ);
-
- /*
- * Find out the number of local irqs specified. The local
- * timer irqs are specified after the four global timer
- * irqs are specified.
- */
-#ifdef CONFIG_OF
- nr_irqs = of_irq_count(np);
-#endif
- for (i = MCT_L0_IRQ; i < nr_irqs; i++)
- mct_irqs[i] = irq_of_parse_and_map(np, i);
- } else if (soc_is_exynos4210()) {
++ if (soc_is_exynos4210()) {
+ mct_irqs[MCT_G0_IRQ] = EXYNOS4_IRQ_MCT_G0;
+ mct_irqs[MCT_L0_IRQ] = EXYNOS4_IRQ_MCT_L0;
+ mct_irqs[MCT_L1_IRQ] = EXYNOS4_IRQ_MCT_L1;
+ mct_int_type = MCT_INT_SPI;
+ } else {
+ panic("unable to determine mct controller type\n");
}
- if ((soc_is_exynos4210()) || (soc_is_exynos5250()))
- mct_int_type = MCT_INT_SPI;
- else
- mct_int_type = MCT_INT_PPI;
- exynos4_timer_resources(np);
++ exynos4_timer_resources(S5P_VA_SYSTIMER);
+ exynos4_clocksource_init();
+ exynos4_clockevent_init();
+ }
-CLOCKSOURCE_OF_DECLARE(exynos4210, "samsung,exynos4210-mct", mct_init);
-CLOCKSOURCE_OF_DECLARE(exynos4412, "samsung,exynos4412-mct", mct_init);
+
- exynos4_timer_resources();
++static void __init mct_init_dt(struct device_node *np, unsigned int int_type)
++{
++ u32 nr_irqs, i;
++
++ mct_int_type = int_type;
++
++ /* This driver uses only one global timer interrupt */
++ mct_irqs[MCT_G0_IRQ] = irq_of_parse_and_map(np, MCT_G0_IRQ);
++
++ /*
++ * Find out the number of local irqs specified. The local
++ * timer irqs are specified after the four global timer
++ * irqs are specified.
++ */
++ nr_irqs = of_irq_count(np);
++ for (i = MCT_L0_IRQ; i < nr_irqs; i++)
++ mct_irqs[i] = irq_of_parse_and_map(np, i);
++
++ exynos4_timer_resources(of_iomap(np, 0));
+ exynos4_clocksource_init();
+ exynos4_clockevent_init();
+}
++
++
++static void __init mct_init_spi(struct device_node *np)
++{
++ return mct_init_dt(np, MCT_INT_SPI);
++}
++
++static void __init mct_init_ppi(struct device_node *np)
++{
++ return mct_init_dt(np, MCT_INT_PPI);
++}
++CLOCKSOURCE_OF_DECLARE(exynos4210, "samsung,exynos4210-mct", mct_init_spi);
++CLOCKSOURCE_OF_DECLARE(exynos4412, "samsung,exynos4412-mct", mct_init_ppi);
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL 02/10] 2nd irq-s3c24xx for v3.10
2013-04-09 20:19 ` Arnd Bergmann
@ 2013-04-09 20:21 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2013-04-09 20:21 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 09 April 2013, Arnd Bergmann wrote:
> On Monday 08 April 2013, Kukjin Kim wrote:
> > s3c24xx irq cleanup and move into drivers/irqchip
>
> I had a little trouble applying this because of the interface change to
> CLOCKSOURCE_OF_DECLARE. This is the rather complex merge I did. Please
> check that it still works.
The reply should have been for patch 3/10. I've merged both into the
next/drivers branch.
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-09 20:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-08 18:18 [GIT PULL 02/10] 2nd irq-s3c24xx for v3.10 Kukjin Kim
2013-04-09 20:19 ` Arnd Bergmann
2013-04-09 20:21 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox