5 files changed, 42 insertions, 12 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index abb582bc218f..5c8a845a4129 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -938,7 +938,7 @@ source "drivers/acpi/Kconfig"
 
 menuconfig APM
         tristate "APM (Advanced Power Management) BIOS support"
-        depends on PM && !X86_VISWS
+        depends on PM_SLEEP && !X86_VISWS
         ---help---
           APM is a BIOS specification for saving power using several different
           techniques. This is mostly useful for battery powered laptops with
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c
index 57a92ef31a90..62a51429306e 100644
--- a/arch/m32r/kernel/ptrace.c
+++ b/arch/m32r/kernel/ptrace.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/err.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 3eb305953497..9dae410014d8 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -43,6 +43,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/err.h>
 #include <linux/irq.h>
 #include <linux/bootmem.h>
 #include <linux/delay.h>
diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index bda85548de6c..b13dbbeaeafa 100644
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/fs.h>
 #include <linux/smp.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 03023dd17829..4e8df910c00d 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -47,6 +47,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
+#include <asm/cacheflush.h>
 
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
     defined(CONFIG_M5272) || defined(CONFIG_M528x) || \
@@ -98,8 +99,6 @@ static unsigned char	fec_mac_default[] = {
 #define FEC_FLASHMAC    0xf0006006
 #elif defined(CONFIG_GILBARCONAP) || defined(CONFIG_SCALES)
 #define FEC_FLASHMAC    0xf0006000
-#elif defined (CONFIG_MTD_KeyTechnology)
-#define FEC_FLASHMAC    0xffe04000
 #elif defined(CONFIG_CANCam)
 #define FEC_FLASHMAC    0xf0020000
 #elif defined (CONFIG_M5272C3)
@@ -191,6 +190,8 @@ struct fec_enet_private {
         /* Hardware registers of the FEC device */
         volatile fec_t  *hwp;
 
+        struct net_device *netdev;
+
         /* The saved address of a sent-in-place packet/buffer, for skfree(). */
         unsigned char *tx_bounce[TX_RING_SIZE];
         struct  sk_buff* tx_skbuff[TX_RING_SIZE];
@@ -1269,7 +1270,7 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
         icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR3);
         *icrp = 0x00000ddd;
         icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
-        *icrp = (*icrp & 0x70777777) | 0x0d000000;
+        *icrp = 0x0d000000;
 }
 
 static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
@@ -1331,7 +1332,7 @@ static void __inline__ fec_disable_phy_intr(void)
 {
         volatile unsigned long *icrp;
         icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
-        *icrp = (*icrp & 0x70777777) | 0x08000000;
+        *icrp = 0x08000000;
 }
 
 static void __inline__ fec_phy_ack_intr(void)
@@ -1339,7 +1340,7 @@ static void __inline__ fec_phy_ack_intr(void)
         volatile unsigned long *icrp;
         /* Acknowledge the interrupt */
         icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
-        *icrp = (*icrp & 0x77777777) | 0x08000000;
+        *icrp = 0x0d000000;
 }
 
 static void __inline__ fec_localhw_setup(void)
@@ -1426,6 +1427,29 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
                 *gpio_pehlpar = 0xc0;
         }
 #endif
+
+#if defined(CONFIG_M527x)
+        /* Set up gpio outputs for MII lines */
+        {
+                volatile u8 *gpio_par_fec;
+                volatile u16 *gpio_par_feci2c;
+
+                gpio_par_feci2c = (volatile u16 *)(MCF_IPSBAR + 0x100082);
+                /* Set up gpio outputs for FEC0 MII lines */
+                gpio_par_fec = (volatile u8 *)(MCF_IPSBAR + 0x100078);
+
+                *gpio_par_feci2c |= 0x0f00;
+                *gpio_par_fec |= 0xc0;
+
+#if defined(CONFIG_FEC2)
+                /* Set up gpio outputs for FEC1 MII lines */
+                gpio_par_fec = (volatile u8 *)(MCF_IPSBAR + 0x100079);
+
+                *gpio_par_feci2c |= 0x00a0;
+                *gpio_par_fec |= 0xc0;
+#endif /* CONFIG_FEC2 */
+        }
+#endif /* CONFIG_M527x */
 }
 
 static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
@@ -1940,9 +1964,10 @@ static void mii_display_status(struct net_device *dev)
         printk(".\n");
 }
 
-static void mii_display_config(struct net_device *dev)
+static void mii_display_config(struct work_struct *work)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = container_of(work, struct fec_enet_private, phy_task);
+        struct net_device *dev = fep->netdev;
         uint status = fep->phy_status;
 
         /*
@@ -1976,9 +2001,10 @@ static void mii_display_config(struct net_device *dev)
         fep->sequence_done = 1;
 }
 
-static void mii_relink(struct net_device *dev)
+static void mii_relink(struct work_struct *work)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = container_of(work, struct fec_enet_private, phy_task);
+        struct net_device *dev = fep->netdev;
         int duplex;
 
         /*
@@ -2022,7 +2048,7 @@ static void mii_queue_relink(uint mii_reg, struct net_device *dev)
                 return;
 
         fep->mii_phy_task_queued = 1;
-        INIT_WORK(&fep->phy_task, (void*)mii_relink, dev);
+        INIT_WORK(&fep->phy_task, mii_relink);
         schedule_work(&fep->phy_task);
 }
 
@@ -2035,7 +2061,7 @@ static void mii_queue_config(uint mii_reg, struct net_device *dev)
                 return;
 
         fep->mii_phy_task_queued = 1;
-        INIT_WORK(&fep->phy_task, (void*)mii_display_config, dev);
+        INIT_WORK(&fep->phy_task, mii_display_config);
         schedule_work(&fep->phy_task);
 }
 
@@ -2330,6 +2356,7 @@ int __init fec_enet_init(struct net_device *dev)
 
         fep->index = index;
         fep->hwp = fecp;
+        fep->netdev = dev;
 
         /* Whack a reset.  We should wait for this.
         */