ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
Subsystems (2)
PATCH 1/1 ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
From: Barry Song <[email protected]>
Fix the issue:
tree: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/soc head: 6ed05a2aab3763b58922247543d7079106b254dc commit: af70fdc947dbe835acc26c6ee9e8e930f38935f8 [4/8] Merge branch 'marco-timer-cleanup-rebase' of
git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/soc
config: make ARCH=arm prima2_defconfig
All error/warnings:
Quoted 1 line
Quoted 1 line
arch/arm/mach-prima2/platsmp.c:20:30: fatal error:asm/hardware/gic.h: No such file or directory
compilation terminated.
--
Quoted 1 line
Quoted 1 line
arch/arm/mach-prima2/common.c:15:30: fatal error:asm/hardware/gic.h: No such file or directory
compilation terminated.
--- arch/arm/mach-prima2/common.c | 16 ++-------------- arch/arm/mach-prima2/platsmp.c | 8 +------- 2 files changed, 3 insertions(+), 21 deletions(-)
arch/arm/mach-prima2/common.c +2 -14
@@ -8,11 +8,10 @@#include <linux/init.h> #include <linux/kernel.h> -#include <linux/of_irq.h> +#include <linux/irqchip.h> #include <asm/sizes.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/hardware/gic.h> #include <linux/of.h> #include <linux/of_platform.h> #include "common.h"
@@ -61,16 +60,6 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_MARCO -static const struct of_device_id marco_irq_match[]__initconst = { - { .compatible ="arm,cortex-a9-gic" , .data = gic_of_init, }, - {/* sentinel */ } -}; - -static void __init marco_init_irq (void ) -{ -of_irq_init (marco_irq_match); -} -static const char *marco_dt_match[]__initdata = {"sirf,marco" , NULL
@@ -80,9 +69,8 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")/* Maintainer: Barry Song <[email protected]> */ .smp = smp_ops(sirfsoc_smp_ops), .map_io = sirfsoc_map_io, - .init_irq = marco_init_irq, + .init_irq = irqchip_init, .init_time = sirfsoc_marco_timer_init, - .handle_irq = gic_handle_irq, .init_machine = sirfsoc_mach_init, .init_late = sirfsoc_init_late, .dt_compat = marco_dt_match,
arch/arm/mach-prima2/platsmp.c +1 -7
@@ -11,13 +11,13 @@#include <linux/delay.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/irqchip/arm-gic.h> #include <asm/page.h> #include <asm/mach/map.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> #include <asm/cacheflush.h> #include <asm/cputype.h> -#include <asm/hardware/gic.h> #include <mach/map.h> #include "common.h"
@@ -142,18 +142,12 @@ static int __cpuinit sirfsoc_boot_secondary(unsigned int cpu, struct task_structreturn pen_release !=-1 ? -ENOSYS :0 ; } -static void __init sirfsoc_smp_init_cpus (void ) -{ -set_smp_cross_call (gic_raise_softirq); -} -static void __init sirfsoc_smp_prepare_cpus (unsigned int max_cpus) {scu_enable (scu_base); }struct smp_operations sirfsoc_smp_ops__initdata = { - .smp_init_cpus = sirfsoc_smp_init_cpus, .smp_prepare_cpus = sirfsoc_smp_prepare_cpus, .smp_secondary_init = sirfsoc_secondary_init, .smp_boot_secondary = sirfsoc_boot_secondary,
Signature · 6 lines
1.7.5.4 Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
Olof Johansson
AppliedPATCH 1/1 ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
Quoted 9 lines · Barry Song
From: Barry Song <[email protected]>
Fix the issue:
tree: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/soc head: 6ed05a2aab3763b58922247543d7079106b254dc commit: af70fdc947dbe835acc26c6ee9e8e930f38935f8 [4/8] Merge branch 'marco-timer-cleanup-rebase' of
git://gitorious.org/sirfprima2-kernel/sirfprima2-kernelinto next/soc
config: make ARCH=armprima2_defconfig
Quoted 7 lines
All error/warnings:
Quoted 1 line
Quoted 1 line
arch/arm/mach-prima2/platsmp.c:20:30: fatal error:asm/hardware/gic.h: No such file or directorycompilation terminated.
--Quoted 1 line
Quoted 1 line
arch/arm/mach-prima2/common.c:15:30: fatal error:asm/hardware/gic.h: No such file or directorycompilation terminated.
Applied, thanks.
-Olof