7 files changed, 27 insertions, 83 deletions

diff --git a/arch/m68knommu/platform/5206/config.c b/arch/m68knommu/platform/5206/config.c
index f6f79874e9af..481617a23d09 100644
--- a/arch/m68knommu/platform/5206/config.c
+++ b/arch/m68knommu/platform/5206/config.c
@@ -68,23 +68,6 @@ static void __init m5206_uarts_init(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-        volatile unsigned char  *mbar;
-        unsigned char           icr;
-
-        if ((vec >= 25) && (vec <= 31)) {
-                vec -= 25;
-                mbar = (volatile unsigned char *) MCF_MBAR;
-                icr = MCFSIM_ICR_AUTOVEC | (vec << 3);
-                *(mbar + MCFSIM_ICR1 + vec) = icr;
-                vec = 0x1 << (vec + 1);
-                mcf_setimr(mcf_getimr() & ~vec);
-        }
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(unsigned int timer, unsigned int level)
 {
         volatile unsigned char *icrp;
diff --git a/arch/m68knommu/platform/5206e/config.c b/arch/m68knommu/platform/5206e/config.c
index fcf1400db514..29e565a44431 100644
--- a/arch/m68knommu/platform/5206e/config.c
+++ b/arch/m68knommu/platform/5206e/config.c
@@ -69,23 +69,6 @@ static void __init m5206e_uarts_init(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-        volatile unsigned char  *mbar;
-        unsigned char           icr;
-
-        if ((vec >= 25) && (vec <= 31)) {
-                vec -= 25;
-                mbar = (volatile unsigned char *) MCF_MBAR;
-                icr = MCFSIM_ICR_AUTOVEC | (vec << 3);
-                *(mbar + MCFSIM_ICR1 + vec) = icr;
-                vec = 0x1 << (vec + 1);
-                mcf_setimr(mcf_getimr() & ~vec);
-        }
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(unsigned int timer, unsigned int level)
 {
         volatile unsigned char *icrp;
diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c
index 93d998825925..365fb6c52700 100644
--- a/arch/m68knommu/platform/5249/config.c
+++ b/arch/m68knommu/platform/5249/config.c
@@ -68,20 +68,6 @@ static void __init m5249_uarts_init(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-        volatile unsigned char  *mbar;
-
-        if ((vec >= 25) && (vec <= 31)) {
-                mbar = (volatile unsigned char *) MCF_MBAR;
-                vec = 0x1 << (vec - 24);
-                *(mbar + MCFSIM_AVR) |= vec;
-                mcf_setimr(mcf_getimr() & ~vec);
-        }
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(unsigned int timer, unsigned int level)
 {
         volatile unsigned char *icrp;
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c
index 5f95fcde05fd..94a66c12c96a 100644
--- a/arch/m68knommu/platform/5272/config.c
+++ b/arch/m68knommu/platform/5272/config.c
@@ -148,13 +148,6 @@ void mcf_disableall(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-        /* Everything is auto-vectored on the 5272 */
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(int timer, int level)
 {
         volatile unsigned long *icrp;
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index 39da9e9ff674..60fe45d51391 100644
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -83,20 +83,6 @@ static void __init m5307_uarts_init(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-        volatile unsigned char  *mbar;
-
-        if ((vec >= 25) && (vec <= 31)) {
-                mbar = (volatile unsigned char *) MCF_MBAR;
-                vec = 0x1 << (vec - 24);
-                *(mbar + MCFSIM_AVR) |= vec;
-                mcf_setimr(mcf_getimr() & ~vec);
-        }
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(unsigned int timer, unsigned int level)
 {
         volatile unsigned char *icrp;
diff --git a/arch/m68knommu/platform/5407/config.c b/arch/m68knommu/platform/5407/config.c
index b41d942bf8d0..1e8ef74ea156 100644
--- a/arch/m68knommu/platform/5407/config.c
+++ b/arch/m68knommu/platform/5407/config.c
@@ -74,20 +74,6 @@ static void __init m5407_uarts_init(void)
 
 /***************************************************************************/
 
-void mcf_autovector(unsigned int vec)
-{
-        volatile unsigned char  *mbar;
-
-        if ((vec >= 25) && (vec <= 31)) {
-                mbar = (volatile unsigned char *) MCF_MBAR;
-                vec = 0x1 << (vec - 24);
-                *(mbar + MCFSIM_AVR) |= vec;
-                mcf_setimr(mcf_getimr() & ~vec);
-        }
-}
-
-/***************************************************************************/
-
 void mcf_settimericr(unsigned int timer, unsigned int level)
 {
         volatile unsigned char *icrp;
diff --git a/arch/m68knommu/platform/coldfire/intc.c b/arch/m68knommu/platform/coldfire/intc.c
index c81ab6e5cf26..f7a61346ee25 100644
--- a/arch/m68knommu/platform/coldfire/intc.c
+++ b/arch/m68knommu/platform/coldfire/intc.c
@@ -18,6 +18,33 @@
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 
+/*
+ * Define the vector numbers for the basic 7 interrupt sources.
+ * These are often referred to as the "external" interrupts in
+ * the ColdFire documentation (for the early ColdFire cores at least).
+ */
+#define EIRQ1   25
+#define EIRQ7   31
+
+/*
+ * Interrupts can be "vectored" on the ColdFire cores that support this old
+ * interrupt controller. That is, the device raising the interrupt can also
+ * supply the vector number to interrupt through. The AVR register of the
+ * interrupt controller enables or disables this for each external interrupt,
+ * so provide generic support for this. Setting this up is out-of-band for
+ * the interrupt system API's, and needs to be done by the driver that
+ * supports this device. Very few devices actually use this.
+ */
+void mcf_autovector(int irq)
+{
+        if ((irq >= EIRQ1) && (irq <= EIRQ7)) {
+                u8 avec;
+                avec = __raw_readb(MCF_MBAR + MCFSIM_AVR);
+                avec |= (0x1 << (irq - EIRQ1 + 1));
+                __raw_writeb(avec, MCF_MBAR + MCFSIM_AVR);
+        }
+}
+
 static void intc_irq_mask(unsigned int irq)
 {
 }