Update Shark 5200 patch to 2.6.36.1

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index fea833e18ad58ab92c78da66e35e2f23dcacd8ff..dca721423009235b2eaa3f48e50d3af557903b1d 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -68,6 +68,7 @@
 #include <linux/uaccess.h>
 #include <asm/div64.h>
 #include <asm/mpc52xx.h>
+#include <linux/fs.h>
 
 MODULE_DESCRIPTION("Freescale MPC52xx gpt driver");
 MODULE_AUTHOR("Sascha Hauer, Grant Likely, Albrecht Dreß");

diff --git a/arch/powerpc/platforms/52xx/shark_pm.c b/arch/powerpc/platforms/52xx/shark_pm.c
index a24684df5c548e2b774f5e2cb9157e0ccf13cbf3..ed89f81c276f22817acb0869f9aae3d0ff663dc6 100644 (file)
--- a/arch/powerpc/platforms/52xx/shark_pm.c
+++ b/arch/powerpc/platforms/52xx/shark_pm.c
@@ -217,9 +217,6 @@ static int shark_pm_enter(suspend_state_t state)
 
        shark_restore_regs();
 
-       /* restart jiffies */
-       wakeup_decrementer();
-
        iounmap(mbar);
        return 0;
 }

diff --git a/drivers/mtd/maps/shark_pmap_of.c b/drivers/mtd/maps/shark_pmap_of.c
index ff2ad98633f65f03be560f0a95c4f361d24d5522..ec24c0ea1124466d5ddfc3d579f1008f65124abc 100644 (file)
--- a/drivers/mtd/maps/shark_pmap_of.c
+++ b/drivers/mtd/maps/shark_pmap_of.c
@@ -23,6 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/slab.h>
 
 struct of_flash {
        struct mtd_info         *mtd;
@@ -98,7 +99,7 @@ static void __xipram of_shark_map_copy_to(struct map_info *map, unsigned long to
 #ifdef CONFIG_MTD_PARTITIONS
 #define OF_FLASH_PARTS(info)   ((info)->parts)
 
-static int parse_obsolete_partitions(struct of_device *dev,
+static int parse_obsolete_partitions(struct platform_device *dev,
                                     struct of_flash *info,
                                     struct device_node *dp)
 {
@@ -148,7 +149,7 @@ static int parse_obsolete_partitions(struct of_device *dev,
 #define parse_partitions(info, dev)    (0)
 #endif /* MTD_PARTITIONS */
 
-static int of_shark_flash_remove(struct of_device *dev)
+static int of_shark_flash_remove(struct platform_device *dev)
 {
        struct of_flash *info;
 
@@ -184,10 +185,10 @@ static int of_shark_flash_remove(struct of_device *dev)
 /* Helper function to handle probing of the obsolete "direct-mapped"
  * compatible binding, which has an extra "probe-type" property
  * describing the type of flash probe necessary. */
-static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
+static struct mtd_info * __devinit obsolete_probe(struct platform_device *dev,
                                                  struct map_info *map)
 {
-       struct device_node *dp = dev->node;
+       struct device_node *dp = dev->dev.of_node;
        const char *of_probe;
        struct mtd_info *mtd;
        static const char *rom_probe_types[]
@@ -217,14 +218,14 @@ static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
        }
 }
 
-static int __devinit of_shark_flash_probe(struct of_device *dev,
+static int __devinit of_shark_flash_probe(struct platform_device *dev,
                                    const struct of_device_id *match)
 {
 #ifdef CONFIG_MTD_PARTITIONS
        static const char *part_probe_types[]
                = { "cmdlinepart", "RedBoot", NULL };
 #endif
-       struct device_node *dp = dev->node;
+       struct device_node *dp = dev->dev.of_node;
        struct device_node *np_sys;
        struct resource res;
        struct of_flash *info;
@@ -367,8 +368,12 @@ static struct of_device_id of_shark_flash_match[] = {
 MODULE_DEVICE_TABLE(of, of_flash_match);
 
 static struct of_platform_driver of_shark_flash_driver = {
-       .name           = "of-flash",
-       .match_table    = of_shark_flash_match,
+       .driver         = {
+               .name           = "of-flash",
+               .owner          = THIS_MODULE,
+               .of_match_table = of_shark_flash_match,
+
+       },
        .probe          = of_shark_flash_probe,
        .remove         = of_shark_flash_remove,
 };

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index f0d5652723fa99d6f0b2736cd4236f0f08def15f..63cdcd0a6b11ff5ed40947c548f5060a3c95a428 100644 (file)
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -42,6 +42,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/clk.h>
+#include <linux/slab.h>
 
 #include <asm/mpc52xx.h>
 #include <asm/mpc52xx_psc.h>
@@ -1404,7 +1405,7 @@ mpc52xx_uart_of_probe(struct platform_device *op, const struct of_device_id *mat
        
        private_data = (struct mpc52xx_private_data *) kzalloc(sizeof(struct mpc52xx_private_data), GFP_KERNEL);
        if (private_data) {
-               port_mode = of_get_property(op->node, "uart_mode", &port_mode_len);
+               port_mode = of_get_property(op->dev.of_node, "uart_mode", &port_mode_len);
                if (port_mode) {
                        if (strcmp(port_mode, "RS-485") == 0) {
                                private_data->mode = 1;