Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux

4 files changed, 5 insertions, 82 deletions

diff --git a/arch/mips/pmc-sierra/Kconfig b/arch/mips/pmc-sierra/Kconfig
index 90261b83db04..c139988bb85d 100644
--- a/arch/mips/pmc-sierra/Kconfig
+++ b/arch/mips/pmc-sierra/Kconfig
@@ -36,18 +36,6 @@ config PMC_MSP7120_FPGA
 
 endchoice
 
-menu "Options for PMC-Sierra MSP chipsets"
-        depends on PMC_MSP
-
-config PMC_MSP_EMBEDDED_ROOTFS
-        bool "Root filesystem embedded in kernel image"
-        select MTD
-        select MTD_BLOCK
-        select MTD_PMC_MSP_RAMROOT
-        select MTD_RAM
-
-endmenu
-
 config HYPERTRANSPORT
         bool "Hypertransport Support for PMC-Sierra Yosemite"
         depends on PMC_YOSEMITE
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_prom.c b/arch/mips/pmc-sierra/msp71xx/msp_prom.c
index e5bd5481d8db..c317a3623ce9 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_prom.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_prom.c
@@ -40,12 +40,6 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
-#ifdef CONFIG_CRAMFS
-#include <linux/cramfs_fs.h>
-#endif
-#ifdef CONFIG_SQUASHFS
-#include <linux/squashfs_fs.h>
-#endif
 
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
@@ -435,10 +429,6 @@ struct prom_pmemblock *__init prom_getmdesc(void)
         char            *str;
         unsigned int    memsize;
         unsigned int    heaptop;
-#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
-        void            *ramroot_start;
-        unsigned long   ramroot_size;
-#endif
         int i;
 
         str = prom_getenv(memsz_env);
@@ -506,19 +496,7 @@ struct prom_pmemblock *__init prom_getmdesc(void)
         i++;                    /* 3 */
         mdesc[i].type = BOOT_MEM_RESERVED;
         mdesc[i].base = CPHYSADDR((u32)_text);
-#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
-        if (get_ramroot(&ramroot_start, &ramroot_size)) {
-                /*
-                 * Rootfs in RAM -- follows kernel
-                 * Combine rootfs image with kernel block so a
-                 * page (4k) isn't wasted between memory blocks
-                 */
-                mdesc[i].size = CPHYSADDR(PAGE_ALIGN(
-                        (u32)ramroot_start + ramroot_size)) - mdesc[i].base;
-        } else
-#endif
-                mdesc[i].size = CPHYSADDR(PAGE_ALIGN(
-                        (u32)_end)) - mdesc[i].base;
+        mdesc[i].size = CPHYSADDR(PAGE_ALIGN((u32)_end)) - mdesc[i].base;
 
         /* Remainder of RAM -- under memsize */
         i++;                    /* 5 */
@@ -528,39 +506,3 @@ struct prom_pmemblock *__init prom_getmdesc(void)
 
         return &mdesc[0];
 }
-
-/* rootfs functions */
-#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
-bool get_ramroot(void **start, unsigned long *size)
-{
-        extern char _end[];
-
-        /* Check for start following the end of the kernel */
-        void *check_start = (void *)_end;
-
-        /* Check for supported rootfs types */
-#ifdef CONFIG_CRAMFS
-        if (*(__u32 *)check_start == CRAMFS_MAGIC) {
-                /* Get CRAMFS size */
-                *start = check_start;
-                *size = PAGE_ALIGN(((struct cramfs_super *)
-                                   check_start)->size);
-
-                return true;
-        }
-#endif
-#ifdef CONFIG_SQUASHFS
-        if (*((unsigned int *)check_start) == SQUASHFS_MAGIC) {
-                /* Get SQUASHFS size */
-                *start = check_start;
-                *size = PAGE_ALIGN(((struct squashfs_super_block *)
-                                   check_start)->bytes_used);
-
-                return true;
-        }
-#endif
-
-        return false;
-}
-EXPORT_SYMBOL(get_ramroot);
-#endif
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index c93675615f5d..a54e85b3cf29 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -21,7 +21,6 @@
 
 #if defined(CONFIG_PMC_MSP7120_GW)
 #include <msp_regops.h>
-#include <msp_gpio.h>
 #define MSP_BOARD_RESET_GPIO    9
 #endif
 
@@ -88,11 +87,8 @@ void msp7120_reset(void)
          * as GPIO char driver may not be enabled and it would look up
          * data inRAM!
          */
-        set_value_reg32(GPIO_CFG3_REG,
-                        basic_mode_mask(MSP_BOARD_RESET_GPIO),
-                        basic_mode(MSP_GPIO_OUTPUT, MSP_BOARD_RESET_GPIO));
-        set_reg32(GPIO_DATA3_REG,
-                        basic_data_mask(MSP_BOARD_RESET_GPIO));
+        set_value_reg32(GPIO_CFG3_REG, 0xf000, 0x8000);
+        set_reg32(GPIO_DATA3_REG, 8);
 
         /*
          * In case GPIO9 doesn't reset the board (jumper configurable!)
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmc-sierra/msp71xx/msp_time.c
index 7cfeda5a651b..cca64e15f57f 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_time.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
@@ -81,10 +81,7 @@ void __init plat_time_init(void)
         mips_hpt_frequency = cpu_rate/2;
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+unsigned int __init get_c0_compare_int(void)
 {
-#ifdef CONFIG_IRQ_MSP_CIC
-        /* we are using the vpe0 counter for timer interrupts */
-        setup_irq(MSP_INT_VPE0_TIMER, irq);
-#endif
+        return MSP_INT_VPE0_TIMER;
 }