firewall: update to git head

[openwrt.git] / target / linux / lantiq / patches-3.7 / 0105-MIPS-lantiq-rework-external-irq-code.patch

diff --git a/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch b/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch
index 88659c2..6f5ea2c 100644 (file)
--- a/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch
+++ b/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  arch/mips/lantiq/irq.c                     |  104 +++++++++++++++++++---------
  2 files changed, 73 insertions(+), 32 deletions(-)
 
-diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/include/asm/mach-lantiq/lantiq.h
-index 76be7a0..f196cce 100644
 --- a/arch/mips/include/asm/mach-lantiq/lantiq.h
 +++ b/arch/mips/include/asm/mach-lantiq/lantiq.h
 @@ -34,6 +34,7 @@ extern spinlock_t ebu_lock;
@@ -25,8 +23,6 @@ index 76be7a0..f196cce 100644
  
  /* clock handling */
  extern int clk_activate(struct clk *clk);
-diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
-index f36acd1..48407f6 100644
 --- a/arch/mips/lantiq/irq.c
 +++ b/arch/mips/lantiq/irq.c
 @@ -33,17 +33,10 @@
@@ -149,7 +145,7 @@ index f36acd1..48407f6 100644
                        /* enable */
                        ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) | BIT(i),
                                LTQ_EIU_EXIN_INEN);
-@@ -157,7 +194,7 @@ static void ltq_shutdown_eiu_irq(struct irq_data *d)
+@@ -157,7 +194,7 @@ static void ltq_shutdown_eiu_irq(struct
  
        ltq_disable_irq(d);
        for (i = 0; i < MAX_EIU; i++) {
@@ -166,7 +162,7 @@ index f36acd1..48407f6 100644
  };
  
  static void ltq_hw_irqdispatch(int module)
-@@ -301,7 +339,7 @@ static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
+@@ -301,7 +339,7 @@ static int icu_map(struct irq_domain *d,
                return 0;
  
        for (i = 0; i < exin_avail; i++)
@@ -175,7 +171,7 @@ index f36acd1..48407f6 100644
                        chip = &ltq_eiu_type;
  
        irq_set_chip_and_handler(hw, chip, handle_level_irq);
-@@ -323,7 +361,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
+@@ -323,7 +361,7 @@ int __init icu_of_init(struct device_nod
  {
        struct device_node *eiu_node;
        struct resource res;
@@ -184,7 +180,7 @@ index f36acd1..48407f6 100644
  
        for (i = 0; i < MAX_IM; i++) {
                if (of_address_to_resource(node, i, &res))
-@@ -340,17 +378,19 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
+@@ -340,17 +378,19 @@ int __init icu_of_init(struct device_nod
        }
  
        /* the external interrupts are optional and xway only */
@@ -209,6 +205,3 @@ index f36acd1..48407f6 100644
                if (request_mem_region(res.start, resource_size(&res),
                                                        res.name) < 0)
                        pr_err("Failed to request eiu memory");
--- 
-1.7.10.4
-