2 files changed, 0 insertions, 55 deletions

diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 754f93d208fa..6ce63a7662f8 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -34,10 +34,6 @@
 #define         MPIC_GREG_GCONF_BASE_MASK               0x000fffff
 #define         MPIC_GREG_GCONF_MCK                     0x08000000
 #define MPIC_GREG_GLOBAL_CONF_1         0x00030
-#define         MPIC_GREG_GLOBAL_CONF_1_SIE             0x08000000
-#define         MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO_MASK  0x70000000
-#define         MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO(r)    \
-                        (((r) << 28) & MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO_MASK)
 #define MPIC_GREG_VENDOR_0              0x00040
 #define MPIC_GREG_VENDOR_1              0x00050
 #define MPIC_GREG_VENDOR_2              0x00060
@@ -395,16 +391,6 @@ extern struct bus_type mpic_subsys;
 #define MPIC_REGSET_STANDARD            MPIC_REGSET(0)  /* Original MPIC */
 #define MPIC_REGSET_TSI108              MPIC_REGSET(1)  /* Tsi108/109 PIC */
 
-/* Get the version of primary MPIC */
-#ifdef CONFIG_MPIC
-extern u32 fsl_mpic_primary_get_version(void);
-#else
-static inline u32 fsl_mpic_primary_get_version(void)
-{
-        return 0;
-}
-#endif
-
 /* Allocate the controller structure and setup the linux irq descs
  * for the range if interrupts passed in. No HW initialization is
  * actually performed.
@@ -496,11 +482,5 @@ extern unsigned int mpic_get_coreint_irq(void);
 /* Fetch Machine Check interrupt from primary mpic */
 extern unsigned int mpic_get_mcirq(void);
 
-/* Set the EPIC clock ratio */
-void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio);
-
-/* Enable/Disable EPIC serial interrupt mode */
-void mpic_set_serial_int(struct mpic *mpic, int enable);
-
 #endif /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_MPIC_H */
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index bbfbbf2025fd..f72b592d60cc 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1219,16 +1219,6 @@ static u32 fsl_mpic_get_version(struct mpic *mpic)
  * Exported functions
  */
 
-u32 fsl_mpic_primary_get_version(void)
-{
-        struct mpic *mpic = mpic_primary;
-
-        if (mpic)
-                return fsl_mpic_get_version(mpic);
-
-        return 0;
-}
-
 struct mpic * __init mpic_alloc(struct device_node *node,
                                 phys_addr_t phys_addr,
                                 unsigned int flags,
@@ -1676,31 +1666,6 @@ void __init mpic_init(struct mpic *mpic)
                 mpic_err_int_init(mpic, MPIC_FSL_ERR_INT);
 }
 
-void __init mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio)
-{
-        u32 v;
-
-        v = mpic_read(mpic->gregs, MPIC_GREG_GLOBAL_CONF_1);
-        v &= ~MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO_MASK;
-        v |= MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO(clock_ratio);
-        mpic_write(mpic->gregs, MPIC_GREG_GLOBAL_CONF_1, v);
-}
-
-void __init mpic_set_serial_int(struct mpic *mpic, int enable)
-{
-        unsigned long flags;
-        u32 v;
-
-        raw_spin_lock_irqsave(&mpic_lock, flags);
-        v = mpic_read(mpic->gregs, MPIC_GREG_GLOBAL_CONF_1);
-        if (enable)
-                v |= MPIC_GREG_GLOBAL_CONF_1_SIE;
-        else
-                v &= ~MPIC_GREG_GLOBAL_CONF_1_SIE;
-        mpic_write(mpic->gregs, MPIC_GREG_GLOBAL_CONF_1, v);
-        raw_spin_unlock_irqrestore(&mpic_lock, flags);
-}
-
 void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
 {
         struct mpic *mpic = mpic_find(irq);