4 files changed, 17 insertions, 35 deletions

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 82607add69a9..c0621d50c8a0 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -498,8 +498,8 @@ static ssize_t store_##name(struct device *dev, struct device_attribute *attr, c
 #define BUILD_STORE_FUNC_INT(name, data)                        \
 static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \
 {                                                               \
-        u32 val;                                                \
-        val = simple_strtoul(buf, NULL, 10);                    \
+        int val;                                                \
+        val = simple_strtol(buf, NULL, 10);                     \
         if (val < 0 || val > 255)                               \
                 return -EINVAL;                                 \
         printk(KERN_INFO "Setting specified fan speed to %d\n", val);   \
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index cd8e98b45ec5..049b0a7e01f3 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -1123,9 +1123,9 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
 #endif
 
 static struct of_device_id mpc52xx_fec_match[] = {
-        { .type = "network", .compatible = "fsl,mpc5200b-fec", },
-        { .type = "network", .compatible = "fsl,mpc5200-fec", },
-        { .type = "network", .compatible = "mpc5200-fec", },
+        { .compatible = "fsl,mpc5200b-fec", },
+        { .compatible = "fsl,mpc5200-fec", },
+        { .compatible = "mpc5200-fec", },
         { }
 };
 
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 0c3a2ab1612c..7f72f8ceaa6f 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -50,8 +50,8 @@
 /* OF Platform device Usage :
  *
  * This driver is only used for PSCs configured in uart mode.  The device
- * tree will have a node for each PSC in uart mode w/ device_type = "serial"
- * and "mpc52xx-psc-uart" in the compatible string
+ * tree will have a node for each PSC with "mpc52xx-psc-uart" in the compatible
+ * list.
  *
  * By default, PSC devices are enumerated in the order they are found.  However
  * a particular PSC number can be forces by adding 'device_no = <port#>'
@@ -522,7 +522,7 @@ mpc52xx_uart_startup(struct uart_port *port)
 
         /* Request IRQ */
         ret = request_irq(port->irq, mpc52xx_uart_int,
-                IRQF_DISABLED | IRQF_SAMPLE_RANDOM | IRQF_SHARED,
+                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
                 "mpc52xx_psc_uart", port);
         if (ret)
                 return ret;
@@ -1212,30 +1212,18 @@ mpc52xx_uart_of_resume(struct of_device *op)
 #endif
 
 static void
-mpc52xx_uart_of_assign(struct device_node *np, int idx)
+mpc52xx_uart_of_assign(struct device_node *np)
 {
-        int free_idx = -1;
         int i;
 
-        /* Find the first free node */
+        /* Find the first free PSC number */
         for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
                 if (mpc52xx_uart_nodes[i] == NULL) {
-                        free_idx = i;
-                        break;
+                        of_node_get(np);
+                        mpc52xx_uart_nodes[i] = np;
+                        return;
                 }
         }
-
-        if ((idx < 0) || (idx >= MPC52xx_PSC_MAXNUM))
-                idx = free_idx;
-
-        if (idx < 0)
-                return; /* No free slot; abort */
-
-        of_node_get(np);
-        /* If the slot is already occupied, then swap slots */
-        if (mpc52xx_uart_nodes[idx] && (free_idx != -1))
-                mpc52xx_uart_nodes[free_idx] = mpc52xx_uart_nodes[idx];
-        mpc52xx_uart_nodes[idx] = np;
 }
 
 static void
@@ -1243,23 +1231,17 @@ mpc52xx_uart_of_enumerate(void)
 {
         static int enum_done;
         struct device_node *np;
-        const unsigned int *devno;
         const struct  of_device_id *match;
         int i;
 
         if (enum_done)
                 return;
 
-        for_each_node_by_type(np, "serial") {
+        /* Assign index to each PSC in device tree */
+        for_each_matching_node(np, mpc52xx_uart_of_match) {
                 match = of_match_node(mpc52xx_uart_of_match, np);
-                if (!match)
-                        continue;
-
                 psc_ops = match->data;
-
-                /* Is a particular device number requested? */
-                devno = of_get_property(np, "port-number", NULL);
-                mpc52xx_uart_of_assign(np, devno ? *devno : -1);
+                mpc52xx_uart_of_assign(np);
         }
 
         enum_done = 1;
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 325c10ff6a2c..c7352f7195ee 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -772,7 +772,7 @@ config TXX9_WDT
 
 config GEF_WDT
         tristate "GE Fanuc Watchdog Timer"
-        depends on GEF_SBC610
+        depends on GEF_SBC610 || GEF_SBC310
         ---help---
           Watchdog timer found in a number of GE Fanuc single board computers.