rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / include / linux / irqchip / arm-gic.h

diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 1f004b16641ee8210edefb07370dc654bfdbc4ce..3e203eb23cc79231f96ae50e1fb56da9cf4125ad 100644 (file)
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -17,11 +17,6 @@
 #define GIC_CPU_EOI                    0x10
 #define GIC_CPU_RUNNINGPRI             0x14
 #define GIC_CPU_HIGHPRI                        0x18
-#define GIC_CPU_ALIAS_BINPOINT         0x1c
-#define GIC_CPU_ACTIVEPRIO             0xd0
-#define GIC_CPU_IDENT                  0xfc
-
-#define GICC_IAR_INT_ID_MASK           0x3ff
 
 #define GIC_DIST_CTRL                  0x000
 #define GIC_DIST_CTR                   0x004
@@ -36,8 +31,6 @@
 #define GIC_DIST_TARGET                        0x800
 #define GIC_DIST_CONFIG                        0xc00
 #define GIC_DIST_SOFTINT               0xf00
-#define GIC_DIST_SGI_PENDING_CLEAR     0xf10
-#define GIC_DIST_SGI_PENDING_SET       0xf20
 
 #define GICH_HCR                       0x0
 #define GICH_VTR                       0x4
@@ -61,15 +54,6 @@
 #define GICH_LR_ACTIVE_BIT             (1 << 29)
 #define GICH_LR_EOI                    (1 << 19)
 
-#define GICH_VMCR_CTRL_SHIFT           0
-#define GICH_VMCR_CTRL_MASK            (0x21f << GICH_VMCR_CTRL_SHIFT)
-#define GICH_VMCR_PRIMASK_SHIFT                27
-#define GICH_VMCR_PRIMASK_MASK         (0x1f << GICH_VMCR_PRIMASK_SHIFT)
-#define GICH_VMCR_BINPOINT_SHIFT       21
-#define GICH_VMCR_BINPOINT_MASK                (0x7 << GICH_VMCR_BINPOINT_SHIFT)
-#define GICH_VMCR_ALIAS_BINPOINT_SHIFT 18
-#define GICH_VMCR_ALIAS_BINPOINT_MASK  (0x7 << GICH_VMCR_ALIAS_BINPOINT_SHIFT)
-
 #define GICH_MISR_EOI                  (1 << 0)
 #define GICH_MISR_U                    (1 << 1)
 
@@ -82,9 +66,6 @@ extern struct irq_chip gic_arch_extn;
 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
                    u32 offset, struct device_node *);
 void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
-void gic_cpu_if_down(void);
-
-void gic_cpu_if_down(void);
 
 static inline void gic_init(unsigned int nr, int start,
                            void __iomem *dist , void __iomem *cpu)
@@ -92,16 +73,6 @@ static inline void gic_init(unsigned int nr, int start,
        gic_init_bases(nr, start, dist, cpu, 0, NULL);
 }
 
-void gic_send_sgi(unsigned int cpu_id, unsigned int irq);
-int gic_get_cpu_id(unsigned int cpu);
-void gic_migrate_target(unsigned int new_cpu_id);
-unsigned long gic_get_sgir_physaddr(void);
-
-extern const struct irq_domain_ops *gic_routable_irq_domain_ops;
-static inline void __init register_routable_domain_ops
-                                       (const struct irq_domain_ops *ops)
-{
-       gic_routable_irq_domain_ops = ops;
-}
 #endif /* __ASSEMBLY */
+
 #endif