target/linux/brcm63xx/patches-3.14/031-MIPS-Rename-mips_cpu_intc_init-mips_cpu_irq_of_init.patch

   1 From afe8dc254711b72ba8144295f4a8fcc66d30572d Mon Sep 17 00:00:00 2001
   2 From: Andrew Bresticker <abrestic@chromium.org>
   3 Date: Thu, 18 Sep 2014 14:47:08 -0700
   4 Subject: [PATCH 2/3] MIPS: Rename mips_cpu_intc_init() ->
   5  mips_cpu_irq_of_init()
   6
   7 mips_cpu_intc_init() is used for DT-based initialization of the CPU
   8 IRQ domain.  Give it a more appropriate name.
   9
  10 Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
  11 Reviewed-by: Qais Yousef <qais.yousef@imgtec.com>
  12 Tested-by: Qais Yousef <qais.yousef@imgtec.com>
  13 Cc: Thomas Gleixner <tglx@linutronix.de>
  14 Cc: Jason Cooper <jason@lakedaemon.net>
  15 Cc: Andrew Bresticker <abrestic@chromium.org>
  16 Cc: Jeffrey Deans <jeffrey.deans@imgtec.com>
  17 Cc: Markos Chandras <markos.chandras@imgtec.com>
  18 Cc: Paul Burton <paul.burton@imgtec.com>
  19 Cc: Qais Yousef <qais.yousef@imgtec.com>
  20 Cc: Jonas Gorski <jogo@openwrt.org>
  21 Cc: John Crispin <blogic@openwrt.org>
  22 Cc: David Daney <ddaney.cavm@gmail.com>
  23 Cc: linux-mips@linux-mips.org
  24 Cc: linux-kernel@vger.kernel.org
  25 Patchwork: https://patchwork.linux-mips.org/patch/7800/
  26 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  27 ---
  28  Documentation/devicetree/bindings/mips/cpu_irq.txt |    4 ++--
  29  arch/mips/include/asm/irq_cpu.h                    |    4 ++--
  30  arch/mips/kernel/irq_cpu.c                         |    4 ++--
  31  arch/mips/ralink/irq.c                             |    2 +-
  32  4 files changed, 7 insertions(+), 7 deletions(-)
  33
  34 --- a/Documentation/devicetree/bindings/mips/cpu_irq.txt
  35 +++ b/Documentation/devicetree/bindings/mips/cpu_irq.txt
  36 @@ -1,6 +1,6 @@
  37  MIPS CPU interrupt controller
  38
  39 -On MIPS the mips_cpu_intc_init() helper can be used to initialize the 8 CPU
  40 +On MIPS the mips_cpu_irq_of_init() helper can be used to initialize the 8 CPU
  41  IRQs from a devicetree file and create a irq_domain for IRQ controller.
  42
  43  With the irq_domain in place we can describe how the 8 IRQs are wired to the
  44 @@ -36,7 +36,7 @@ Example devicetree:
  45
  46  Example platform irq.c:
  47  static struct of_device_id __initdata of_irq_ids[] = {
  48 -       { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
  49 +       { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
  50         { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
  51         {},
  52  };
  53 --- a/arch/mips/include/asm/irq_cpu.h
  54 +++ b/arch/mips/include/asm/irq_cpu.h
  55 @@ -19,8 +19,8 @@ extern void rm9k_cpu_irq_init(void);
  56
  57  #ifdef CONFIG_IRQ_DOMAIN
  58  struct device_node;
  59 -extern int mips_cpu_intc_init(struct device_node *of_node,
  60 -                             struct device_node *parent);
  61 +extern int mips_cpu_irq_of_init(struct device_node *of_node,
  62 +                               struct device_node *parent);
  63  #endif
  64
  65  #endif /* _ASM_IRQ_CPU_H */
  66 --- a/arch/mips/kernel/irq_cpu.c
  67 +++ b/arch/mips/kernel/irq_cpu.c
  68 @@ -139,8 +139,8 @@ void __init mips_cpu_irq_init(void)
  69         __mips_cpu_irq_init(NULL);
  70  }
  71
  72 -int __init mips_cpu_intc_init(struct device_node *of_node,
  73 -                             struct device_node *parent)
  74 +int __init mips_cpu_irq_of_init(struct device_node *of_node,
  75 +                               struct device_node *parent)
  76  {
  77         __mips_cpu_irq_init(of_node);
  78         return 0;
  79 --- a/arch/mips/ralink/irq.c
  80 +++ b/arch/mips/ralink/irq.c
  81 @@ -173,7 +173,7 @@ static int __init intc_of_init(struct de
  82  }
  83
  84  static struct of_device_id __initdata of_irq_ids[] = {
  85 -       { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
  86 +       { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
  87         { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
  88         {},
  89  };